diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 05335cb47a..2179de9ad2 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-11-045706 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-07-15-141336 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index bd0cf60c3e..5034a0b86e 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2025-07-07-234740 +OCP_VERSION := 4.20.0-0.nightly-2025-07-15-083124 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 5269964827..d9f0dec0ee 100644 --- a/assets/components/multus/kustomization.aarch64.yaml +++ b/assets/components/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cb3f4abb476d27ad964cdc07217391e4a5fd57a05c9454636ad3006e1eecaaf9 + digest: sha256:9f5ec7eca07f576a8b2b6015350de810fefd959c6e5b5da9c2e9155620105576 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:05f584448271a522d824046a4cb6112116b437f5e5c791c5cd044bccae2d0906 + digest: sha256:de7edb60134fd0b89ebaa34731765c6597a25d7f23602dc38db6acec2bc275ef diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 6abc7d8719..8f669f96b1 100644 --- a/assets/components/multus/kustomization.x86_64.yaml +++ b/assets/components/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a8c9f0bf829cfe25367393a9240ccbc8e8e765dcfc80819b939ecf0f714de7c6 + digest: sha256:a758cbecd107a66bffcb05fa9d986f5fea887e77fb28f414c1ad2e5cfbb5cfe7 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fc33cd6b92c45f2f4b03247a4d2bf3b1770c49884fb5d7350c9583fa34234c21 + digest: sha256:2c7573bf5eff0eba78f5dda4b7b20f796d9e7f618ceb49991d57d446079b62c9 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index a91d6f0bec..434058e39d 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-07-11-045706" + "base": "4.20.0-0.nightly-arm64-2025-07-15-141336" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb3f4abb476d27ad964cdc07217391e4a5fd57a05c9454636ad3006e1eecaaf9", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05f584448271a522d824046a4cb6112116b437f5e5c791c5cd044bccae2d0906" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f5ec7eca07f576a8b2b6015350de810fefd959c6e5b5da9c2e9155620105576", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de7edb60134fd0b89ebaa34731765c6597a25d7f23602dc38db6acec2bc275ef" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 39e5f70d9f..e75c588706 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-2025-07-07-234740" + "base": "4.20.0-0.nightly-2025-07-15-083124" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8c9f0bf829cfe25367393a9240ccbc8e8e765dcfc80819b939ecf0f714de7c6", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc33cd6b92c45f2f4b03247a4d2bf3b1770c49884fb5d7350c9583fa34234c21" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a758cbecd107a66bffcb05fa9d986f5fea887e77fb28f414c1ad2e5cfbb5cfe7", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c7573bf5eff0eba78f5dda4b7b20f796d9e7f618ceb49991d57d446079b62c9" } } diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml index 9aba169867..9f3917b84e 100644 --- a/assets/optional/kube-proxy/kustomization.aarch64.yaml +++ b/assets/optional/kube-proxy/kustomization.aarch64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6833d81b94fd3c7452de5002f3ee3e7a0a02ac02dd87c173e97bfc8888af6d8d + digest: sha256:e7e057c72f000725c348dd742284a558745e4928fe4d894c88bac677ff7c7811 diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml index 4756fcb75f..4ad279004d 100644 --- a/assets/optional/kube-proxy/kustomization.x86_64.yaml +++ b/assets/optional/kube-proxy/kustomization.x86_64.yaml @@ -2,4 +2,4 @@ images: - name: kube-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:27f736d5d1b1b7e70ecc1de48dcf5784715237127410a3d99d4cab3d54cf1714 + digest: sha256:2bda152d262a81dd1a722078fd7a691336fe1d746e33720c68cee2e16194ba94 diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index 10d68fdcbc..621529c489 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-07-11-045706" + "base": "4.20.0-0.nightly-arm64-2025-07-15-141336" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6833d81b94fd3c7452de5002f3ee3e7a0a02ac02dd87c173e97bfc8888af6d8d" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7e057c72f000725c348dd742284a558745e4928fe4d894c88bac677ff7c7811" } } diff --git a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json index fd2d9e5ef5..de2710fb26 100644 --- a/assets/optional/kube-proxy/release-kube-proxy-x86_64.json +++ b/assets/optional/kube-proxy/release-kube-proxy-x86_64.json @@ -1,8 +1,8 @@ { "release": { - "base": "4.20.0-0.nightly-2025-07-07-234740" + "base": "4.20.0-0.nightly-2025-07-15-083124" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f736d5d1b1b7e70ecc1de48dcf5784715237127410a3d99d4cab3d54cf1714" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bda152d262a81dd1a722078fd7a691336fe1d746e33720c68cee2e16194ba94" } } diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml index 728cf917c2..1ce841df79 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" @@ -367,7 +367,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -382,7 +381,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -539,7 +537,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -554,7 +551,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -712,7 +708,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -727,7 +722,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -884,7 +878,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -899,7 +892,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml index 8d3e7bacf3..63c9bdc6f0 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" @@ -1118,7 +1118,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1133,7 +1132,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1290,7 +1288,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1305,7 +1302,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1463,7 +1459,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1478,7 +1473,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1635,7 +1629,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1650,7 +1643,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1891,7 +1883,7 @@ spec: Cannot be updated. type: array items: - description: EnvFromSource represents the source of a set of ConfigMaps + description: EnvFromSource represents the source of a set of ConfigMaps or Secrets type: object properties: configMapRef: @@ -1912,7 +1904,7 @@ spec: type: boolean x-kubernetes-map-type: atomic prefix: - description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + description: Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER. type: string secretRef: description: The Secret to select from @@ -2160,6 +2152,12 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + stopSignal: + description: |- + StopSignal defines which signal will be sent to a container when it is being stopped. + If not specified, the default is defined by the container runtime in use. + StopSignal can only be set for Pods with a non-empty .spec.os.name + type: string livenessProbe: description: |- Periodic probe of container liveness. @@ -3331,7 +3329,7 @@ spec: Cannot be updated. type: array items: - description: EnvFromSource represents the source of a set of ConfigMaps + description: EnvFromSource represents the source of a set of ConfigMaps or Secrets type: object properties: configMapRef: @@ -3352,7 +3350,7 @@ spec: type: boolean x-kubernetes-map-type: atomic prefix: - description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + description: Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER. type: string secretRef: description: The Secret to select from @@ -3596,6 +3594,12 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + stopSignal: + description: |- + StopSignal defines which signal will be sent to a container when it is being stopped. + If not specified, the default is defined by the container runtime in use. + StopSignal can only be set for Pods with a non-empty .spec.os.name + type: string livenessProbe: description: Probes are not allowed for ephemeral containers. type: object @@ -4600,7 +4604,7 @@ spec: Init containers may not have Lifecycle actions, Readiness probes, Liveness probes, or Startup probes. The resourceRequirements of an init container are taken into account during scheduling by finding the highest request/limit for each resource type, and then using the max of - of that value or the sum of the normal containers. Limits are applied to init containers + that value or the sum of the normal containers. Limits are applied to init containers in a similar fashion. Init containers cannot currently be added or removed. Cannot be updated. @@ -4764,7 +4768,7 @@ spec: Cannot be updated. type: array items: - description: EnvFromSource represents the source of a set of ConfigMaps + description: EnvFromSource represents the source of a set of ConfigMaps or Secrets type: object properties: configMapRef: @@ -4785,7 +4789,7 @@ spec: type: boolean x-kubernetes-map-type: atomic prefix: - description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + description: Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER. type: string secretRef: description: The Secret to select from @@ -5033,6 +5037,12 @@ spec: - type: integer - type: string x-kubernetes-int-or-string: true + stopSignal: + description: |- + StopSignal defines which signal will be sent to a container when it is being stopped. + If not specified, the default is defined by the container runtime in use. + StopSignal can only be set for Pods with a non-empty .spec.os.name + type: string livenessProbe: description: |- Periodic probe of container liveness. @@ -6698,7 +6708,6 @@ spec: - Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations. If this value is nil, the behavior is equivalent to the Honor policy. - This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag. type: string nodeTaintsPolicy: description: |- @@ -6709,7 +6718,6 @@ spec: - Ignore: node taints are ignored. All nodes are included. If this value is nil, the behavior is equivalent to the Ignore policy. - This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag. type: string topologyKey: description: |- @@ -7637,7 +7645,7 @@ spec: The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field. The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images. The volume will be mounted read-only (ro) and non-executable files (noexec). - Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath). + Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33. The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type. type: object properties: diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml index f3c5f9e404..3fd8618308 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml index 57571c8890..d050561f88 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml index cb30ffe7e0..8b57b2927c 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml index 849084bfb4..72847359aa 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml index 043d19f309..5a0e2ba520 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml index 6e7c9fea9c..b093a12ef5 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.2 + controller-gen.kubebuilder.io/version: v0.18.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" @@ -354,7 +354,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -369,7 +368,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -526,7 +524,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -541,7 +538,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -699,7 +695,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -714,7 +709,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -871,7 +865,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both matchLabelKeys and labelSelector. Also, matchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -886,7 +879,6 @@ spec: pod labels will be ignored. The default value is empty. The same key is forbidden to exist in both mismatchLabelKeys and labelSelector. Also, mismatchLabelKeys cannot be set when labelSelector isn't set. - This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default). type: array items: type: string @@ -1089,7 +1081,7 @@ spec: Immutable. type: array items: - description: EnvFromSource represents the source of a set of ConfigMaps + description: EnvFromSource represents the source of a set of ConfigMaps or Secrets type: object properties: configMapRef: @@ -1110,7 +1102,7 @@ spec: type: boolean x-kubernetes-map-type: atomic prefix: - description: An optional identifier to prepend to each key in the ConfigMap. Must be a C_IDENTIFIER. + description: Optional text to prepend to the name of each environment variable. Must be a C_IDENTIFIER. type: string secretRef: description: The Secret to select from @@ -2235,7 +2227,7 @@ spec: The types of objects that may be mounted by this volume are defined by the container runtime implementation on a host machine and at minimum must include all valid types supported by the container image field. The OCI object gets mounted in a single directory (spec.containers[*].volumeMounts.mountPath) by merging the manifest layers in the same way as for container images. The volume will be mounted read-only (ro) and non-executable files (noexec). - Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath). + Sub path mounts for containers are not supported (spec.containers[*].volumeMounts.subpath) before 1.33. The field spec.securityContext.fsGroupChangePolicy has no effect on this volume type. type: object properties: diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 3f6c0a5007..b62d520d1c 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3e28899b0f4d86717c22c818dc92f3f9b6de758ffce194cf1090969271d9d431 + digest: sha256:34ddf657291b60ac23249ea23dea2b5e1f6c9db6cedca633daa0cb22ef72b2a1 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:4d2de17a57968e9968eb92683cf72f043b3493a490d7d796eb1faa839476df01 + digest: sha256:6e08e7fee98e13918b85ffdab8104956da0085e431d61f7418377839d5526755 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7c02b9694bcae5721c9646dc9886cfc2fa31ba670dfc5b5926e18b1b36aa6800 + digest: sha256:ce210b91c041fa4094473b7716a545e0f3c8763b86f4683b3c3a45ff0afbf527 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d2de17a57968e9968eb92683cf72f043b3493a490d7d796eb1faa839476df01 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e08e7fee98e13918b85ffdab8104956da0085e431d61f7418377839d5526755 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e28899b0f4d86717c22c818dc92f3f9b6de758ffce194cf1090969271d9d431 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34ddf657291b60ac23249ea23dea2b5e1f6c9db6cedca633daa0cb22ef72b2a1 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 06422fd72e..f72268f3a6 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:20f088c569c42c5171fd47443fa5111f9a45f88806b439184f74076153089b43 + digest: sha256:bc88964d3a636b71eb931549e58253cadfcb64d3a67cbb21915ba721100710f0 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fc3c3ca15e473360cb0c0fadaf3b3d7316ff3559362b494a039e4dfcc397cb4b + digest: sha256:ce7dd7d362392a849073d9670ef29d636ada6ba7e1d3f31b6527244d77dc997b - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ead5ccb1f8b5dc2fe6862b9e3d433994a725f4b862fc7f6b4c702adc4a15f6c9 + digest: sha256:1c50aa06d9941f555f0e0fbcc2a3aae27053775f0a8de18ae6248d27cc1f3c99 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc3c3ca15e473360cb0c0fadaf3b3d7316ff3559362b494a039e4dfcc397cb4b + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce7dd7d362392a849073d9670ef29d636ada6ba7e1d3f31b6527244d77dc997b - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20f088c569c42c5171fd47443fa5111f9a45f88806b439184f74076153089b43 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc88964d3a636b71eb931549e58253cadfcb64d3a67cbb21915ba721100710f0 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 113cd9284d..eef2ebe696 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-07-11-045706" + "base": "4.20.0-0.nightly-arm64-2025-07-15-141336" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e28899b0f4d86717c22c818dc92f3f9b6de758ffce194cf1090969271d9d431", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d2de17a57968e9968eb92683cf72f043b3493a490d7d796eb1faa839476df01", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c02b9694bcae5721c9646dc9886cfc2fa31ba670dfc5b5926e18b1b36aa6800" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34ddf657291b60ac23249ea23dea2b5e1f6c9db6cedca633daa0cb22ef72b2a1", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e08e7fee98e13918b85ffdab8104956da0085e431d61f7418377839d5526755", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce210b91c041fa4094473b7716a545e0f3c8763b86f4683b3c3a45ff0afbf527" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index 320eb3b9f3..3230e04f95 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.20.0-0.nightly-2025-07-07-234740" + "base": "4.20.0-0.nightly-2025-07-15-083124" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20f088c569c42c5171fd47443fa5111f9a45f88806b439184f74076153089b43", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc3c3ca15e473360cb0c0fadaf3b3d7316ff3559362b494a039e4dfcc397cb4b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ead5ccb1f8b5dc2fe6862b9e3d433994a725f4b862fc7f6b4c702adc4a15f6c9" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc88964d3a636b71eb931549e58253cadfcb64d3a67cbb21915ba721100710f0", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce7dd7d362392a849073d9670ef29d636ada6ba7e1d3f31b6527244d77dc997b", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c50aa06d9941f555f0e0fbcc2a3aae27053775f0a8de18ae6248d27cc1f3c99" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f99561c413..a97f637cd5 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-07-11-045706" + "base": "4.20.0-0.nightly-arm64-2025-07-15-141336" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d32650af5850969e32c84ef0e3d5dd8f59faef434e9cbaf63eb2f64180ff5dcf", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:169fc4b139f065c1ed99a3c3dc738eac0b4794ee50e7972d71b65dbdab401a83", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbab4094d3f9dfe2d5dee44fc3e85a41d84a6826f3f1dd36aa2edf072ae905ac", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c02b9694bcae5721c9646dc9886cfc2fa31ba670dfc5b5926e18b1b36aa6800", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:447a1e3e3ae14063590e81596fc1437b7efa2577937f54abf8eb0e060e4b203c", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39df0047e5accc8170ffdc8f434fdd0ae442c9e48da63a911b615fb2221a1540", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9634630db56730e5431a05a78f9e7db68d6f18cce4f9c4d6db5b9fb1a0c8f52", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8edb1234cd2b91414db43a653acaaa34684157ab4432b569c42cf5cf06ded23", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fdaf09d9bd5d28dd3a74e1570404adc56ef46a9117e0742a3fc433bf3799fd6", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:150d0b09f0f813d795b672df1a382f2cd44891dfb9ca4e907f2aff05af7c358b", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce210b91c041fa4094473b7716a545e0f3c8763b86f4683b3c3a45ff0afbf527", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:318c7ad4a9eda7a5e70976ee418dff8ad02987dc22b514094ede90bd4018b724", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79d7d07453563f94d8bbe4dc3ce88a9532604f3d5b49b7bd8cc8e3a4741fab5e", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e88554ad7bde8b439e41a97167e6c288eaa7dca6ed37bd76d2ed01b560a95642", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:0689e27defe411a07da33e339ec65df67e09a3a7080b8e5494fae5cb1a35db36", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f14bbb9ffead55a69f6d04e83434ebc812fc0a0f8fb3a6ebd97d19ce2274f76" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb103a9b84b82668f1fd401689f9adeeffcb8bbf88624dc8be228c15f3147719" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index a5d9e3f3fe..4bdc608853 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-2025-07-07-234740" + "base": "4.20.0-0.nightly-2025-07-15-083124" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c28cbe53958d4a95d5f3091261776fa09fc4b047d78ef2882dec8bc4d521427c", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89988837bfd20375261a0ea4a811426fd8adcbe3388c0d19eb8487d95496f632", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6243d3f3ed8073c29938650ce6bad95782f89bfaa882881ee4f48079e127815", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ead5ccb1f8b5dc2fe6862b9e3d433994a725f4b862fc7f6b4c702adc4a15f6c9", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df9eaa414218952436f158e7b2897e470b17b1f943c3b9a5190d3dbfdb563c3e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d98b33e5e3e4b39106708a0ecf119bed8447a4691a2c5644791487f7b453bb21", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1762154f5f76d192c9ca4eb445db665909e3b30520a7dabdfb358beea90e285e", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b0c6edc7c52a65ed17d77c02ac296f18832b461f9d516883316354e9d10805f", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dea048e54189bcfd20b9fee452203ecdadba10e209ab5df243a3eb816f028108", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96b3a76e213f5df04ea2bfaa85bbf858fbbc00b02e96061263a49ad833e01df5", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c50aa06d9941f555f0e0fbcc2a3aae27053775f0a8de18ae6248d27cc1f3c99", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7eeb22f103e42843ae45cf9d39bbe50812957c4e75ab8838c12c5a1a0c14b0b5", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37816ecf994884f3754b2a00dc6b0a1e2bda220e216274a69c7eeb7e230b5c8e", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84ea8c47a0fcd184c53cd763e96ad55019bc1e9af384e48dc8ab16825fb15597", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:b372811ed8263f80c0903a63e9fd9d05d4dbf2b4d7adcb32304108124841e5bc", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4318194be8605836ea4d1f8a3048eb6e0f3d28a123d57047bc56789d15b9c1fd" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65968340652adb00b1adcdcb2a06313c8f676868f8e1d7231b8504e291c195f6" } } diff --git a/deps/github.com/openshift/route-controller-manager/.ci-operator.yaml b/deps/github.com/openshift/route-controller-manager/.ci-operator.yaml index 7c15f83e3e..461415cbc5 100644 --- a/deps/github.com/openshift/route-controller-manager/.ci-operator.yaml +++ b/deps/github.com/openshift/route-controller-manager/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-9-release-golang-1.23-openshift-4.19 + tag: rhel-9-release-golang-1.24-openshift-4.20 diff --git a/deps/github.com/openshift/route-controller-manager/Dockerfile b/deps/github.com/openshift/route-controller-manager/Dockerfile index 1e4bc5fba8..426d1d8e08 100644 --- a/deps/github.com/openshift/route-controller-manager/Dockerfile +++ b/deps/github.com/openshift/route-controller-manager/Dockerfile @@ -1,9 +1,9 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder WORKDIR /go/src/github.com/openshift/route-controller-manager COPY . . RUN make build --warn-undefined-variables -FROM registry.ci.openshift.org/ocp/4.19:base-rhel9 +FROM registry.ci.openshift.org/ocp/4.20:base-rhel9 COPY --from=builder /go/src/github.com/openshift/route-controller-manager/route-controller-manager /usr/bin/ LABEL io.k8s.display-name="OpenShift Route Controller Manager Command" \ io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \ diff --git a/etcd/go.mod b/etcd/go.mod index 532253a214..1c47b1c949 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -37,7 +37,7 @@ require ( github.com/oklog/run v1.1.0 // indirect github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/squat/generic-device-plugin v0.0.0-20250313105706-6475ff5d0927 // indirect + github.com/squat/generic-device-plugin v0.0.0-20250710162141-0f7fddf166f1 // indirect github.com/vishvananda/netlink v1.3.1-0.20250206174618-62fb240731fa // indirect github.com/vishvananda/netns v0.0.4 // indirect github.com/x448/float16 v0.8.4 // indirect diff --git a/etcd/go.sum b/etcd/go.sum index b24759255d..29a5c4a561 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -220,8 +220,8 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/squat/generic-device-plugin v0.0.0-20250313105706-6475ff5d0927 h1:ku27KO9QGKiPvTSVrOP2qUzvM3v+TDdvPmyB6vGl678= -github.com/squat/generic-device-plugin v0.0.0-20250313105706-6475ff5d0927/go.mod h1:rFRt0GxGw04yGcbfSqoUENZH0p+1oL6IziAVQ31NAVw= +github.com/squat/generic-device-plugin v0.0.0-20250710162141-0f7fddf166f1 h1:jNjbOvtxFsLW9OkNs20b1hY/8Q8DWccUjYyOOxi1O00= +github.com/squat/generic-device-plugin v0.0.0-20250710162141-0f7fddf166f1/go.mod h1:rFRt0GxGw04yGcbfSqoUENZH0p+1oL6IziAVQ31NAVw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/config/gdp.go b/etcd/vendor/github.com/openshift/microshift/pkg/config/gdp.go index 741e4064a6..3acd9e28dc 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/config/gdp.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/config/gdp.go @@ -99,6 +99,10 @@ func (gdp GenericDevicePlugin) validate() error { "failed to parse device %q; cannot define both path and usb at the same time", deviceSpec.Name)) } + + for _, path := range g.Paths { + errs = append(errs, path.validate()...) + } } } @@ -216,8 +220,9 @@ type Path struct { // +kubebuilder:default=false ReadOnly bool `json:"readOnly,omitempty"` // Type describes what type of file-system node this Path represents and thus how it should be mounted. - // When unspecified, Type defaults to Device. + // Allowed values: "Device", "Mount". When unspecified, type defaults to Device. // +kubebuilder:default=Device + // +kubebuilder:validation:Enum:=Device;Mount;"" Type deviceplugin.PathType `json:"type,omitempty"` // Limit specifies up to how many times this device can be used in the group concurrently when other devices // in the group yield more matches. @@ -239,6 +244,46 @@ func (p *Path) toGDP() *deviceplugin.Path { } } +func (p *Path) validate() []error { + errs := []error{} + + if p.Type != "" && + p.Type != deviceplugin.DevicePathType && + p.Type != deviceplugin.MountPathType { + errs = append(errs, fmt.Errorf( + "invalid type for path '%s': '%s' - accepted values are '' (will default to %s), %s, or %s", + p.Path, p.Type, deviceplugin.DevicePathType, deviceplugin.DevicePathType, deviceplugin.MountPathType)) + } + + if p.ReadOnly && p.Type != deviceplugin.MountPathType { + errs = append(errs, fmt.Errorf( + "invalid readOnly value for path '%s': readOnly is only allowed for paths of type Mount", + p.Path)) + } + + if p.Type == deviceplugin.MountPathType && p.Permissions != "" { + errs = append(errs, fmt.Errorf( + "invalid permissions for path '%s': permissions are not allowed for paths of type Mount", + p.Path)) + } + + // Although Permissions are only for 'Device' type, we can always check them + // and offer as many error messages as possible in case the type was mistyped. + invalidChars := []string{} + for _, c := range p.Permissions { + if c != 'm' && c != 'r' && c != 'w' { + invalidChars = append(invalidChars, string(c)) + } + } + if len(invalidChars) > 0 { + errs = append(errs, fmt.Errorf( + "invalid permissions for path %q: invalid characters '%s' in permissions string '%s' (only 'm', 'r', and 'w' are allowed)", + p.Path, strings.Join(invalidChars, ", "), p.Permissions)) + } + + return errs +} + // USBSpec represents a USB device specification that should be discovered. // A USB device must match exactly on all the given attributes to pass. type USBSpec struct { diff --git a/etcd/vendor/github.com/squat/generic-device-plugin/deviceplugin/generic.go b/etcd/vendor/github.com/squat/generic-device-plugin/deviceplugin/generic.go index 7b427d93b8..3747089139 100644 --- a/etcd/vendor/github.com/squat/generic-device-plugin/deviceplugin/generic.go +++ b/etcd/vendor/github.com/squat/generic-device-plugin/deviceplugin/generic.go @@ -168,7 +168,7 @@ func (gp *GenericPlugin) refreshDevices() (bool, error) { old := gp.devices gp.devices = make(map[string]device) - var equal bool + equal := true // Add the new devices to the map and check // if they were in the old map. for _, d := range devices { diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 8ff1709e6c..8498809018 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -270,7 +270,7 @@ github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 ## explicit; go 1.12 github.com/spf13/pflag -# github.com/squat/generic-device-plugin v0.0.0-20250313105706-6475ff5d0927 +# github.com/squat/generic-device-plugin v0.0.0-20250710162141-0f7fddf166f1 ## explicit; go 1.19 github.com/squat/generic-device-plugin/absolute github.com/squat/generic-device-plugin/deviceplugin diff --git a/go.mod b/go.mod index 65cdc3073f..fee580858c 100644 --- a/go.mod +++ b/go.mod @@ -34,7 +34,7 @@ require ( github.com/go-kit/kit v0.9.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 - github.com/openshift/route-controller-manager v0.0.0-20241218160919-bc97534a12a7 + github.com/openshift/route-controller-manager v0.0.0-20250709131101-e148fabc13f7 github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.62.0 github.com/prometheus/prometheus v0.302.1 diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index cc2c85100f..dd3369d4b0 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -23,6 +23,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d98b33e5e3e4b39106708a0ecf119bed8447a4691a2c5644791487f7b453bb21" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37816ecf994884f3754b2a00dc6b0a1e2bda220e216274a69c7eeb7e230b5c8e" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 9412d2f6ca..65b00ee631 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -23,6 +23,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39df0047e5accc8170ffdc8f434fdd0ae442c9e48da63a911b615fb2221a1540" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79d7d07453563f94d8bbe4dc3ce88a9532604f3d5b49b7bd8cc8e3a4741fab5e" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index e69de29bb2..c5df005178 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,77 @@ +- api embedded-component ad766c4e6d8e5adc72537d145bd4f24365e3e560 to 674ad74beffcbdf6aa7a577bf23a269c24f92fe8 + - fd43ac5c 2025-07-09T10:29:23-03:00 bump(k8s): tools: go mod vendor + - f0c4cde4 2025-07-09T10:28:47-03:00 bump(k8s): tools: update k8s.io/* dependencies to v1.33.2 + - 071eb859 2025-07-09T10:26:21-03:00 bump(k8s): make update + - 35a7ea05 2025-07-09T10:17:35-03:00 bump(k8s): update go to 1.24 + - 3077a211 2025-07-09T10:17:06-03:00 bump(k8s): go mod vendor + - c8a59d3d 2025-07-09T10:16:53-03:00 bump(k8s): update k8s.io/* dependencies to v1.33.2 + - 4dc1caf0 2025-07-09T11:14:39+01:00 Disable schema checker overlap with KAL + - e76f3059 2025-07-08T10:32:18+02:00 remove AWSEFSDriverVolumeMetrics featuregate + - 8f9e6cac 2025-07-07T13:36:38-04:00 register v1 (cluster)imagepolicy + - 648ab9a6 2025-07-07T10:15:41+01:00 Enable MutatingAdmissionPolicy in Dev/TechPreview + - 636ec894 2025-07-04T15:56:18+01:00 Add config for uniquemarkers + - f62903b3 2025-07-04T15:46:57+01:00 Update generated content + - 10ae908d 2025-07-04T15:46:55+01:00 Apply partial fixes + - 92dede72 2025-07-04T15:46:54+01:00 Configure optionalfields linter + - 040724b5 2025-07-04T15:46:53+01:00 Move kube-api-linter to a go-plugin integration + - fdb699f8 2025-07-04T15:46:52+01:00 Update KAL vendor + - 97fd04f6 2025-07-04T15:46:51+01:00 Update configuration to move to golangci-lint v2 + - e9242d50 2025-07-04T15:46:50+01:00 Move go mod golangci-lint to v2 + - 8fa54b5e 2025-06-18T17:32:37+05:30 OAPE-232: Remove GCPLabelsTags featuregate + +- cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 to 48ebc1269caad1e9ec7f422b24f3bccbe134d0c4 + - 4d7d11c 2025-06-19T00:30:31+00:00 Updating ose-cluster-dns-operator-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-cluster-dns-operator.yml + +- cluster-kube-apiserver-operator embedded-component add2db9de136758cac8c45184b7ba7812de0893b to 04595ca2622f5a6bc3b3facfec0ef876b6acaa2e + - 38109ca 2025-07-10T10:16:39-03:00 bump(k8s): stop trying to patch CRDs + - a4c281c 2025-07-10T10:15:07-03:00 bump(k8s): go mod vendor + - 333807b 2025-07-10T10:14:42-03:00 bump(k8s): tools: update k8s.io/* dependencies to v1.33.2 + +- csi-external-snapshotter embedded-component 1b2240dca48840103558b499281effaea072b162 to b5725afc9e3dfbc9614e4e62a62e8bc5897527f9 + - e418a63 2025-06-30T15:43:22+02:00 UPSTREAM: 1303: Fix requeueing snapshot content after deletion error + +- machine-config-operator embedded-component 433fd83ae10b547a586135353bff7cf108fc8f5b to 3fa701ea9238cd911220d9a0da347a0bea2dcbfc + - 8e4b9682 2025-07-08T13:58:33+02:00 MCO-1739: Set OTE suite as disruptive and timeout + - 1d7c8e80 2025-07-07T15:25:46-05:00 Add emy to baremetal-reviewers + - dc7fd14f 2025-07-03T11:50:54-04:00 node controller: update MCP degrade status by using MCN NodeDegrade condition status + - edc881df 2025-07-03T11:11:33-04:00 platform_helpers: Add support for vSphere vsphere_helpers: add helper functions for vSphere cache: Caches bootimages in the MCC Pod featuregates: Add vsphere in TP fg + - 0c962f30 2025-07-03T11:11:33-04:00 go.mod: vendor govmomi + - ab3d5bcd 2025-06-13T15:10:22-04:00 ensure that build pod shuts down quickly after being terminated + - 48004bf4 2025-06-13T15:10:21-04:00 makes build object deletion optional + - dced9d52 2025-06-13T15:10:09-04:00 adds shutdowndelayhandler to buildcontroller + - f3b92432 2025-06-13T11:30:31-04:00 use channel to signal controller shutdown + +- operator-framework-olm embedded-component 53e474a396266c54f0276c8b9e28f2541849b981 to e449ed463d889d2d3b79c3fe098d42199a4ba4dc + - 9e461a9b 2025-07-12T00:03:48+00:00 :seedling: Bump the k8s-dependencies group with 11 updates (#3600) + - 7455339c 2025-07-11T00:04:05+00:00 add oceanc to approvers (#3609) + - fea9ac77 2025-07-11T00:03:23+00:00 🐛 add catalog-operator control-plane-specific tolerations to unpack jobs (#3606) + +- route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 to e148fabc13f735d5f59a94714031d8765abb9895 + - 6a19aca 2025-06-18T12:01:48+00:00 Updating ose-route-controller-manager-container image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-route-controller-manager.yml + +- csi-external-snapshotter image-amd64 1b2240dca48840103558b499281effaea072b162 to b5725afc9e3dfbc9614e4e62a62e8bc5897527f9 + - e418a63 2025-06-30T15:43:22+02:00 UPSTREAM: 1303: Fix requeueing snapshot content after deletion error + +- ovn-kubernetes image-amd64 31d2803e5f38207bf2137ba2ec15a95cee1d0802 to 0f86580a4e6057f8bc1e09abd6f36625f076b23d + - 1ea27391 2025-07-02T14:39:25-07:00 Revert "Add the IP rule for a UDN only when it is advertised to the default VRF" + - db87df1d 2025-07-01T09:31:06+01:00 Layer 2 EIP: remove stale LRP if pod is remote + - 8a70c81d 2025-07-01T09:31:03+01:00 EIP OVN controller: stop pod config flap + - a1d47314 2025-07-01T10:39:46+03:00 contrib,kind: Use skopeo to get the actual ovnkube-image digest + - 5ea894c8 2025-07-01T10:39:45+03:00 contrib, kind.sh: Fix local registry when using podman + - 05f8d8f0 2025-06-25T14:15:44+00:00 Add short doc update with the ovn-ic components on the DPU + - 116ba522 2025-06-24T23:15:41+00:00 ovnkube.sh: Add new overwriting options for the gateway options and kubernetes node name + - ff1b163c 2025-06-24T04:47:39+00:00 Bump the go_modules group across 3 directories with 4 updates + - 21e4f0eb 2025-06-23T14:58:33+02:00 Fix the host drop rules to match on new state + - 19be786c 2025-06-19T22:35:32+03:00 use slash as path separator for some sysctl commands + - 70fe56c6 2025-06-19T07:23:52+02:00 Add labels to filter e2e tests + - 1fb89831 2025-06-16T10:33:02+02:00 [e2e] kubevirt: generate test name that is compatible with file path. + - deff5e64 2025-06-12T14:58:27+02:00 Add the IP rule for a UDN only when it is advertised to the default VRF + - 228d4440 2025-06-12T13:41:43+01:00 GH VM: remove more items after disk space limit reached + - 2412b506 2025-06-11T20:53:11+03:00 stop adding events to NAD if the network type is not ovn-k + - 10be5961 2025-06-11T15:35:32+00:00 Bump golang.org/x/crypto + - d14d8483 2025-06-11T16:58:56+02:00 remote node deletion failure due to libovsdb integrity violation error + - 61f57e2a 2025-06-11T16:58:56+02:00 Delete logical static routes only if they belong to the spefified router + - 304975a0 2025-06-11T16:58:56+02:00 Add node deletion unit testing case for zone_ic_handler + - 07973c38 2025-06-03T12:59:20+02:00 Add custom_fences config to mkdocs.yml + - c68299e5 2025-06-03T12:02:01+02:00 Add mermaid mkdocs plugin + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3de572529b..df939b339c 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,28 +1,28 @@ -https://github.com/openshift/api embedded-component ad766c4e6d8e5adc72537d145bd4f24365e3e560 +https://github.com/openshift/api embedded-component 674ad74beffcbdf6aa7a577bf23a269c24f92fe8 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component ef2152f52b992addcbe24b402f1ddbf180049d85 -https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 +https://github.com/openshift/cluster-dns-operator embedded-component 48ebc1269caad1e9ec7f422b24f3bccbe134d0c4 https://github.com/openshift/cluster-ingress-operator embedded-component cbc0b217b655f1f0ce0becc9145c2a6042beabea -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component add2db9de136758cac8c45184b7ba7812de0893b +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 04595ca2622f5a6bc3b3facfec0ef876b6acaa2e https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component e9a24940d18e4a1b0f2f8367a4e4a0909b819a2b https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e68b158bb4c0bf56876b4d09d0344979592c7b3c https://github.com/openshift/cluster-network-operator embedded-component 29122af3abbecc793638e6a9fe846d7bdf3c295f https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 8781f7247e9442428a4b1971b90a9c31fcccdce9 https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 -https://github.com/openshift/csi-external-snapshotter embedded-component 1b2240dca48840103558b499281effaea072b162 +https://github.com/openshift/csi-external-snapshotter embedded-component b5725afc9e3dfbc9614e4e62a62e8bc5897527f9 https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4cdeb7473f5c26 https://github.com/openshift/kubernetes embedded-component e52b13b59e910bfa409eaa1e5280c4160b687bf8 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 2b36e46ab36a5a7581c9ed763e0a7646f90b94e7 -https://github.com/openshift/machine-config-operator embedded-component 433fd83ae10b547a586135353bff7cf108fc8f5b +https://github.com/openshift/machine-config-operator embedded-component 3fa701ea9238cd911220d9a0da347a0bea2dcbfc https://github.com/openshift/openshift-controller-manager embedded-component bef75e9ea2df7cf2d417299c353da4c360f22d02 -https://github.com/openshift/operator-framework-olm embedded-component 53e474a396266c54f0276c8b9e28f2541849b981 -https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 +https://github.com/openshift/operator-framework-olm embedded-component e449ed463d889d2d3b79c3fe098d42199a4ba4dc +https://github.com/openshift/route-controller-manager embedded-component e148fabc13f735d5f59a94714031d8765abb9895 https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-amd64 f0e10516c2bab32e797240b7bd4a2c6563138709 https://github.com/openshift/coredns image-amd64 a69279e3393b269099dcaae967570741d4c5e469 -https://github.com/openshift/csi-external-snapshotter image-amd64 1b2240dca48840103558b499281effaea072b162 +https://github.com/openshift/csi-external-snapshotter image-amd64 b5725afc9e3dfbc9614e4e62a62e8bc5897527f9 https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 bc1ca29e2b6b50f15ece8db3990277276cacff0c -https://github.com/openshift/ovn-kubernetes image-amd64 31d2803e5f38207bf2137ba2ec15a95cee1d0802 +https://github.com/openshift/ovn-kubernetes image-amd64 0f86580a4e6057f8bc1e09abd6f36625f076b23d https://github.com/openshift/kubernetes image-amd64 e52b13b59e910bfa409eaa1e5280c4160b687bf8 https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-arm64 f0e10516c2bab32e797240b7bd4a2c6563138709 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 5f878c037f..6658664dcd 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-07-07-234740" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-07-11-045706" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-07-15-083124" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-07-15-141336" diff --git a/vendor/k8s.io/apimachinery/third_party/forked/golang/json/fields.go b/vendor/k8s.io/apimachinery/third_party/forked/golang/json/fields.go index e38605df92..5b8514b3fa 100644 --- a/vendor/k8s.io/apimachinery/third_party/forked/golang/json/fields.go +++ b/vendor/k8s.io/apimachinery/third_party/forked/golang/json/fields.go @@ -359,9 +359,8 @@ const ( // 4) simpleLetterEqualFold, no specials, no non-letters. // // The letters S and K are special because they map to 3 runes, not just 2: -// - S maps to s and to U+017F 'ſ' Latin small letter long s -// - k maps to K and to U+212A 'K' Kelvin sign -// +// * S maps to s and to U+017F 'ſ' Latin small letter long s +// * k maps to K and to U+212A 'K' Kelvin sign // See http://play.golang.org/p/tTxjOc0OGo // // The returned function is specialized for matching against s and diff --git a/vendor/k8s.io/client-go/third_party/forked/golang/template/exec.go b/vendor/k8s.io/client-go/third_party/forked/golang/template/exec.go index ed66f84010..7cf29524ce 100644 --- a/vendor/k8s.io/client-go/third_party/forked/golang/template/exec.go +++ b/vendor/k8s.io/client-go/third_party/forked/golang/template/exec.go @@ -1,6 +1,6 @@ -// This package is copied from Go library text/template. -// The original private functions indirect and printableValue -// are exported as public functions. +//This package is copied from Go library text/template. +//The original private functions indirect and printableValue +//are exported as public functions. package template import ( diff --git a/vendor/k8s.io/client-go/third_party/forked/golang/template/funcs.go b/vendor/k8s.io/client-go/third_party/forked/golang/template/funcs.go index 94c396c657..f0c8e712ca 100644 --- a/vendor/k8s.io/client-go/third_party/forked/golang/template/funcs.go +++ b/vendor/k8s.io/client-go/third_party/forked/golang/template/funcs.go @@ -1,6 +1,6 @@ -// This package is copied from Go library text/template. -// The original private functions eq, ge, gt, le, lt, and ne -// are exported as public functions. +//This package is copied from Go library text/template. +//The original private functions eq, ge, gt, le, lt, and ne +//are exported as public functions. package template import ( diff --git a/vendor/modules.txt b/vendor/modules.txt index e15d9cbee5..383190265d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -718,7 +718,7 @@ github.com/openshift/library-go/pkg/route/validation github.com/openshift/library-go/pkg/security/ldaputil github.com/openshift/library-go/pkg/security/uid github.com/openshift/library-go/pkg/serviceability -# github.com/openshift/route-controller-manager v0.0.0-20241218160919-bc97534a12a7 => ./deps/github.com/openshift/route-controller-manager +# github.com/openshift/route-controller-manager v0.0.0-20250709131101-e148fabc13f7 => ./deps/github.com/openshift/route-controller-manager ## explicit; go 1.22.0 github.com/openshift/route-controller-manager/pkg/cmd/controller github.com/openshift/route-controller-manager/pkg/cmd/route-controller-manager