Merge pull request #272 from razo7/update-tools-apis-25.9

Update SNR tool versions

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   namespace: openshift
   name: release
-  tag: rhel-9-release-golang-1.23-openshift-4.19
+  tag: rhel-9-release-golang-1.24-openshift-4.20

Makefile

@@ -2,20 +2,20 @@
 SHELL := /bin/bash
 
 # versions at  https://github.com/kubernetes-sigs/controller-tools/releases
-CONTROLLER_GEN_VERSION = v0.14.0
+CONTROLLER_GEN_VERSION = v0.19.0
 
 # GO_VERSION refers to the version of Golang to be downloaded when running dockerized version
-GO_VERSION = 1.23
+GO_VERSION = 1.24
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary, align with k8s.io/client-go in go.mod
-ENVTEST_K8S_VERSION = 1.26
+ENVTEST_K8S_VERSION = 1.34
 
 # versions at https://github.com/operator-framework/operator-sdk/releases
 # Make sure to update /config/scorecard/patches/basic.config.yaml and /config/scorecard/patches/olm.config.yaml
 OPERATOR_SDK_VERSION = v1.33.0
 
 # versions at https://github.com/operator-framework/operator-registry/releases
-OPM_VERSION = v1.36.0
+OPM_VERSION = v1.60.0
 
 
 # update for major version updates to KUSTOMIZE_VERSION!
@@ -24,20 +24,20 @@ KUSTOMIZE_API_VERSION = v5
 KUSTOMIZE_VERSION = v5.3.0
 
 # https://pkg.go.dev/sigs.k8s.io/controller-runtime/tools/setup-envtest/env?tab=versions
-ENVTEST_VERSION = v0.0.0-20240215124517-56159419231e
+ENVTEST_VERSION = v0.0.0-20250308055145-5fe7bb3edc86
 
 # versions at https://github.com/slintes/sort-imports/tags
 SORT_IMPORTS_VERSION = v0.3.0
 
 # version at https://github.com/a8m/envsubst/releases
-ENVSUBST_VERSION = v1.4.2
+ENVSUBST_VERSION = v1.4.3
 
 # OCP Version: for Red Hat bundle community
-OCP_VERSION = 4.14
+OCP_VERSION = 4.16
 
 # update for major version updates to YQ_VERSION! see https://github.com/mikefarah/yq
 YQ_API_VERSION = v4
-YQ_VERSION = v4.44.1
+YQ_VERSION = v4.48.1
 
 OPERATOR_NAME ?= self-node-remediation
 OPERATOR_NAMESPACE ?= openshift-workload-availability

api/v1alpha1/selfnoderemediationconfig_webhook.go

@@ -137,14 +137,14 @@ func (r *SelfNodeRemediationConfig) validateTimes() error {
 	}
 
 	if errMsg != "" {
-		return fmt.Errorf(errMsg)
+		return fmt.Errorf("%s", errMsg)
 	}
 	return nil
 }
 
 func (f *field) validate() error {
 	if f.durationValue < f.minDurationValue {
-		err := fmt.Errorf(f.name + " cannot be less than " + f.minDurationValue.String())
+		err := fmt.Errorf("%s cannot be less than %s", f.name, f.minDurationValue.String())
 		return err
 	}
 

api/v1alpha1/webhook_suite_test.go

@@ -38,6 +38,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
+	metricsServer "sigs.k8s.io/controller-runtime/pkg/metrics/server"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 // These tests use Ginkgo (BDD-style Go testing framework). Refer to
@@ -87,12 +89,14 @@ var _ = BeforeSuite(func() {
 	// start webhook server using Manager
 	webhookInstallOptions := &testEnv.WebhookInstallOptions
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		Scheme:             scheme,
-		Host:               webhookInstallOptions.LocalServingHost,
-		Port:               webhookInstallOptions.LocalServingPort,
-		CertDir:            webhookInstallOptions.LocalServingCertDir,
-		LeaderElection:     false,
-		MetricsBindAddress: "0",
+		Scheme: scheme,
+		WebhookServer: webhook.NewServer(webhook.Options{
+			Host:    webhookInstallOptions.LocalServingHost,
+			Port:    webhookInstallOptions.LocalServingPort,
+			CertDir: webhookInstallOptions.LocalServingCertDir,
+		}),
+		LeaderElection: false,
+		Metrics:        metricsServer.Options{BindAddress: "0"},
 	})
 	Expect(err).NotTo(HaveOccurred())
 

bundle/manifests/self-node-remediation.clusterserviceversion.yaml

@@ -136,28 +136,11 @@ spec:
           - get
           - list
           - watch
-        - apiGroups:
-          - apps
-          resources:
-          - daemonsets
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - apps
-          resources:
-          - daemonsets/finalizers
-          verbs:
-          - update
         - apiGroups:
           - ""
           resources:
           - nodes
+          - secrets
           verbs:
           - create
           - delete
@@ -178,9 +161,9 @@ spec:
           - update
           - watch
         - apiGroups:
-          - ""
+          - apps
           resources:
-          - secrets
+          - daemonsets
           verbs:
           - create
           - delete
@@ -189,6 +172,12 @@ spec:
           - patch
           - update
           - watch
+        - apiGroups:
+          - apps
+          resources:
+          - daemonsets/finalizers
+          verbs:
+          - update
         - apiGroups:
           - machine.openshift.io
           resources:
@@ -221,57 +210,7 @@ spec:
           - self-node-remediation.medik8s.io
           resources:
           - selfnoderemediationconfigs
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
-          - selfnoderemediationconfigs/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
-          - selfnoderemediationconfigs/status
-          verbs:
-          - get
-          - patch
-          - update
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
           - selfnoderemediations
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
-          - selfnoderemediations/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
-          - selfnoderemediations/status
-          verbs:
-          - get
-          - patch
-          - update
-        - apiGroups:
-          - self-node-remediation.medik8s.io
-          resources:
           - selfnoderemediationtemplates
           verbs:
           - create
@@ -284,12 +223,16 @@ spec:
         - apiGroups:
           - self-node-remediation.medik8s.io
           resources:
+          - selfnoderemediationconfigs/finalizers
+          - selfnoderemediations/finalizers
           - selfnoderemediationtemplates/finalizers
           verbs:
           - update
         - apiGroups:
           - self-node-remediation.medik8s.io
           resources:
+          - selfnoderemediationconfigs/status
+          - selfnoderemediations/status
           - selfnoderemediationtemplates/status
           verbs:
           - get

bundle/manifests/self-node-remediation.medik8s.io_selfnoderemediationconfigs.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   creationTimestamp: null
   labels:
     self-node-remediation-operator: ""

bundle/manifests/self-node-remediation.medik8s.io_selfnoderemediations.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   creationTimestamp: null
   labels:
     self-node-remediation-operator: ""
@@ -68,16 +68,8 @@ spec:
                   Represents the observations of a SelfNodeRemediation's current state.
                   Known .status.conditions.type are: "Processing"
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -118,12 +110,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

bundle/manifests/self-node-remediation.medik8s.io_selfnoderemediationtemplates.yaml

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   creationTimestamp: null
   labels:
     self-node-remediation-operator: ""

config/crd/bases/self-node-remediation.medik8s.io_selfnoderemediationconfigs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: selfnoderemediationconfigs.self-node-remediation.medik8s.io
 spec:
   group: self-node-remediation.medik8s.io

config/crd/bases/self-node-remediation.medik8s.io_selfnoderemediations.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.19.0
   name: selfnoderemediations.self-node-remediation.medik8s.io
 spec:
   group: self-node-remediation.medik8s.io
@@ -66,16 +66,8 @@ spec:
                   Represents the observations of a SelfNodeRemediation's current state.
                   Known .status.conditions.type are: "Processing"
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -116,12 +108,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string