diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 8d7b573db2..5104f16f04 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.3 -KUBE_GIT_COMMIT=76a7b9964ebe022596bbbabe2e2ca371b02b2752 +KUBE_GIT_COMMIT=83565d533048d2c0c574d94a66bc01f21cd039ec KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 53d77673b9..b1eedecd79 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-05-01-154018 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-05-06-200038 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c73ef4846a..d6cc496867 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-05-01-165245 +OCP_VERSION := 4.20.0-0.nightly-2025-05-06-221334 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 90a67449f8..2d90e76680 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:2f23cbd0222d91019f7a5c45d8c47534ccecad29d4dc19d9da9b7438d0ac138a + digest: sha256:bdec748e1d9bb26296669ccdcf4f886477c2f59b2746cbce6e9f7d0335e3d6f6 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8ff22246367f96f819119c1801cce8c6db27e164ed66ae5e1d93a156ba9e7f97 + digest: sha256:a0c9e2f635edf59ead8f37ea1e9db1d68f58eb98b3ebefeea9c8037e7e7a096a diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index edcb90560a..74c94664f8 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:f0a670eb1340f0cc236de159c1f5c4b45cd6e04653b8742792555f670dec8e35 + digest: sha256:821be95e82bdb0ffc603f01fbee37fc7f82cfb05e237924f250aa2defe5df028 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:685d9ccff024a47360d536818e6ac44fd86617308ac5b560268b292ea697944d + digest: sha256:f18cb13b92bb8581534d02d204d1ff067da5d56b69a8ec33dcea4f3bbd838fa2 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 93b5ef8291..06678bf079 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-05-01-154018" + "base": "4.20.0-0.nightly-arm64-2025-05-06-200038" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f23cbd0222d91019f7a5c45d8c47534ccecad29d4dc19d9da9b7438d0ac138a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ff22246367f96f819119c1801cce8c6db27e164ed66ae5e1d93a156ba9e7f97" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdec748e1d9bb26296669ccdcf4f886477c2f59b2746cbce6e9f7d0335e3d6f6", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0c9e2f635edf59ead8f37ea1e9db1d68f58eb98b3ebefeea9c8037e7e7a096a" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 14f995b45b..e1db7ea6fa 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.19.0-0.nightly-2025-05-01-165245" + "base": "4.20.0-0.nightly-2025-05-06-221334" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0a670eb1340f0cc236de159c1f5c4b45cd6e04653b8742792555f670dec8e35", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:685d9ccff024a47360d536818e6ac44fd86617308ac5b560268b292ea697944d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:821be95e82bdb0ffc603f01fbee37fc7f82cfb05e237924f250aa2defe5df028", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f18cb13b92bb8581534d02d204d1ff067da5d56b69a8ec33dcea4f3bbd838fa2" } } diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index b73605bbb0..46182b8a04 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -3,14 +3,14 @@ "base": "2.19.0" }, "images": { + "vllm-cpu-image": "quay.io/modh/vllm@sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa", + "vllm-gaudi-image": "quay.io/modh/vllm@sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c", + "vllm-rocm-image": "quay.io/modh/vllm@sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5", "caikit-tgis-image": "quay.io/modh/caikit-tgis-serving@sha256:2c7eef73708b5d73de33153459ac7238fdcf517cdc3544c775981f5814b4b6ed", "caikit-standalone-image": "quay.io/modh/caikit-nlp@sha256:ada8949b81e646809101edfc76738eb5aac362f783eb2facc8aeed21c7c1512f", "tgis-image": "quay.io/modh/text-generation-inference@sha256:aebf545d8048a59174f70334dc90c6b97ead4602a39cb7598ea68c8d199168a2", "ovms-image": "quay.io/modh/openvino_model_server@sha256:53b7fcf95de9b81e4c8652d0bf4e84e22d5b696827a5d951d863420c68b9cfe8", "vllm-cuda-image": "quay.io/modh/vllm@sha256:4f550996130e7d16cacb24ca9a2865e7cf51eddaab014ceaf31a1ea6ef86d4ec", - "vllm-cpu-image": "quay.io/modh/vllm@sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa", - "vllm-gaudi-image": "quay.io/modh/vllm@sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c", - "vllm-rocm-image": "quay.io/modh/vllm@sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5", "kserve-controller": "quay.io/modh/kserve-controller@sha256:62aa39acd23cd8097fc48b5b30fe35572efb46adc5d04e4215aadb77193e71df", "kserve-agent": "quay.io/modh/kserve-agent@sha256:84d037d1ad3126f089298460a380041e2f819ce3af3ff21fc781bbf6b6ea81e3", "kserve-router": "quay.io/modh/kserve-router@sha256:9def4776bc51cd2d78f4d6d57fd707a207616de4f7064c1f9a440af3f42ce741", diff --git a/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml b/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml index e8df11ca09..1e9ebe957c 100644 --- a/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml +++ b/assets/optional/ai-model-serving/runtimes/kustomization.x86_64.yaml @@ -1,5 +1,14 @@ images: + - name: vllm-cpu-image + newName: quay.io/modh/vllm + digest: sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa + - name: vllm-gaudi-image + newName: quay.io/modh/vllm + digest: sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c + - name: vllm-rocm-image + newName: quay.io/modh/vllm + digest: sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5 - name: caikit-tgis-image newName: quay.io/modh/caikit-tgis-serving digest: sha256:2c7eef73708b5d73de33153459ac7238fdcf517cdc3544c775981f5814b4b6ed @@ -15,12 +24,3 @@ images: - name: vllm-cuda-image newName: quay.io/modh/vllm digest: sha256:4f550996130e7d16cacb24ca9a2865e7cf51eddaab014ceaf31a1ea6ef86d4ec - - name: vllm-cpu-image - newName: quay.io/modh/vllm - digest: sha256:881495befb6f807fa6e55f24e820fa67022b57d8ce0022305d89abe799c490fa - - name: vllm-gaudi-image - newName: quay.io/modh/vllm - digest: sha256:af6a071be36d8a99476f145d1589d7ede97d2760b93335b14ca26de7417e438c - - name: vllm-rocm-image - newName: quay.io/modh/vllm - digest: sha256:7e1d1985b0dd2b5ba2df41fc9c8c3edf13a2d9ed8a4d84db8f00eb6c753bc5c5 diff --git a/assets/optional/kube-proxy/kustomization.aarch64.yaml b/assets/optional/kube-proxy/kustomization.aarch64.yaml index 9e68a2408d..66b6e629d7 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:ea189753c1b76e32a4ee1a73f3c53f41adb594b9602046025f72a07952e00b6a + digest: sha256:028b5e4a353b8781a5f1e746dd2fdad7add4d70cd319ee9af66522524b6ae760 diff --git a/assets/optional/kube-proxy/kustomization.x86_64.yaml b/assets/optional/kube-proxy/kustomization.x86_64.yaml index b7a46976fa..752957a138 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:ef9e088a0e6620c5042aa4038ace3f453713c96de5a3fbe8f9d40eea4052cbab + digest: sha256:02c2f181a1613ad551c801e7f59d21d77bb20b5ea170e02bde295b0be8d16a6e diff --git a/assets/optional/kube-proxy/release-kube-proxy-aarch64.json b/assets/optional/kube-proxy/release-kube-proxy-aarch64.json index 41a7768143..b156afd375 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.19.0-0.nightly-arm64-2025-05-01-154018" + "base": "4.20.0-0.nightly-arm64-2025-05-06-200038" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea189753c1b76e32a4ee1a73f3c53f41adb594b9602046025f72a07952e00b6a" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:028b5e4a353b8781a5f1e746dd2fdad7add4d70cd319ee9af66522524b6ae760" } } 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 c556e4519e..eb653f8a0f 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.19.0-0.nightly-2025-05-01-165245" + "base": "4.20.0-0.nightly-2025-05-06-221334" }, "images": { - "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef9e088a0e6620c5042aa4038ace3f453713c96de5a3fbe8f9d40eea4052cbab" + "kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02c2f181a1613ad551c801e7f59d21d77bb20b5ea170e02bde295b0be8d16a6e" } } 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 e12a282f3f..728cf917c2 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 @@ -979,11 +979,10 @@ spec: configured to use *must* be using the file-based catalogs in order to utilize this feature. type: object required: - - cacheDir - catalogDir properties: cacheDir: - description: CacheDir is the directory storing the pre-calculated API cache. + description: CacheDir is the (optional) directory storing the pre-calculated API cache. type: string catalogDir: description: CatalogDir is the directory storing the file-based catalog contents. diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 4639fbada5..4e90286f08 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:d23af0a85571f00c68922407154643b385d198f5b676d36530f518e0e44bb758 + digest: sha256:75fadfb30e26a438d85345f9b4dbedd605f8e55a7c2dd5e65530a0bfcb4a315c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:159fe02a960d43fcf308d1d94495e62a43925bb4deef7457278bf8376745c535 + digest: sha256:7ae5deca976ca953306e03805b36ae534cd718f7529a1d8c14915889374a1a7a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8bf9f7dd0d566d8616599a52606ee4c1fae787dfec1d80af7212e71c65b37693 + digest: sha256:77c9bb945daec0871ae2d49d6dc0cc1a05b08564fdf66c1854807267af18936c 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:159fe02a960d43fcf308d1d94495e62a43925bb4deef7457278bf8376745c535 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ae5deca976ca953306e03805b36ae534cd718f7529a1d8c14915889374a1a7a - 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:d23af0a85571f00c68922407154643b385d198f5b676d36530f518e0e44bb758 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75fadfb30e26a438d85345f9b4dbedd605f8e55a7c2dd5e65530a0bfcb4a315c 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 e17276a424..486a3e9ed0 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:5f37d4d98c24d3c024e24e7c23065bde68c3eb2aeeaa1092c55403daa08c127a + digest: sha256:61082bdc01fdb391a8d4fb05f5a116b7b4ce416ec31894792d30ed527b7b4311 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7d6875c640c3cadda8e695888f817b6cf5db2e337598f9527b710b264ec00746 + digest: sha256:efb2df1362d8e7c3491cbb004dd8b757e08d432c21cd1295658e8d5f8ce2c54b - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:06315ea009f9fc2bec3a673e95ee7a0c63da864a0613605972a3a6a6e69f9a9c + digest: sha256:58aaafcd6ca4001df4b91307da6a656349cb2cdbb84abad67307f2ae39ded87e 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:7d6875c640c3cadda8e695888f817b6cf5db2e337598f9527b710b264ec00746 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efb2df1362d8e7c3491cbb004dd8b757e08d432c21cd1295658e8d5f8ce2c54b - 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:5f37d4d98c24d3c024e24e7c23065bde68c3eb2aeeaa1092c55403daa08c127a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61082bdc01fdb391a8d4fb05f5a116b7b4ce416ec31894792d30ed527b7b4311 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 6474da6bed..d20ba881fd 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.19.0-0.nightly-arm64-2025-05-01-154018" + "base": "4.20.0-0.nightly-arm64-2025-05-06-200038" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d23af0a85571f00c68922407154643b385d198f5b676d36530f518e0e44bb758", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:159fe02a960d43fcf308d1d94495e62a43925bb4deef7457278bf8376745c535", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bf9f7dd0d566d8616599a52606ee4c1fae787dfec1d80af7212e71c65b37693" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75fadfb30e26a438d85345f9b4dbedd605f8e55a7c2dd5e65530a0bfcb4a315c", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ae5deca976ca953306e03805b36ae534cd718f7529a1d8c14915889374a1a7a", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77c9bb945daec0871ae2d49d6dc0cc1a05b08564fdf66c1854807267af18936c" } } 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 2b04dd222e..2e41dccf7d 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.19.0-0.nightly-2025-05-01-165245" + "base": "4.20.0-0.nightly-2025-05-06-221334" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f37d4d98c24d3c024e24e7c23065bde68c3eb2aeeaa1092c55403daa08c127a", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d6875c640c3cadda8e695888f817b6cf5db2e337598f9527b710b264ec00746", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06315ea009f9fc2bec3a673e95ee7a0c63da864a0613605972a3a6a6e69f9a9c" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61082bdc01fdb391a8d4fb05f5a116b7b4ce416ec31894792d30ed527b7b4311", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efb2df1362d8e7c3491cbb004dd8b757e08d432c21cd1295658e8d5f8ce2c54b", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58aaafcd6ca4001df4b91307da6a656349cb2cdbb84abad67307f2ae39ded87e" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f5f6840760..9773bb3fb8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-05-01-154018" + "base": "4.20.0-0.nightly-arm64-2025-05-06-200038" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:377dd2d55ea11be39452f4754a7148c60f35ada70164bed41c78629d5da863ea", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09fecdad3ab1a5a883629eaba42c0a15ac0897944a82290a5961e51314c4f167", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a92057ccbec66df6748bf7d737e70e6960d080b74ed6d8bbb008ca799b6baa70", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bf9f7dd0d566d8616599a52606ee4c1fae787dfec1d80af7212e71c65b37693", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f2ef9a0bcba1c5bc1dd5232071380f75e6d3efd3484f8bfa1eb80434f1518ff", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f01f30c9ada2d37ec0ae2e931b98f36c144f6c9d5d7ab5a08a41e94f9ce32ad5", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5d173a09c913f59488fba12de5519441cf55e663ade9f62da28e91c4e6a9fc9", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:125e551adb651614a5c778a5184bb43cac24ec94284354bd44e761682df030f6", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:936dcead5dd65752e03ee97fa443fb5d7dab2336892ab928685100640f412301", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57b5f6711c6d94fad0016c949fca1666cd7bb28820cf78b3ae1701f97c2c6baf", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77c9bb945daec0871ae2d49d6dc0cc1a05b08564fdf66c1854807267af18936c", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beb7b68099984a669962ea5c1722b082db88b503acbb22cbbd04caf9a62640cf", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2493eec2495b122b916b939dc624f2833d418bd32f0bae293e81e95575091cd", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c7c2fc140712bf39fcca533395666155ef0a079c8dff7d8565b6885acecb590", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:03771d66c0ed8a422c012ffaf6f390d8c3191e02330ef9b9dee00af518928d6e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f6200715352f3126bc417e10383968793236c0c57f259c1d9555a77051e326e1" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65f284f3dc9c1afbb7f421bd93ce62f2974e749d0aab66ac8a7f239da9caa53c" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 487aa777c2..756717ab45 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-2025-05-01-165245" + "base": "4.20.0-0.nightly-2025-05-06-221334" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:213dfdabfc405606535dfb8139ce6874ab4b6213d8dc85e4c600748b8c07e77a", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0f4e0293f973ad9adad7410740fd95eaf842d07376876f07a5d45be0a1ee088", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fbb56bbc30fc4aa4880e29c7a7c2580b6f42c68817ac42801b88d9b6f9dca20", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06315ea009f9fc2bec3a673e95ee7a0c63da864a0613605972a3a6a6e69f9a9c", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0968da39b93b38ff547e392178b844e8f9ad03a72b19351c51fe7d2da6c8f525", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6b87fee89f3fd25df2caef31b0be590981e1978be5ab99080f5864df4798b9e", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b5608846a2b0935e8bd57d6e12256b6f935f22c27f7b183ec0356a95141b0c5", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fea4c2af6560a980b03f13325c4cc745a05cfbc5066017e454bd07d0a536d2", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac9449d497e4339d63c47b331b75883cffbe5cb6146985a6daa099054cd68d87", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7ffea97ef4b6e617a9b596ad7d41e6799ee8389f88946b97efa370d4a0d9ff8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58aaafcd6ca4001df4b91307da6a656349cb2cdbb84abad67307f2ae39ded87e", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b17269e4f158defb34aed0e8631fa08558d4830b98a55d57271659274f99fd3", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdc9ccdf1989f63f3201ac735e21543b1529291f08f244d8a5c5ac179169ae74", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22891ad7a3c6e19bedf20175f333dcfab5c9df67c899bac2f928ccbd1343ac1a", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df61b62ae7225895102386877605e1550878db7d6534e58247e1c42fab6b7b9d" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59db6dcfc57a688c8ee67156a3b6005add894d38a9a1d4aaf49078685716d40f" } } diff --git a/etcd/go.mod b/etcd/go.mod index fb06392c37..d40d0bafb1 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,39 +150,39 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505110056-83565d533048 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 283983fd56..0a7f243bcf 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -174,20 +174,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:19aSm0 github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:fmcuY5R2SNkklU4+fKVBQi2biVp5vafMrWUEj4TJ4Cs= github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:C/8cEHhZcK1VdHUZyYzgTtT84E7Tji1qlebb8SUnhqA= github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:G1mOzdwuzKT1VRL7SqRchli/qcFrtLBTAQ4lV20sXXo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe h1:29btaXe9V4V02b9MTdDbNIufdfuusFa4b2IdkgwgllQ= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe h1:vwBtjeFs8gGpqndO7yVxx6zJNT+wV1OllW9njbZBuZg= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe h1:/SWXPZIG+yvKmy6RFX1FMUwEBTFpEAdvm8KLM7Hyw3s= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe h1:Gn8xha7Ecp8vw2W2ZbBd69tLQjoJtH2tAS/9A0c4274= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe h1:qiIafLeOQjilq2ZmQK0Uizm8AOevNifybotXOeGSjNg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe h1:8wlA5pBIBkImzqeplnCQkGd7Vu6dO/UfSAXr0LEo0CE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe h1:3/1IednL/JXSg37CfGtA4gN86MdxAJez9hAsxng3k1g= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 h1:O3R43LlPFG9lxveGMJ0gSfQJDwcwkPop2w00YAP8Ve0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 h1:fH65NojEluKTElzDfi2b2xZq5QbppXjoQi1pz7hc4aU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 h1:dEXvwjyebjU1LatCAFkj+atpKKyYoDBrOxQy12+dOec= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 h1:PxU7e+IU47UzlkQ9s8DLU7MF2KdO09kP39BNZT95t7g= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 h1:4Oy+/Fr/hMs5f0BXHX35y9YYFQaIshz/ka0f5dv1IXU= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 h1:yKRf07daV/ea4bc4c7e8Ns0h0dP2A76YW47LlOJqS84= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 h1:8m+ODwmXq/Qo+5PCof+Effg/5VA0wuWtWF3M+GdNyCY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 66c137feaf..3a2f08328c 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -631,7 +631,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -692,7 +692,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -754,18 +754,18 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -924,7 +924,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -961,7 +961,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1084,35 +1084,35 @@ sigs.k8s.io/yaml/goyaml.v3 # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250411172207-a5421dfe551a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505110056-83565d533048 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250505110056-83565d533048 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505110056-83565d533048 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048 diff --git a/go.mod b/go.mod index d983995ede..7b913c8d3d 100644 --- a/go.mod +++ b/go.mod @@ -216,35 +216,35 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250422012808-76a7b9964ebe // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250422012808-76a7b9964ebe // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250422012808-76a7b9964ebe // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250505110056-83565d533048 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505110056-83565d533048 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505110056-83565d533048 // from kubernetes ) replace ( @@ -255,8 +255,8 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048 // staging kubernetes diff --git a/go.sum b/go.sum index e0489c1830..2ee42dd75f 100644 --- a/go.sum +++ b/go.sum @@ -261,62 +261,62 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a h1:4u4yoryqRDNV+oAR5F+MABA3QWmHNo0WB5JmzQn/Uik= github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a/go.mod h1:mFYy67IOqmbRf/kRUvsHixzo3iG+1OF2W2+jVIQRAnU= -github.com/openshift/kubernetes v0.0.0-20250422012808-76a7b9964ebe h1:ibuOsoYVcdzOagDERY5UyXIcykalpe+lTAR20wBljqw= -github.com/openshift/kubernetes v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= +github.com/openshift/kubernetes v0.0.0-20250505110056-83565d533048 h1:NZAvT02wC4HUMeUp+OnS/cPNsjYqlw9D53Du/P/e5Kk= +github.com/openshift/kubernetes v0.0.0-20250505110056-83565d533048/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe h1:29btaXe9V4V02b9MTdDbNIufdfuusFa4b2IdkgwgllQ= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe h1:Q2jGIe+AAQjdnE5lllTCMFX0pQMG16/SyGZ1k229+Cs= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe h1:vwBtjeFs8gGpqndO7yVxx6zJNT+wV1OllW9njbZBuZg= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe h1:/SWXPZIG+yvKmy6RFX1FMUwEBTFpEAdvm8KLM7Hyw3s= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe h1:Gn8xha7Ecp8vw2W2ZbBd69tLQjoJtH2tAS/9A0c4274= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe h1:qiIafLeOQjilq2ZmQK0Uizm8AOevNifybotXOeGSjNg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe h1:GDojrr/swryr4BXkg6+5gsH2Q+LJb6dfNptmgNTcx4c= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe h1:PaFPoTA+dotdx66K6QiBeTkqQCfOW4EAxtKj0ctkFW0= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe h1:8wlA5pBIBkImzqeplnCQkGd7Vu6dO/UfSAXr0LEo0CE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe h1:IagNmKaIN8ZneiyuPl6NvZxjnpjldq3ZJvakUopvuGs= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe h1:NjbtP/2twzXHTt4CKnU+nm8pkShqRBN16wNnL7Ls0cA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe h1:veHOgg9ZznLNTkRX2+vEYXDymY2kKBaI7vzBTOqiElk= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe h1:Fu+wr+E3YK9zhAgqkyrheYiLaIOjb9w047IlRh4yjK4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe h1:KYOOtcAm1cQ9p6X1vkeo6I0rK+fEtbrIlIdgbi2y8tY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe h1:GU9hKBabW7/rcludZTawxJ4To8tzg9M573ZhSoagSNM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe h1:98VlDLDy742UEtb7JqTMRfaqSrsT7L7xV4h8veevM0g= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe h1:9p0fAzE2xR2ZtsergtaslW+Vf3l5D8FZf7rOXlLl22c= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe h1:k5rRc2hl75XCjDkbN09BQNzSFHPtabtaGzdRbIq1ez8= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe h1:pOunpSYdepxPKNCB3CqY9NB6pLZ4kvdc8ryKt4PinmM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe h1:Mvgw5JcwZcCY/66kxoAilDZ8vxHpnnEQcCEwmS+1UpI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe h1:u2VG1088kbmuM0bc5WJzr6AKl0eUuTkl21zPY3tAu8Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe h1:3/1IednL/JXSg37CfGtA4gN86MdxAJez9hAsxng3k1g= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe h1:4EwXnzKxdX964OH8E1XN4wMUkwRrRpPBLNXnNJ/zVIQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe h1:UMMUCV2mlK0/+hiSa4nRPYsgGXYihl8yb5HfB2A4L5k= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe h1:/8rth06it82csuLea2l5bSMKTjbTvZYfFz7YT9iiyxk= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe h1:BqqZt45Nw9tfo4QVDM/5U/tRkhK5MezEEH3kOZB+Ssg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 h1:O3R43LlPFG9lxveGMJ0gSfQJDwcwkPop2w00YAP8Ve0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 h1:y9xMWzvmbIKwh90jiIFgzYjTCJUzOUAXWwWqjgqZU9E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 h1:fH65NojEluKTElzDfi2b2xZq5QbppXjoQi1pz7hc4aU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 h1:dEXvwjyebjU1LatCAFkj+atpKKyYoDBrOxQy12+dOec= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 h1:PxU7e+IU47UzlkQ9s8DLU7MF2KdO09kP39BNZT95t7g= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 h1:4Oy+/Fr/hMs5f0BXHX35y9YYFQaIshz/ka0f5dv1IXU= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 h1:KmS48+kkKwOV5AfSbTyQ6H0z9FCxaMLF4nRwySS93nQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 h1:rwflpX637t0DksFGjh8O9MbMUkmCZsx+hpTBSJrPuDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 h1:yKRf07daV/ea4bc4c7e8Ns0h0dP2A76YW47LlOJqS84= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 h1:+8MIOx6HOp//+bok+tSITYXFl5O/Y5t3BNjsdOTpNe0= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 h1:glqRB5I9+lkZlUQXnALXK+Lx//8kbk8VmcX15O0uc8Q= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 h1:U9jW8/mPnWtA2gwIpgSXEb2PN/5WCmPuYoqI+QvOvA4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 h1:4Xh/dpGJJEdhD+Am9A/OuNA2BsJjZIx30RguwUIHYj4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 h1:srvY8kXS408XpvRmb3nbtqp0NzuTOzBRzDsa7DWsVKE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 h1:6fu8yuGtxIk0cz3diLslyxECnwNEeawfcb3a2nDEaJI= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 h1:gry5naJxKyUk3IxTC1JAFTLHAFtsYZm13M1raprYNrI= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048 h1:PUY3I3+JT6OHPcckBrZnDsoBwI+0dQpbKbsWymImCzw= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 h1:E+NqZdlsi+4VurZCHYmVmLQ1an2aeGn8g1cS2I4PVZo= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 h1:PvxUkzFnOww8/yglL+KdEVP+lvl2rReN89yVmK8YH/U= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 h1:0rjZREXT2fAfATqFvdJXBK748+JYpW2KdMM2BPG5M/o= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 h1:CwT/ZXzn97GKBZEUAG48WHsSDhvBPD/Q7LRRTSJUwqA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 h1:8m+ODwmXq/Qo+5PCof+Effg/5VA0wuWtWF3M+GdNyCY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 h1:7fC91s1KJtTN3ZFovtpdcKu/oUBO8ed/ibAh4keDj7E= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 h1:jqIupjAcwcYQjHuHeNgbbu04N8rxFbnvd33P9GIqrYU= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 h1:GCa8993yy5Yr/UTNCGf5xVWlD6ed/LP/EtCRkWXvwTg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 h1:8jq1wmSGMSaGqGes6NSPr6lE+r+i824sgWMwQ5SMGJU= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 2e633fb77d..8d3a4fda5f 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -24,6 +24,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:b6b87fee89f3fd25df2caef31b0be590981e1978be5ab99080f5864df4798b9e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdc9ccdf1989f63f3201ac735e21543b1529291f08f244d8a5c5ac179169ae74" 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 04095d3fdb..2c4a822ded 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -24,6 +24,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:f01f30c9ada2d37ec0ae2e931b98f36c144f6c9d5d7ab5a08a41e94f9ce32ad5" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2493eec2495b122b916b939dc624f2833d418bd32f0bae293e81e95575091cd" 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 b4817120d1..308a53344d 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,102 @@ -- api embedded-component e577b4d83475e00f762184e90d97f7526681defe to d22fca85e3b9f77f0cf2b43759a5ff927e605f57 - - e5a4dc40 2025-04-28T10:46:22+02:00 make update - - 49f9c6de 2025-04-28T10:38:42+02:00 features: enable ServiceAccountTokenNodeBinding - - 42c53671 2025-04-25T15:46:32+01:00 Enable nomaps linter - - 4f87a133 2025-04-25T15:40:23+01:00 Update tools vendor - - fe7ee721 2025-04-25T15:40:06+01:00 Update kube-api-linter to kube-sigs +- api embedded-component d22fca85e3b9f77f0cf2b43759a5ff927e605f57 to 108fecf747f7718ed8ded8fcd1e7bbea829266fa + - 446c4bf6 2025-04-30T13:33:02+02:00 README: Add criteria for featuregate test result windows and flake handling + - b89a1683 2025-04-23T13:53:55-04:00 Add Azure Multi Disk feature gate + +- kubernetes embedded-component 76a7b9964ebe022596bbbabe2e2ca371b02b2752 to 83565d533048d2c0c574d94a66bc01f21cd039ec + - 162e867f4 2025-04-25T14:03:40-04:00 UPSTREAM: : use OTE for spec filtering in e2e tests + +- machine-config-operator embedded-component e44d380686aee42f784a277236dbac49b083441e to 0e18d46e1d026ed0d38d21e1ef0ba6f5177ab5fb + - 5b69a64c 2025-05-05T09:34:26-05:00 Revert "OCPBUGS-44757: decrease leases for kubelet on azure" + - 5eb8694d 2025-04-29T16:01:30-05:00 updated log to specify when no state changes + - debbcf23 2025-04-29T15:01:57+02:00 Use auto=start only for IPsec out connections + - a48bebe0 2025-04-09T13:30:20-04:00 AWS Custom-DNS: Update services that run on control plane nodes + +- openshift-controller-manager embedded-component 49eb6f8ae6e87dbdd4c3f49902a1eca5ef85b3f1 to 39ebafcc026c27abd1181b38e919076e3ec1b465 + - aac411e 2025-05-02T11:59:50+05:30 fix: fixed vendor inconsistency failure to pass verify-deps job + - 591db09 2025-04-17T05:38:03+00:00 OCPBUGS-54695:Empty proxy variables are causing issues during the build Problem: Irrespective of default proxy settings these proxy variables are set on build containers. If any defaults are set they reflect those setting ,if not set they are set to null on the build container. Having these null variables are causing problems to some customers as its breaking some required apps on container HTTP_PROXY,http_proxy,HTTPS_PROXY,https_proxy,NO_PROXY,no_proxy Fix: Code changed only to add these proxy variables only if they are defined in defaults and if they are not null. + +- operator-framework-olm embedded-component ec31de865be0c822d967ec8fe563c6eb8c4757e5 to a8d762c509e3f431c21e958ebd65459f820ead6a + - 0cd44e02 2025-04-30T15:56:00-04:00 Add containers_image_openpgp to GO_BUILD_TAGS + - 2df3c684 2025-04-30T15:55:57-04:00 make grpcPodConfig.extractContent.cacheDir an optional field (#421) + - 169b6ebb 2025-04-30T15:55:55-04:00 Bump golang.org/x/net from 0.36.0 to 0.38.0 (#422) + - ee0e3c53 2025-04-30T15:55:52-04:00 Bump sigs.k8s.io/controller-runtime in the k8s-dependencies group (#420) + - bf9f224b 2025-04-30T15:55:50-04:00 group k8s and golang.org/x dependencies (#419) + - 3fcebdcd 2025-04-30T15:55:48-04:00 Bump k8s.io/apiextensions-apiserver from 0.32.2 to 0.32.3 (#418) + - dd219106 2025-04-30T15:55:45-04:00 Bump golang.org/x/net from 0.34.0 to 0.36.0 (#414) + - 62991226 2025-04-30T15:55:42-04:00 Bump sigs.k8s.io/controller-runtime from 0.20.2 to 0.20.3 (#413) + - d19fa03d 2025-04-30T15:55:39-04:00 pkg/image: fixup containers/image registry test with a test-defined signature policy (#1654) + - dc2e9305 2025-04-30T15:55:37-04:00 Add go-version check to avoid introduces an version that we cannot support yet (#1657) + - dd467c91 2025-04-30T15:55:34-04:00 Revert : Bump github.com/distribution/distribution/v3 from 3.0.0-rc.3 to 3.0.0-rc.4 PR: 1620 (#1656) + - 66237027 2025-04-30T15:55:31-04:00 Bump github.com/operator-framework/api from 0.30.0 to 0.31.0 (#1655) + - 3b0d0b03 2025-04-30T15:55:29-04:00 bumping go-grpc-middleware with replace for k8s 1.32 (#1653) + - e105a97d 2025-04-30T15:55:27-04:00 Upgrade google.golang.org/grpc from v1.71.1 to v1.72.0 (#1652) + - a0df8b76 2025-04-30T15:55:19-04:00 Containers image registry implementation with opt-in caching (#1626) + - 162aa790 2025-04-30T14:45:12-04:00 Bump github.com/mattn/go-sqlite3 from 1.14.27 to 1.14.28 (#1643) + - 872981fa 2025-04-30T14:45:12-04:00 Bump github.com/containers/common from 0.62.3 to 0.63.0 (#1645) + - 93a10517 2025-04-30T14:45:12-04:00 Bump github.com/docker/cli (#1646) + - 8892ee48 2025-04-30T14:45:12-04:00 Bump github.com/containers/image/v5 from 5.34.3 to 5.35.0 (#1642) + - 87afb4cd 2025-04-30T14:45:11-04:00 add support for ConsolePlugin (#1634) + - 8e4d72bc 2025-04-30T14:45:11-04:00 Bump github.com/onsi/ginkgo/v2 from 2.23.3 to 2.23.4 (#1641) + - ca610caa 2025-04-30T14:45:11-04:00 Bump github.com/mattn/go-sqlite3 from 1.14.24 to 1.14.27 (#1639) + - 663ee64e 2025-04-30T14:45:11-04:00 pkg/configmap: sort configmap data by key when loading bundle (#1630) + - e68eb942 2025-04-30T14:45:11-04:00 Bump golang.org/x/net from 0.37.0 to 0.39.0 (#1640) + - 7abfa7b2 2025-04-30T14:45:11-04:00 Bump google.golang.org/grpc from 1.71.0 to 1.71.1 (#1637) + - ac065b67 2025-04-30T14:45:10-04:00 Bump golang.org/x/sync from 0.12.0 to 0.13.0 (#1636) + - 9db40a3f 2025-04-30T14:45:10-04:00 Bump github.com/onsi/gomega from 1.36.3 to 1.37.0 (#1635) + - 7053b9fd 2025-04-30T14:45:10-04:00 Bump golang.org/x/text from 0.23.0 to 0.24.0 (#1638) + - 91e349e0 2025-04-30T14:45:10-04:00 Bump github.com/distribution/distribution/v3 from 3.0.0-rc.4 to 3.0.0 (#1633) + - 594fe2c2 2025-04-30T14:45:10-04:00 Bump golang.org/x/sys from 0.31.0 to 0.32.0 (#1632) + - d29f4377 2025-04-30T14:45:10-04:00 Bump github.com/containers/common from 0.62.2 to 0.62.3 (#1631) + - 16790db9 2025-04-30T14:45:09-04:00 Bump github.com/distribution/distribution/v3 from 3.0.0-rc.3 to 3.0.0-rc.4 (#1620) + - 7a163dbf 2025-04-30T14:45:09-04:00 Bump sigs.k8s.io/controller-runtime from 0.20.3 to 0.20.4 (#1623) + - a7ae8912 2025-04-30T14:45:09-04:00 Bump github.com/docker/cli (#1628) + - 00e2a1c7 2025-04-30T14:45:09-04:00 (fix) declCfg non-closed file descriptor (#1625) + - 94375127 2025-04-30T14:45:09-04:00 .github/workflows/test.yml: bump to ubunutu-latest (#1627) + - 02f0b17e 2025-04-30T14:45:09-04:00 Bump github.com/onsi/gomega from 1.36.2 to 1.36.3 (#1621) + - 9b996a39 2025-04-30T14:45:08-04:00 Bump google.golang.org/protobuf from 1.36.5 to 1.36.6 (#1624) + - 3ee03c1d 2025-04-30T14:45:08-04:00 Bump github.com/onsi/ginkgo/v2 from 2.23.2 to 2.23.3 (#1622) + - caa48e7d 2025-04-30T14:45:08-04:00 Bump github.com/onsi/ginkgo/v2 from 2.23.1 to 2.23.2 (#1619) + - 637fea27 2025-04-30T14:45:08-04:00 Bump github.com/docker/cli (#1617) + - e8ce9223 2025-04-30T14:45:08-04:00 group k8s and golang.org/x dependencies (#1616) + - 85116f1f 2025-04-30T14:45:08-04:00 Bump github.com/onsi/ginkgo/v2 from 2.23.0 to 2.23.1 (#1618) + - f9b2519c 2025-04-30T14:45:07-04:00 Bump github.com/containerd/containerd from 1.7.26 to 1.7.27 (#1615) + - 25ce4d77 2025-04-30T14:45:07-04:00 Bump github.com/containers/common from 0.62.1 to 0.62.2 (#1612) + - e33b99b0 2025-04-30T14:45:07-04:00 Bump k8s.io/apiextensions-apiserver from 0.32.2 to 0.32.3 (#1614) + - 3983589d 2025-04-30T14:45:07-04:00 Bump sigs.k8s.io/kind from 0.26.0 to 0.27.0 (#1587) + - 17ab7c18 2025-04-30T14:45:07-04:00 Bump golang.org/x/mod from 0.23.0 to 0.24.0 (#1606) + - a31aa2f0 2025-04-30T14:45:07-04:00 Bump github.com/containers/image/v5 from 5.34.1 to 5.34.2 (#1609) + - 2f8a09c5 2025-04-30T14:45:06-04:00 Bump k8s.io/apimachinery from 0.32.2 to 0.32.3 (#1610) + - 071c9e59 2025-04-30T14:45:06-04:00 Bump golang.org/x/net from 0.36.0 to 0.37.0 (#1601) + - 7ae56cdc 2025-04-30T14:45:06-04:00 Bump sigs.k8s.io/controller-runtime from 0.20.2 to 0.20.3 (#1607) + - b0bf58ca 2025-04-30T14:45:06-04:00 Bump github.com/onsi/ginkgo/v2 from 2.22.2 to 2.23.0 (#1602) + - 4a1c9464 2025-04-30T14:45:06-04:00 Bump golang.org/x/text from 0.22.0 to 0.23.0 (#1603) + - e1e660ba 2025-04-30T14:45:06-04:00 Bump golang.org/x/sync from 0.11.0 to 0.12.0 (#1604) + - 49a53511 2025-04-30T14:45:06-04:00 upgraded golang.org/x/oauth2 v0.23.0 => v0.27.0 (#1595) + - 868cafe2 2025-04-30T14:45:05-04:00 Bump github.com/operator-framework/api from 0.29.0 to 0.30.0 (#1598) + - bce4dc94 2025-04-30T14:45:05-04:00 Bump golang.org/x/net from 0.35.0 to 0.36.0 (#1599) + - 1055e342 2025-04-30T14:45:05-04:00 Bump google.golang.org/grpc from 1.70.0 to 1.71.0 (#1600) + - 74eb9197 2025-04-30T14:45:05-04:00 Bump github.com/containers/common from 0.62.0 to 0.62.1 (#1597) + - 7f140f23 2025-04-30T14:45:05-04:00 Bump github.com/opencontainers/image-spec from 1.1.0 to 1.1.1 (#1596) + - 169ecfb9 2025-04-30T14:45:05-04:00 Bump github.com/containers/image/v5 from 5.34.0 to 5.34.1 (#1594) + - c6d9c19b 2025-04-30T14:45:04-04:00 Bump github.com/docker/cli (#1592) + - a8286c01 2025-04-30T14:45:04-04:00 Bump github.com/containerd/containerd from 1.7.25 to 1.7.26 (#1593) + - 1dc0d776 2025-04-30T14:45:04-04:00 🌱 Add go-version check to avoid upgrade versions for those that we cannot support yet (#3561) + - 475d4375 2025-04-30T14:44:58-04:00 🌱 Upgrade github.com/operator-framework/operator-registry from 1.51.0 to 1.53.0 (#3562) + - 188ef499 2025-04-30T09:39:25-04:00 :seedling: Bump github.com/fsnotify/fsnotify from 1.8.0 to 1.9.0 (#3563) + - 6c160c4e 2025-04-30T09:39:19-04:00 :seedling: Bump github.com/prometheus/client_model from 0.6.1 to 0.6.2 (#3566) + - 448eb103 2025-04-30T09:39:14-04:00 fix(olm): improve error logging for missing olm.managed label (#3558) + - 33702a0c 2025-04-30T09:39:08-04:00 :seedling: Bump golang.org/x/net from 0.37.0 to 0.39.0 (#3552) + - aab06ef0 2025-04-30T09:39:03-04:00 :seedling: Bump github.com/onsi/gomega from 1.36.2 to 1.37.0 (#3554) + +- ovn-kubernetes image-amd64 f7dd74f4c2b944f85176546839546e505ee96189 to b9e7714fed845526b1ca30e908ab20586f037d6f + - 4fb27fe1 2025-04-29T22:37:59+02:00 Dockerfile: Unpin OVS and consume the latest from FDP. + +- kubernetes image-amd64 76a7b9964ebe022596bbbabe2e2ca371b02b2752 to 83565d533048d2c0c574d94a66bc01f21cd039ec + - 162e867f4 2025-04-25T14:03:40-04:00 UPSTREAM: : use OTE for spec filtering in e2e tests + +- ovn-kubernetes image-arm64 f7dd74f4c2b944f85176546839546e505ee96189 to b9e7714fed845526b1ca30e908ab20586f037d6f + - 4fb27fe1 2025-04-29T22:37:59+02:00 Dockerfile: Unpin OVS and consume the latest from FDP. + +- kubernetes image-arm64 76a7b9964ebe022596bbbabe2e2ca371b02b2752 to 83565d533048d2c0c574d94a66bc01f21cd039ec + - 162e867f4 2025-04-25T14:03:40-04:00 UPSTREAM: : use OTE for spec filtering in e2e tests diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 3228d8bed4..869b865ef8 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,4 +1,4 @@ -https://github.com/openshift/api embedded-component d22fca85e3b9f77f0cf2b43759a5ff927e605f57 +https://github.com/openshift/api embedded-component 108fecf747f7718ed8ded8fcd1e7bbea829266fa https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component cf99de974354133f853928cff9e19ad19c5347d9 https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 https://github.com/openshift/cluster-ingress-operator embedded-component 2e6bd66d4ad11f58b8dea2677a94751bb372dca5 @@ -10,11 +10,11 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/etcd embedded-component a5421dfe551a2e9c911a75062a4cdeb7473f5c26 -https://github.com/openshift/kubernetes embedded-component 76a7b9964ebe022596bbbabe2e2ca371b02b2752 +https://github.com/openshift/kubernetes embedded-component 83565d533048d2c0c574d94a66bc01f21cd039ec https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component e44d380686aee42f784a277236dbac49b083441e -https://github.com/openshift/openshift-controller-manager embedded-component 49eb6f8ae6e87dbdd4c3f49902a1eca5ef85b3f1 -https://github.com/openshift/operator-framework-olm embedded-component ec31de865be0c822d967ec8fe563c6eb8c4757e5 +https://github.com/openshift/machine-config-operator embedded-component 0e18d46e1d026ed0d38d21e1ef0ba6f5177ab5fb +https://github.com/openshift/openshift-controller-manager embedded-component 39ebafcc026c27abd1181b38e919076e3ec1b465 +https://github.com/openshift/operator-framework-olm embedded-component a8d762c509e3f431c21e958ebd65459f820ead6a https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-amd64 e468aa68e754e22997f526fcdbbd470387ff5e33 @@ -22,14 +22,14 @@ https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c938 https://github.com/openshift/csi-external-snapshotter image-amd64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 -https://github.com/openshift/ovn-kubernetes image-amd64 f7dd74f4c2b944f85176546839546e505ee96189 -https://github.com/openshift/kubernetes image-amd64 76a7b9964ebe022596bbbabe2e2ca371b02b2752 +https://github.com/openshift/ovn-kubernetes image-amd64 b9e7714fed845526b1ca30e908ab20586f037d6f +https://github.com/openshift/kubernetes image-amd64 83565d533048d2c0c574d94a66bc01f21cd039ec https://github.com/openshift/service-ca-operator image-amd64 4dfa6916f984d0fd7188380edc88b250738f07f7 https://github.com/openshift/oc image-arm64 e468aa68e754e22997f526fcdbbd470387ff5e33 https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-arm64 ac82cafc95b301f67f46ee0db93720d55177a19b https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97 -https://github.com/openshift/ovn-kubernetes image-arm64 f7dd74f4c2b944f85176546839546e505ee96189 -https://github.com/openshift/kubernetes image-arm64 76a7b9964ebe022596bbbabe2e2ca371b02b2752 +https://github.com/openshift/ovn-kubernetes image-arm64 b9e7714fed845526b1ca30e908ab20586f037d6f +https://github.com/openshift/kubernetes image-arm64 83565d533048d2c0c574d94a66bc01f21cd039ec https://github.com/openshift/service-ca-operator image-arm64 4dfa6916f984d0fd7188380edc88b250738f07f7 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 6541e1eee2..3163ec8b35 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.19.0-0.nightly-2025-05-01-165245" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-05-01-154018" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-05-06-221334" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-05-06-200038" diff --git a/vendor/modules.txt b/vendor/modules.txt index 0778ddb048..845ea6f2a3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1167,7 +1167,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1228,7 +1228,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1275,7 +1275,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1347,7 +1347,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1528,13 +1528,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1898,7 +1898,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1917,14 +1917,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1961,7 +1961,7 @@ k8s.io/component-base/version/verflag k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz k8s.io/component-base/zpages/statusz -# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1975,7 +1975,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1992,35 +1992,35 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache k8s.io/endpointslice/trafficdist k8s.io/endpointslice/util -# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/externaljwt/apis/v1alpha1 # k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 @@ -2041,13 +2041,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2080,7 +2080,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f @@ -2113,11 +2113,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2152,7 +2152,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2174,7 +2174,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2995,7 +2995,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3010,10 +3010,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 ## explicit; go 1.23.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3160,39 +3160,39 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250505110056-83565d533048 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250505110056-83565d533048 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250505110056-83565d533048 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250505110056-83565d533048 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250505110056-83565d533048 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250505110056-83565d533048 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250505110056-83565d533048 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250505110056-83565d533048 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250505110056-83565d533048 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250505110056-83565d533048 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250505110056-83565d533048 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250505110056-83565d533048 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250505110056-83565d533048 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250505110056-83565d533048 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250505110056-83565d533048 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250505110056-83565d533048 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250505110056-83565d533048 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250505110056-83565d533048 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250505110056-83565d533048 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250505110056-83565d533048 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250505110056-83565d533048 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250505110056-83565d533048 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250411172207-a5421dfe551a # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250411172207-a5421dfe551a # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250422012808-76a7b9964ebe -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250422012808-76a7b9964ebe +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250505110056-83565d533048 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250505110056-83565d533048 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250505110056-83565d533048