kube api bump, client go bump, and Populate kubelet.yaml template fea…

…ture gates from featureGateAccessor

go.mod

@@ -27,8 +27,8 @@ require (
 	github.com/google/renameio v0.1.0
 	github.com/imdario/mergo v0.3.13
 	github.com/opencontainers/go-digest v1.0.0
-	github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7
-	github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d
+	github.com/openshift/api v0.0.0-20240326194138-93d19f9f5581
+	github.com/openshift/client-go v0.0.0-20240325151210-66398bfc44e1
 	github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe
 	github.com/openshift/library-go v0.0.0-20240312152318-4109a9e7a437
 	github.com/openshift/runtime-utils v0.0.0-20230921210328-7bdb5b9c177b

go.sum

@@ -689,10 +689,10 @@ github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQB
 github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M=
 github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
 github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7 h1:1kHXNv0RGzIF/xaKFK0ZzIdXG6JMsH0YtgCCvP4XykA=
-github.com/openshift/api v0.0.0-20240311132450-dcd6ab38a0f7/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d h1:vdrC3QYkFcs6a1Cz2/p5RcV7dMQ22tbgIonx+8HIJc0=
-github.com/openshift/client-go v0.0.0-20240312121557-60dd5f9fbf8d/go.mod h1:Y5Hp789dTrF6Fq8cA5YQlpwffmlLy8mc2un/CY0cg7Q=
+github.com/openshift/api v0.0.0-20240326194138-93d19f9f5581 h1:h2VkEG7vNJAxJk1XutS8i2gCT8yWEQVjXByW87d8c28=
+github.com/openshift/api v0.0.0-20240326194138-93d19f9f5581/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/openshift/client-go v0.0.0-20240325151210-66398bfc44e1 h1:Mrx78fHltx+xINrw6HnJ4GZs9Q/q2VC2gXhqNAOOqRU=
+github.com/openshift/client-go v0.0.0-20240325151210-66398bfc44e1/go.mod h1:HPS//zXegc1np0OWtNwtCTRMfeLtXZ0hHlaBe+WBW9s=
 github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe h1:wDQtyIbJJIoif2Ux0S+9MJWIWEGV0oG+iLm8WtqwdSw=
 github.com/openshift/cluster-config-operator v0.0.0-alpha.0.0.20231213185242-e4dc676febfe/go.mod h1:SGUtv1pKZSzSVr2YCxXFvhE+LbGfI+vcetEhNicKayw=
 github.com/openshift/kube-openapi v0.0.0-20230816122517-ffc8f001abb0 h1:GPlAy197Jkr+D0T2FNWanamraTdzS/r9ZkT29lxvHaA=

hack/crds-sync.sh

@@ -3,12 +3,15 @@
 set -euo pipefail
 
 # map names of CRD files between the vendored openshift/api repository and the ./install directory
-CRDS_MAPPING=( "v1/0000_80_containerruntimeconfig.crd.yaml:0000_80_machine-config-operator_01_containerruntimeconfig.crd.yaml"
-               "v1/0000_80_kubeletconfig.crd.yaml:0000_80_machine-config-operator_01_kubeletconfig.crd.yaml"
-               "v1/0000_80_machineconfig.crd.yaml:0000_80_machine-config-operator_01_machineconfig.crd.yaml"
-               "v1/0000_80_machineconfigpool.crd.yaml:0000_80_machine-config-operator_01_machineconfigpool.crd.yaml"
-               "v1alpha1/0000_80_machineconfignode-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config-operator_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" ) 
-                #TODO(jkyros): 0000_80_machine-config-operator_02_containerruntimeconfig.crd.yaml)
+CRDS_MAPPING=( 
+    "v1/zz_generated.crd-manifests/0000_80_machine-config_01_containerruntimeconfigs.crd.yaml:0000_80_machine-config_01_containerruntimeconfig.crd.yaml"
+    "v1/zz_generated.crd-manifests/0000_80_machine-config_01_kubeletconfigs.crd.yaml:0000_80_machine-config_01_kubeletconfig.crd.yaml"
+    "v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigs.crd.yaml:0000_80_machine-config_01_machineconfig.crd.yaml"
+    "v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigpools-Default.crd.yaml:0000_80_machine-config_01_machineconfigpool.crd.yaml"
+    "v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml"
+    "v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml:0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml"
+) 
+                #TODO(jkyros): 0000_80_machine-config_01_machine-config-operator_02_containerruntimeconfig.crd.yaml)
 
 for crd in "${CRDS_MAPPING[@]}" ; do
     SRC="${crd%%:*}"
@@ -17,7 +20,10 @@ for crd in "${CRDS_MAPPING[@]}" ; do
 done
 
 #this one goes in manifests rather than install, but should it? 
-cp "vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_controllerconfig.crd.yaml" "manifests/controllerconfig.crd.yaml"
-cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/0000_80_machineconfignode-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config-operator_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" 
-cp "vendor/github.com/openshift/api/operator/v1/0000_80_machine-config-operator_01_config.crd.yaml" "install/0000_80_machine-config-operator_01_config.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml" "manifests/controllerconfig.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml" 
+#cp "vendor/github.com/openshift/api/operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_config.crd.yaml" "install/0000_80_machine-config_01_config.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_controllerconfigs-Default.crd.yaml" "manifests/controllerconfig.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_machineconfignode-TechPreviewNoUpgrade.crd.yaml"
+cp "vendor/github.com/openshift/api/machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml" "manifests/0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml"
 

vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_containerruntimeconfig.crd.yaml → install/0000_80_machine-config_01_containerruntimeconfig.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1453
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"

vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_kubeletconfig.crd.yaml → install/0000_80_machine-config_01_kubeletconfig.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1453
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"

vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_machineconfig.crd.yaml → install/0000_80_machine-config_01_machineconfig.crd.yaml

@@ -3,6 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1453
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
@@ -13,6 +14,7 @@ spec:
   group: machineconfiguration.openshift.io
   names:
     kind: MachineConfig
+    listKind: MachineConfigList
     plural: machineconfigs
     shortNames:
     - mc

vendor/github.com/openshift/api/machineconfiguration/v1/0000_80_machineconfigpool.crd.yaml → install/0000_80_machine-config_01_machineconfigpool.crd.yaml

@@ -3,16 +3,19 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.openshift.io: https://github.com/openshift/api/pull/1453
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: Default
   labels:
     openshift.io/operator-managed: ""
   name: machineconfigpools.machineconfiguration.openshift.io
 spec:
   group: machineconfiguration.openshift.io
   names:
     kind: MachineConfigPool
+    listKind: MachineConfigPoolList
     plural: machineconfigpools
     shortNames:
     - mcp
@@ -33,8 +36,8 @@ spec:
       jsonPath: .status.conditions[?(@.type=="Updating")].status
       name: Updating
       type: string
-    - description: When progress is blocked on updating one or more nodes, or the
-        pool configuration is failing.
+    - description: When progress is blocked on updating one or more nodes or the pool
+        configuration is failing.
       jsonPath: .status.conditions[?(@.type=="Degraded")].status
       name: Degraded
       type: string

vendor/github.com/openshift/api/helm/v1beta1/00_helm-chart-repository.crd.yaml → install/0000_80_machine-config_01_pinnedimagesets-TechPreviewNoUpgrade.crd.yaml

@@ -2,26 +2,32 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    api-approved.openshift.io: https://github.com/openshift/api/pull/598
+    api-approved.openshift.io: https://github.com/openshift/api/pull/1713
+    api.openshift.io/merged-by-featuregates: "true"
     include.release.openshift.io/ibm-cloud-managed: "true"
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
-  name: helmchartrepositories.helm.openshift.io
+    release.openshift.io/feature-set: TechPreviewNoUpgrade
+  labels:
+    openshift.io/operator-managed: ""
+  name: pinnedimagesets.machineconfiguration.openshift.io
 spec:
-  group: helm.openshift.io
+  group: machineconfiguration.openshift.io
   names:
-    kind: HelmChartRepository
-    listKind: HelmChartRepositoryList
-    plural: helmchartrepositories
-    singular: helmchartrepository
+    kind: PinnedImageSet
+    listKind: PinnedImageSetList
+    plural: pinnedimagesets
+    singular: pinnedimageset
   scope: Cluster
   versions:
-  - name: v1beta1
+  - name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: "HelmChartRepository holds cluster-wide configuration for proxied
-          Helm chart repository \n Compatibility level 2: Stable within a major release
-          for a minimum of 9 months or 3 minor releases (whichever is longer)."
+        description: "PinnedImageSet describes a set of images that should be pinned
+          by CRI-O and pulled to the nodes which are members of the declared MachineConfigPools.
+          \n Compatibility level 4: No compatibility is provided, the API can change
+          at any point for any reason. These capabilities should not be used by applications
+          needing long term support."
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -36,67 +42,50 @@ spec:
           metadata:
             type: object
           spec:
-            description: spec holds user settable values for configuration
+            description: spec describes the configuration of this pinned image set.
             properties:
-              connectionConfig:
-                description: Required configuration for connecting to the chart repo
-                properties:
-                  ca:
-                    description: ca is an optional reference to a config map by name
-                      containing the PEM-encoded CA bundle. It is used as a trust
-                      anchor to validate the TLS certificate presented by the remote
-                      server. The key "ca-bundle.crt" is used to locate the data.
-                      If empty, the default system roots are used. The namespace for
-                      this config map is openshift-config.
-                    properties:
-                      name:
-                        description: name is the metadata.name of the referenced config
-                          map
-                        type: string
-                    required:
-                    - name
-                    type: object
-                  tlsClientConfig:
-                    description: tlsClientConfig is an optional reference to a secret
-                      by name that contains the PEM-encoded TLS client certificate
-                      and private key to present when connecting to the server. The
-                      key "tls.crt" is used to locate the client certificate. The
-                      key "tls.key" is used to locate the private key. The namespace
-                      for this secret is openshift-config.
-                    properties:
-                      name:
-                        description: name is the metadata.name of the referenced secret
-                        type: string
-                    required:
-                    - name
-                    type: object
-                  url:
-                    description: Chart repository URL
-                    maxLength: 2048
-                    pattern: ^https?:\/\/
-                    type: string
-                type: object
-              description:
-                description: Optional human readable repository description, it can
-                  be used by UI for displaying purposes
-                maxLength: 2048
-                minLength: 1
-                type: string
-              disabled:
-                description: If set to true, disable the repo usage in the cluster/namespace
-                type: boolean
-              name:
-                description: Optional associated human readable repository name, it
-                  can be used by UI for displaying purposes
-                maxLength: 100
-                minLength: 1
-                type: string
+              pinnedImages:
+                description: "pinnedImages is a list of OCI Image referenced by digest
+                  that should be pinned and pre-loaded by the nodes of a MachineConfigPool.
+                  Translates into a new file inside the /etc/crio/crio.conf.d directory
+                  with content similar to this: \n pinned_images = [ \"quay.io/openshift-release-dev/ocp-release@sha256:...\",
+                  \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\", \"quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:...\",
+                  ... ] \n These image references should all be by digest, tags aren't
+                  allowed."
+                items:
+                  properties:
+                    name:
+                      description: "name is an OCI Image referenced by digest. \n
+                        The format of the image ref is: host[:port][/namespace]/name@sha256:<digest>"
+                      maxLength: 447
+                      minLength: 1
+                      type: string
+                      x-kubernetes-validations:
+                      - message: the OCI Image reference must end with a valid '@sha256:<digest>'
+                          suffix, where '<digest>' is 64 characters long
+                        rule: self.split('@').size() == 2 && self.split('@')[1].matches('^sha256:[a-f0-9]{64}$')
+                      - message: the OCI Image name should follow the host[:port][/namespace]/name
+                          format, resembling a valid URL without the scheme
+                        rule: self.split('@')[0].matches('^([a-zA-Z0-9-]+\\.)+[a-zA-Z0-9-]+(:[0-9]{2,5})?/([a-zA-Z0-9-_]{0,61}/)?[a-zA-Z0-9-_.]*?$')
+                  required:
+                  - name
+                  type: object
+                maxItems: 500
+                minItems: 1
+                type: array
+                x-kubernetes-list-map-keys:
+                - name
+                x-kubernetes-list-type: map
+            required:
+            - pinnedImages
             type: object
           status:
-            description: Observed status of the repository within the cluster..
+            description: status describes the last observed state of this pinned image
+              set.
             properties:
               conditions:
-                description: conditions is a list of conditions and their statuses
+                description: conditions represent the observations of a pinned image
+                  set's current state.
                 items:
                   description: "Condition contains details for one aspect of the current
                     state of this API Resource. --- This struct is intended for direct
@@ -164,6 +153,9 @@ spec:
                   - type
                   type: object
                 type: array
+                x-kubernetes-list-map-keys:
+                - type
+                x-kubernetes-list-type: map
             type: object
         required:
         - spec