Fix builds for new controller runtime version

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
kubernetes-sigs · May 24, 2023 · f1bc4f3 · f1bc4f3
1 parent 0ae6ae0
commit f1bc4f3
Show file tree

Hide file tree

Showing 31 changed files with 141 additions and 181 deletions.
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
@@ -18,7 +18,7 @@
 # for more details
 
 # hash below referred to latest
-FROM registry.access.redhat.com/ubi8/go-toolset@sha256:160ff3bc88c4921f7b602f56b6115fe8bc99212f81f1d5acf5c259210d0261f3 as build
+FROM registry.access.redhat.com/ubi8/go-toolset@sha256:3668078d16ac1cdb28544554a0578f71bb83b09c1e9c0666f12079d61826110e as build
 USER root
 WORKDIR /work
 

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_profilebindings.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_profilebindings.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_profilerecordings.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_profilerecordings.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_rawselinuxprofiles.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_rawselinuxprofiles.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_seccompprofiles.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_seccompprofiles.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_securityprofilenodestatuses.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_securityprofilenodestatuses.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_securityprofilesoperatordaemons.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_securityprofilesoperatordaemons.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator
@@ -929,7 +929,8 @@ spec:
                     description: 'Requests describes the minimum amount of compute
                       resources required. If Requests is omitted for a container,
                       it defaults to Limits if that is explicitly specified, otherwise
-                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                      to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
               enableAppArmor:

diff --git a/bundle/manifests/security-profiles-operator.x-k8s.io_selinuxprofiles.yaml b/bundle/manifests/security-profiles-operator.x-k8s.io_selinuxprofiles.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
+    controller-gen.kubebuilder.io/version: v0.12.0
   creationTimestamp: null
   labels:
     app: security-profiles-operator

diff --git a/cmd/security-profiles-operator/main.go b/cmd/security-profiles-operator/main.go
@@ -362,7 +362,6 @@ func setControllerOptionsForNamespaces(opts *ctrl.Options) {
 	// listen globally
 	if namespace == "" {
 		setupLog.Info("watching all namespaces")
-		opts.Namespace = namespace
 		return
 	}
 
@@ -378,11 +377,11 @@ func setControllerOptionsForNamespaces(opts *ctrl.Options) {
 	// More Info: https://godoc.org/github.com/kubernetes-sigs/controller-runtime/pkg/cache#MultiNamespacedCacheBuilder
 	// Adding "" adds cluster namespaced resources
 	if strings.Contains(namespace, ",") {
-		opts.NewCache = cache.MultiNamespacedCacheBuilder(namespaceList)
+		opts.Cache.Namespaces = namespaceList
 		setupLog.Info("watching multiple namespaces", "namespaces", namespaceList)
 	} else {
 		// listen to a specific namespace only
-		opts.Namespace = namespace
+		opts.Cache.Namespaces = []string{namespace}
 		setupLog.Info("watching single namespace", "namespace", namespace)
 	}
 }
@@ -414,17 +413,13 @@ func getEnabledControllers(ctx *cli.Context) []controller.Controller {
 func newMemoryOptimizedCache(ctx *cli.Context) cache.NewCacheFunc {
 	if ctx.Bool(memOptimFlag) {
 		return func(config *rest.Config, opts cache.Options) (cache.Cache, error) {
-			opts.Resync = &sync
-			opts.SelectorsByObject = cache.SelectorsByObject{
-				&corev1.Pod{}: {
-					Label: labels.SelectorFromSet(labels.Set{
-						bindata.EnableRecordingLabel: "true",
-					}),
-				},
-			}
-			opts.DefaultSelector = cache.ObjectSelector{
-				Label: labels.Everything(),
+			opts.SyncPeriod = &sync
+			opts.ByObject[&corev1.Pod{}] = cache.ByObject{
+				Label: labels.SelectorFromSet(labels.Set{
+					bindata.EnableRecordingLabel: "true",
+				}),
 			}
+			opts.DefaultLabelSelector = labels.Everything()
 			return cache.New(config, opts)
 		}
 	}

diff --git a/dependencies.yaml b/dependencies.yaml
@@ -122,7 +122,7 @@ dependencies:
       match: registry.access.redhat.com/ubi8/ubi-minimal
 
   - name: ubi8-go-toolset
-    version: sha256:160ff3bc88c4921f7b602f56b6115fe8bc99212f81f1d5acf5c259210d0261f3
+    version: sha256:3668078d16ac1cdb28544554a0578f71bb83b09c1e9c0666f12079d61826110e
     refPaths:
     - path: Dockerfile.ubi
       match: registry.access.redhat.com/ubi8/go-toolset

diff --git a/deploy/base-crds/crds/profilebinding.yaml b/deploy/base-crds/crds/profilebinding.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: profilebindings.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io

diff --git a/deploy/base-crds/crds/profilerecording.yaml b/deploy/base-crds/crds/profilerecording.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: profilerecordings.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io

diff --git a/deploy/base-crds/crds/seccompprofile.yaml b/deploy/base-crds/crds/seccompprofile.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: seccompprofiles.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io

diff --git a/deploy/base-crds/crds/securityprofilenodestatus.yaml b/deploy/base-crds/crds/securityprofilenodestatus.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: securityprofilenodestatuses.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io

diff --git a/deploy/base-crds/crds/securityprofilesoperatordaemon.yaml b/deploy/base-crds/crds/securityprofilesoperatordaemon.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: securityprofilesoperatordaemons.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io
@@ -927,7 +926,8 @@ spec:
                     description: 'Requests describes the minimum amount of compute
                       resources required. If Requests is omitted for a container,
                       it defaults to Limits if that is explicitly specified, otherwise
-                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                      to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
               enableAppArmor:

diff --git a/deploy/base-crds/crds/selinuxpolicy.yaml b/deploy/base-crds/crds/selinuxpolicy.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: rawselinuxprofiles.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io
@@ -141,8 +140,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   name: selinuxprofiles.security-profiles-operator.x-k8s.io
 spec:
   group: security-profiles-operator.x-k8s.io

diff --git a/deploy/base/role.yaml b/deploy/base/role.yaml
@@ -2,7 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: security-profiles-operator
 rules:
 - apiGroups:
@@ -262,7 +261,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  creationTimestamp: null
   name: security-profiles-operator
   namespace: security-profiles-operator
 rules:
@@ -284,7 +282,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: spod
 rules:
 - apiGroups:
@@ -472,7 +469,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  creationTimestamp: null
   name: spod
   namespace: security-profiles-operator
 rules:
@@ -486,7 +482,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  creationTimestamp: null
   name: spo-webhook
 rules:
 - apiGroups:
@@ -579,7 +574,6 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  creationTimestamp: null
   name: spo-webhook
   namespace: security-profiles-operator
 rules:

diff --git a/deploy/helm/crds/crds.yaml b/deploy/helm/crds/crds.yaml
@@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: profilebindings.security-profiles-operator.x-k8s.io
@@ -79,8 +78,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: profilerecordings.security-profiles-operator.x-k8s.io
@@ -215,8 +213,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: seccompprofiles.security-profiles-operator.x-k8s.io
@@ -500,8 +497,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: securityprofilenodestatuses.security-profiles-operator.x-k8s.io
@@ -565,8 +561,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: securityprofilesoperatordaemons.security-profiles-operator.x-k8s.io
@@ -1492,7 +1487,8 @@ spec:
                     description: 'Requests describes the minimum amount of compute
                       resources required. If Requests is omitted for a container,
                       it defaults to Limits if that is explicitly specified, otherwise
-                      to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
+                      to an implementation-defined value. Requests cannot exceed Limits.
+                      More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
                     type: object
                 type: object
               enableAppArmor:
@@ -1808,8 +1804,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: rawselinuxprofiles.security-profiles-operator.x-k8s.io
@@ -1949,8 +1944,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.3
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app: security-profiles-operator
   name: selinuxprofiles.security-profiles-operator.x-k8s.io

diff --git a/deploy/helm/templates/static-resources.yaml b/deploy/helm/templates/static-resources.yaml
@@ -43,7 +43,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm
@@ -310,7 +309,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm
@@ -339,7 +337,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm
@@ -534,7 +531,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm
@@ -555,7 +551,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm
@@ -655,7 +650,6 @@ metadata:
   annotations:
     meta.helm.sh/release-name: security-profiles-operator
     meta.helm.sh/release-namespace: '{{ .Release.Namespace }}'
-  creationTimestamp: null
   labels:
     app: security-profiles-operator
     app.kubernetes.io/managed-by: Helm