Merge pull request #379 from razo7/update-tools-apis-25.8

Update NHC 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

@@ -4,25 +4,25 @@ SHELL := /bin/bash
 # https://pkg.go.dev/github.com/operator-framework/operator-sdk?tab=versions
 OPERATOR_SDK_VERSION = v1.33.0
 # https://pkg.go.dev/github.com/operator-framework/operator-registry?tab=versions
-OPM_VERSION = v1.36.0
+OPM_VERSION = v1.56.0
 # https://pkg.go.dev/sigs.k8s.io/controller-tools?tab=versions
-CONTROLLER_GEN_VERSION = v0.14.0
+CONTROLLER_GEN_VERSION = v0.18.0
 # update for major version updates to KUSTOMIZE_VERSION!
 KUSTOMIZE_API_VERSION = v5
 # https://pkg.go.dev/sigs.k8s.io/kustomize/kustomize/v5?tab=versions
 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-20240123110158-b88ed7a3602b
 # https://pkg.go.dev/golang.org/x/tools/cmd/goimports?tab=versions
-GOIMPORTS_VERSION = v0.17.0
+GOIMPORTS_VERSION = v0.36.0
 # https://pkg.go.dev/github.com/slintes/sort-imports?tab=versions
-SORT_IMPORTS_VERSION = v0.2.1
+SORT_IMPORTS_VERSION = v0.3.0
 # update for major version updates to YQ_VERSION!
 YQ_API_VERSION = v4
-YQ_VERSION = v4.41.1
+YQ_VERSION = v4.47.1
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.26
+ENVTEST_K8S_VERSION = 1.28
 
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.

bundle/manifests/node-healthcheck-operator.clusterserviceversion.yaml

@@ -277,32 +277,34 @@ spec:
       clusterPermissions:
       - rules:
         - apiGroups:
-          - apps
+          - ""
           resources:
-          - deployments
+          - namespaces
           verbs:
+          - create
           - get
-          - list
-          - watch
         - apiGroups:
-          - config.openshift.io
+          - ""
           resources:
-          - clusterversions
+          - nodes
+          - pods
           verbs:
           - get
           - list
           - watch
         - apiGroups:
-          - config.openshift.io
+          - apps
           resources:
-          - featuregates
+          - deployments
           verbs:
           - get
           - list
           - watch
         - apiGroups:
           - config.openshift.io
           resources:
+          - clusterversions
+          - featuregates
           - infrastructures
           verbs:
           - get
@@ -332,29 +334,6 @@ spec:
           - patch
           - update
           - watch
-        - apiGroups:
-          - ""
-          resources:
-          - namespaces
-          verbs:
-          - create
-          - get
-        - apiGroups:
-          - ""
-          resources:
-          - nodes
-          verbs:
-          - get
-          - list
-          - watch
-        - apiGroups:
-          - ""
-          resources:
-          - pods
-          verbs:
-          - get
-          - list
-          - watch
         - apiGroups:
           - machine.openshift.io
           resources:
@@ -393,11 +372,6 @@ spec:
           - rbac.authorization.k8s.io
           resources:
           - clusterrolebindings
-          verbs:
-          - '*'
-        - apiGroups:
-          - rbac.authorization.k8s.io
-          resources:
           - clusterroles
           verbs:
           - '*'

bundle/manifests/remediation.medik8s.io_nodehealthchecks.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.18.0
   creationTimestamp: null
   labels:
     app.kubernetes.io/name: node-healthcheck-operator
@@ -50,7 +50,6 @@ spec:
                   gets healthy within the timeout of the currently processed remediation. The order of
                   remediation is defined by the "order" field of each "escalatingRemediation".
 
-
                   Mutually exclusive with RemediationTemplate
                 items:
                   description: EscalatingRemediation defines a remediation template
@@ -67,7 +66,6 @@ spec:
                         RemediationTemplate is a reference to a remediation template
                         provided by a remediation provider.
 
-
                         If a node needs remediation the controller will create an object from this template
                         and then it should be picked up by a remediation provider.
                       properties:
@@ -83,7 +81,6 @@ spec:
                             the event) or if no container name is specified "spec.containers[2]" (container with
                             index 2 in this pod). This syntax is chosen only to have some well-defined way of
                             referencing a part of an object.
-                            TODO: this design is not final and this field is subject to change in the future.
                           type: string
                         kind:
                           description: |-
@@ -119,7 +116,6 @@ spec:
                         the overall remediation is considered as failed.
                         As a safeguard for preventing parallel remediations, a minimum of 60s is enforced.
 
-
                         Expects a string of decimal numbers each with optional
                         fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
                         Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -179,11 +175,9 @@ spec:
                   RemediationTemplate is a reference to a remediation template
                   provided by an infrastructure provider.
 
-
                   If a node needs remediation the controller will create an object from this template
                   and then it should be picked up by a remediation provider.
 
-
                   Mutually exclusive with EscalatingRemediations
                 properties:
                   apiVersion:
@@ -198,7 +192,6 @@ spec:
                       the event) or if no container name is specified "spec.containers[2]" (container with
                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                       referencing a part of an object.
-                      TODO: this design is not final and this field is subject to change in the future.
                     type: string
                   kind:
                     description: |-
@@ -231,11 +224,9 @@ spec:
                 description: |-
                   Label selector to match nodes whose health will be exercised.
 
-
                   Selecting both control-plane and worker nodes in one NHC CR is
                   highly discouraged and can result in undesired behaviour.
 
-
                   Note: mandatory now for above reason, but for backwards compatibility existing
                   CRs will continue to work with an empty selector, which matches all nodes.
                 properties:
@@ -302,7 +293,6 @@ spec:
                       description: |-
                         Duration of the condition specified when a node is considered unhealthy.
 
-
                         Expects a string of decimal numbers each with optional
                         fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
                         Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -338,16 +328,8 @@ spec:
                   Represents the observations of a NodeHealthCheck's current state.
                   Known .status.conditions.type are: "Disabled"
                 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: |-
@@ -388,12 +370,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
@@ -482,7 +459,6 @@ spec:
                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                   referencing a part of an object.
-                                  TODO: this design is not final and this field is subject to change in the future.
                                 type: string
                               kind:
                                 description: |-

config/crd/bases/remediation.medik8s.io_nodehealthchecks.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.18.0
   name: nodehealthchecks.remediation.medik8s.io
 spec:
   group: remediation.medik8s.io
@@ -48,7 +48,6 @@ spec:
                   gets healthy within the timeout of the currently processed remediation. The order of
                   remediation is defined by the "order" field of each "escalatingRemediation".
 
-
                   Mutually exclusive with RemediationTemplate
                 items:
                   description: EscalatingRemediation defines a remediation template
@@ -65,7 +64,6 @@ spec:
                         RemediationTemplate is a reference to a remediation template
                         provided by a remediation provider.
 
-
                         If a node needs remediation the controller will create an object from this template
                         and then it should be picked up by a remediation provider.
                       properties:
@@ -81,7 +79,6 @@ spec:
                             the event) or if no container name is specified "spec.containers[2]" (container with
                             index 2 in this pod). This syntax is chosen only to have some well-defined way of
                             referencing a part of an object.
-                            TODO: this design is not final and this field is subject to change in the future.
                           type: string
                         kind:
                           description: |-
@@ -117,7 +114,6 @@ spec:
                         the overall remediation is considered as failed.
                         As a safeguard for preventing parallel remediations, a minimum of 60s is enforced.
 
-
                         Expects a string of decimal numbers each with optional
                         fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
                         Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -177,11 +173,9 @@ spec:
                   RemediationTemplate is a reference to a remediation template
                   provided by an infrastructure provider.
 
-
                   If a node needs remediation the controller will create an object from this template
                   and then it should be picked up by a remediation provider.
 
-
                   Mutually exclusive with EscalatingRemediations
                 properties:
                   apiVersion:
@@ -196,7 +190,6 @@ spec:
                       the event) or if no container name is specified "spec.containers[2]" (container with
                       index 2 in this pod). This syntax is chosen only to have some well-defined way of
                       referencing a part of an object.
-                      TODO: this design is not final and this field is subject to change in the future.
                     type: string
                   kind:
                     description: |-
@@ -229,11 +222,9 @@ spec:
                 description: |-
                   Label selector to match nodes whose health will be exercised.
 
-
                   Selecting both control-plane and worker nodes in one NHC CR is
                   highly discouraged and can result in undesired behaviour.
 
-
                   Note: mandatory now for above reason, but for backwards compatibility existing
                   CRs will continue to work with an empty selector, which matches all nodes.
                 properties:
@@ -300,7 +291,6 @@ spec:
                       description: |-
                         Duration of the condition specified when a node is considered unhealthy.
 
-
                         Expects a string of decimal numbers each with optional
                         fraction and a unit suffix, eg "300ms", "1.5h" or "2h45m".
                         Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h".
@@ -336,16 +326,8 @@ spec:
                   Represents the observations of a NodeHealthCheck's current state.
                   Known .status.conditions.type are: "Disabled"
                 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: |-
@@ -386,12 +368,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
@@ -480,7 +457,6 @@ spec:
                                   the event) or if no container name is specified "spec.containers[2]" (container with
                                   index 2 in this pod). This syntax is chosen only to have some well-defined way of
                                   referencing a part of an object.
-                                  TODO: this design is not final and this field is subject to change in the future.
                                 type: string
                               kind:
                                 description: |-