OADP Non Admin velero manifest updates.

[mpryc]

Why the changes were made

Update the oadp manifests on the non-admin part of it.

How to test the changes made

Generated by using:

$ make update-velero-manifests

requires openshift/oadp-operator#1678

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[kaovilai]

🛏️ rest well sir

[kaovilai]

failing on dupe name.. checking if we are resetting somewhere.. easiest hackaround is to use different name each test case in internal/controller/nonadminbackupstoragelocation_controller_test.go

This is the code in controller-runtime/pkg/controller/name.go containing checkName which is called each time SetupWIthManager is run

/*
Copyright 2020 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package controller

import (
	"fmt"
	"sync"

	"k8s.io/apimachinery/pkg/util/sets"
)

var nameLock sync.Mutex
var usedNames sets.Set[string]

func checkName(name string) error {
	nameLock.Lock()
	defer nameLock.Unlock()
	if usedNames == nil {
		usedNames = sets.Set[string]{}
	}

	if usedNames.Has(name) {
		return fmt.Errorf("controller with name %s already exists. Controller names must be unique to avoid multiple controllers reporting to the same metric", name)
	}

	usedNames.Insert(name)

	return nil
}

We either use different name for each test or we skipvalidation

[kaovilai]

it uses Sets and the code only use inserts.

So I think setting custom name is cleaner than the alternative, which is to have an if check for test, then adding controller.Options{SkipName}

[kaovilai]

This is only needed if a controller has no For(&nacv1alpha1.TYPE{}) where name can be gathered from GroupVersionKind ie. prior default behavior... ie. where you had to Named("<name>").

[kaovilai]

draft until tests are fixed

[kaovilai]

In case you were wondering why there is more deletions than add..

kubernetes-sigs/controller-tools#728 :D

[kaovilai]

From initial debugging, I had made this change thought something took longer.. but I think its ok to keep. <-ctx.Done() seemed more accurate than hardcoded waits.

[mateusoliveira43]

I do not like these changes

we are changing controllers code, but we could fix these error by just adding

				Controller: config.Controller{
					SkipNameValidation: ptr.To(true),
				},

in places where NewManager is called in tests code, like here, changing just controllers tests code

[kaovilai]

cool, I did find that option but didn't see where to set it. will get those in.

[kaovilai]

The thought behind name change was, the other place to set skipnamevalidation is in the controller code also..
Your suggestion will allow change to stay only in _test.go

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mateusoliveira43, mpryc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [mateusoliveira43,mpryc]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[mpryc]

/lgtm

Thanks @kaovilai

[openshift-ci]

@mpryc: you cannot LGTM your own PR.

In response to this:

/lgtm

Thanks @kaovilai

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

[mateusoliveira43]

/override "security/snyk ( Hybrid Platforms - OpenShift API for Data Protection)"

[openshift-ci]

@mateusoliveira43: Overrode contexts on behalf of mateusoliveira43: security/snyk ( Hybrid Platforms - OpenShift API for Data Protection)

In response to this:

/override "security/snyk ( Hybrid Platforms - OpenShift API for Data Protection)"

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.