diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index feffe3c5b6..6af296aa2c 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=29 KUBE_GIT_VERSION=v1.29.5 -KUBE_GIT_COMMIT=b2f5b1171deb4bbf754961c8b72ac31d2548c896 +KUBE_GIT_COMMIT=58452d8d4db25d4afb8e53ed5901103590766b7e KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b177828007..a875182fff 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-arm64-2024-06-15-032331 +OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-02-221036 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 399d8bbdbe..a0b2ec1c5b 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.16.0-0.nightly-2024-06-14-130320 +OCP_VERSION := 4.16.0-0.nightly-2024-07-02-211018 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 68ee0e2ff8..c478fe2332 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/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:49240013eca227e2fbdc5d6ccb57498dd39eac9fce6d7ae3471de18c6b22fc04 + digest: sha256:8d2c921445dc906521ff3cf8787a1507ef629abb0d07098d595b0d1cfc982af9 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b70fe2f9204510f55db978760c585e0b837d94f18f9fa9ef975c8a3a6b5f4aa3 + digest: sha256:b370916ae0fe1e33106d8f963046cf08e1e1e0c89062c99e5d16b05078097c53 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index b5720282e1..71fd765e0e 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/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:454fcc7d474271d13b864fda2e7ae7b7b5235799f1423ba79cb3f2b52c05ba57 + digest: sha256:37de2b396c58cc7b8803b57c19703001fde4e16fd371145f8762bec49dd159f5 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f1776c5c20353bd9ed42b8c118271d4652cd8e2e84b80aeb1896a763ea24c2fe + digest: sha256:24b8067bf729c3c22f950e06daff054e74ff4dd38da5aaa53a39bac394d30393 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 3904a1c9dc..b567898f61 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-15-032331" + "base": "4.16.0-0.nightly-arm64-2024-07-02-221036" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49240013eca227e2fbdc5d6ccb57498dd39eac9fce6d7ae3471de18c6b22fc04", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b70fe2f9204510f55db978760c585e0b837d94f18f9fa9ef975c8a3a6b5f4aa3" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d2c921445dc906521ff3cf8787a1507ef629abb0d07098d595b0d1cfc982af9", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b370916ae0fe1e33106d8f963046cf08e1e1e0c89062c99e5d16b05078097c53" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index aae4ecc471..82ff15069a 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.16.0-0.nightly-2024-06-14-130320" + "base": "4.16.0-0.nightly-2024-07-02-211018" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:454fcc7d474271d13b864fda2e7ae7b7b5235799f1423ba79cb3f2b52c05ba57", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1776c5c20353bd9ed42b8c118271d4652cd8e2e84b80aeb1896a763ea24c2fe" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37de2b396c58cc7b8803b57c19703001fde4e16fd371145f8762bec49dd159f5", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24b8067bf729c3c22f950e06daff054e74ff4dd38da5aaa53a39bac394d30393" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index bc367bbba3..1029ba1cfa 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:cbb1842dab8fd775ee814c9a4dca36ea0acf20a143e4b6de55f27441375fe76f + digest: sha256:21480922d242a2ae0fb54e29be80a4d762a2913f2109f88fa867aa0b356c5f08 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f7baaf5d67d20c4956504578ce1f0e1693a440e33b36189389e38a09da509f69 + digest: sha256:5877f829b4249e9afe53d9e8830411d11d21e84c212943b92eaf4cc76ee01d60 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4 + digest: sha256:f1e64ae7533b76ed5c02776e7e2d6b5718e0867f9491952ddb3455bea88b9e37 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:f7baaf5d67d20c4956504578ce1f0e1693a440e33b36189389e38a09da509f69 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5877f829b4249e9afe53d9e8830411d11d21e84c212943b92eaf4cc76ee01d60 - 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:cbb1842dab8fd775ee814c9a4dca36ea0acf20a143e4b6de55f27441375fe76f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21480922d242a2ae0fb54e29be80a4d762a2913f2109f88fa867aa0b356c5f08 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 5ac35f85e6..6e34deeb35 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:2858d5039ccec571b6cd26627bcc15672b705846caefb817b9c8fdc52c91b2a8 + digest: sha256:4d5cb27ed8403b05762d6f84a124946f2dd43713fdc0666d53cb54565f014e23 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fd647545b1e1e8133f835b5842318c4a574964a1089d0c79e368492f43f4be0a + digest: sha256:c2f8cf20e2968339fa6559c5ccf43c54bb47da1c43ec1f6cdf5ec7487c043602 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903 + digest: sha256:818e9b2a6e3fbf36f9a11a633dfa80973560a57a8b8eca158cda04a0494d5052 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:fd647545b1e1e8133f835b5842318c4a574964a1089d0c79e368492f43f4be0a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2f8cf20e2968339fa6559c5ccf43c54bb47da1c43ec1f6cdf5ec7487c043602 - 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:2858d5039ccec571b6cd26627bcc15672b705846caefb817b9c8fdc52c91b2a8 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d5cb27ed8403b05762d6f84a124946f2dd43713fdc0666d53cb54565f014e23 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 cd90fa90bf..867b468151 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.16.0-0.nightly-arm64-2024-06-15-032331" + "base": "4.16.0-0.nightly-arm64-2024-07-02-221036" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbb1842dab8fd775ee814c9a4dca36ea0acf20a143e4b6de55f27441375fe76f", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7baaf5d67d20c4956504578ce1f0e1693a440e33b36189389e38a09da509f69", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21480922d242a2ae0fb54e29be80a4d762a2913f2109f88fa867aa0b356c5f08", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5877f829b4249e9afe53d9e8830411d11d21e84c212943b92eaf4cc76ee01d60", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1e64ae7533b76ed5c02776e7e2d6b5718e0867f9491952ddb3455bea88b9e37" } } 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 f285962f76..64bc8c582d 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.16.0-0.nightly-2024-06-14-130320" + "base": "4.16.0-0.nightly-2024-07-02-211018" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2858d5039ccec571b6cd26627bcc15672b705846caefb817b9c8fdc52c91b2a8", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd647545b1e1e8133f835b5842318c4a574964a1089d0c79e368492f43f4be0a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d5cb27ed8403b05762d6f84a124946f2dd43713fdc0666d53cb54565f014e23", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2f8cf20e2968339fa6559c5ccf43c54bb47da1c43ec1f6cdf5ec7487c043602", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:818e9b2a6e3fbf36f9a11a633dfa80973560a57a8b8eca158cda04a0494d5052" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1cc870d135..44153c8006 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-15-032331" + "base": "4.16.0-0.nightly-arm64-2024-07-02-221036" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac8e24eedc0903b7130df284b883346a54a5be198841a2a49bec22d6f1d69b9", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb313f92e32bc456b63f68dee027e52757b02c20f4c93ffd935b7a411798fb97", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a8f7b0baf5461016b3c54afa24d659810c7437173227ee1bf51352afcaee15d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:931853a8eb7562f4b508ba7cea0b019f550858cea7e8d72be67bf5f4a2f0ea37", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c77667c9ce0af9f0cd90085cfa14b67c112089660fc2c5834daf02c3250866c1", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:516dd737a64c3564733446320d65e9dd3d49169e0ab09dfc2bcba184f137dba4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1e64ae7533b76ed5c02776e7e2d6b5718e0867f9491952ddb3455bea88b9e37", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:910c2be210c9cbba02a377991e3e0cb621d0ee62009a14adad948a6efd5e3d68", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:45da6f33ff8298a688bbf1eddf4fad6f6171f90fc2633c0303efed7b7f7b24c2", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:159a677b5c3ee7a78d31cf5e0772ddbfc40aaefc4a12e247c11ed4610c89f8f4", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a92195d25f5e031f559960c62d934ebf30913b3b04000b26229d5e687d62a797", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bb5470f6ac9cfd832bf138a0297e40965cd21cbfeada8f860bd7cf0d2c0f13a", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6941aa2bd0ddd449a7cf4e643ba1ee2b8e27f9356b59a27798a736253c4c3b5", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aa5390799dc1fc8ff9948f9c1c233815f39b184f66cb9642ef68e058ab31f6d", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cd6de40655487f001efe8b0ff75ff1b4736c62ee01e0a3fe8835b91a6e943f8", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:077cd4c67cdefe5144cdfdb2951b57e28fb20257456c0e874593c51a4bb35a13" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09189ad27aaa9a8fbb190e8a984d0649eb4fb2c992101bc1f712ff6d3d11e83b", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:706b4851c5d347609cea529d41a9bbe19ac25e6a025fa945f010ba0ed0f61f37", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26c9c469f46ded4f6efd3a0b044e4c043a504b33ae8854dfc5d51bc6f8e665db" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 22977468ed..a5807cda2c 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.16.0-0.nightly-2024-06-14-130320" + "base": "4.16.0-0.nightly-2024-07-02-211018" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6994ed1b1593f7638e3a8732c503356885a02dc245451ceddc3809f61023dce", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4100378bdad23dfbaf635cc71846262fc1e11f874ca8829d9325daa5394f31d", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c593fc9fefc335235a7118c3b526f9f265397b62293169959e09a693033db15", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0453e9375483f7b6502d00710c6204ea42ba2b1c9182f43e6a60e81cf9c5080", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99a6124403a3224e6edaffc3b2b251e6702bf30a918c6061666b7c3d14cba511", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57c2e54116a081c4c16553b1eb5d74de56862fbb90b69a803bf9c24dcca90419", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:818e9b2a6e3fbf36f9a11a633dfa80973560a57a8b8eca158cda04a0494d5052", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af5b31b30b75b7654f7bec28466e12abff0b09499976d5fa109266c7aa4daf55", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a295621f75fadbb1c4ab5f6d8221fd408d5ac5a836a42d120aa75a414a3917c2", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24216f0c25a6e1d33af5f8798e7066a97c6c468ad09b8fad7342ee280db29d9d", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c5412636bf01d98597c932f6dd84710cc9b345e956df6d8b90d9000b80177c5", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05c85dfc2249b85de1103f1e9392228bcad1596c75197dd6d5349ecc2b4e4383", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfe40493336d628363945f22ce06bd5bdffb69ad399a5a78149ce1e1b27affad", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aafb1ff11acc4a86441ecf1ec90dce94add1ab17b4d8b75d3daff942488683ed", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2860f4cd96d390433759df75b68cacd2449f4a690f06e12efa42a0adc6f3f8f6", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6241d7b00a85a01f1ea042e4c1145eaad9381ed2d20c3f6f908f13cbfa3614ea" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f188babca040ab116a90b77a2fe5805de3d313b0fd71e7cbe898e870cad24a1", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4b6a3ead66ec58885798c29bc08082decca3ddfcb87ca7ef0e119458706ed4b", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88c7acf6d868a8f8b73038775c62b81854e4d2d10d8c2b15a77b61aa4349b15a" } } diff --git a/etcd/go.mod b/etcd/go.mod index aee9a613ce..648ed94703 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -151,35 +151,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 52de248435..e49c0203bc 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -206,20 +206,20 @@ github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:GlR/ github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb h1:KXQ7zaZV7xV8E7WfneHT5AxiVStsaxRgaXVHK1yygs0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb h1:FX3sbs0xEOr/bsjgKqAEPnSMT2fjTJEIIietXovtg1k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb h1:WaqQnd1FXpckzU5wYwtg7go8c3yKzxO5aFdQ6v7BDjc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb h1:B5qbrQHKBApHciEmOhppVPMiU6NJJnLJGjzJxS+Ohuk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb h1:xqccvHGqLH3Vi+FOIAcYvM8V98xuJd/We2rURn601Q0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb h1:CsobGOSl9pIlSab9AcV19gmFOgPGb5BpKfWQWrWmlec= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb h1:k3TAgj24DBIS0/kydsZo3RKUYuQpg2xsnSUyo0quKUg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 h1:6/ZH3q8/ETc6Rj0tMahOgWOhXbdNrPXeMebjw5yA+50= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 h1:oS2IG6DkyyLSTjB67EdlrgSvA3VGLLknVDAeYsTQjwQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 h1:dIXAsBuazC196A4ur7VMw7ETBwXdcwQQoiEaIRrVpK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 h1:GaBDD53mIwlK0QSYMaZMWfuR1lIsSZaHAbrh/tkgqEc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 h1:dlR34OBRomnn2EVcOb+t0mBl/GpkHdhfmcI2RPaT528= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 h1:fgA5gcAzW2f6sLjt8T+wV6pGUVfPUcK8+OSm2dnHiDo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 h1:i6tqv70WcaDmk9AK96qi/lQvwHq99X+7hTs9SovCo0Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index f0fde4f6f2..39d640315d 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -675,7 +675,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -729,17 +729,17 @@ 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -886,7 +886,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -921,7 +921,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-20240607103948-b2f5b1171deb +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1049,33 +1049,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2 diff --git a/go.mod b/go.mod index 0fa52c7923..75a42515f7 100644 --- a/go.mod +++ b/go.mod @@ -233,36 +233,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240607103948-b2f5b1171deb // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240607103948-b2f5b1171deb // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240607103948-b2f5b1171deb // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240619152203-58452d8d4db2 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240619152203-58452d8d4db2 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240619152203-58452d8d4db2 // from kubernetes ) replace ( @@ -273,4 +273,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 // 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-20240607103948-b2f5b1171deb // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2 // staging kubernetes diff --git a/go.sum b/go.sum index 50a3a69ea5..81bd97fb81 100644 --- a/go.sum +++ b/go.sum @@ -502,60 +502,60 @@ github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:QiMi github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 h1:jUM9Fdf+fT0LTccN58jrypOyzcfQUs1v2UH6f8vdBTA= github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/openshift/kubernetes v0.0.0-20240607103948-b2f5b1171deb h1:ohResBVyvJWfwoqRw70dzK+8+/HZoLnLTYb/HyQLChs= -github.com/openshift/kubernetes v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:kngJNCmXpz6exTE+4WLgGS1hUpUEUxId5vjzDG5VgbY= +github.com/openshift/kubernetes v0.0.0-20240619152203-58452d8d4db2 h1:6qdCA0fC0GlTESDrgBJ8/ji7AM3vd3lvm/LHh944A4M= +github.com/openshift/kubernetes v0.0.0-20240619152203-58452d8d4db2/go.mod h1:kngJNCmXpz6exTE+4WLgGS1hUpUEUxId5vjzDG5VgbY= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 h1:XbvnIzWITQAGkucBNg+7fCBF0ysRySNSOkTvYWFU6fA= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246/go.mod h1:XvsDWvUXlITs6q4deif+DIbomfUhxf6igCMjFiP6jHU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb h1:KXQ7zaZV7xV8E7WfneHT5AxiVStsaxRgaXVHK1yygs0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb h1:5jpp4q8+/mrUWIbdphIjLuxrU/khvmMVxUJfRBZioF0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:wUPaZ3kD56u1+Otpop2sGPnb5Jd05G9+CASPAq4jajM= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb h1:FX3sbs0xEOr/bsjgKqAEPnSMT2fjTJEIIietXovtg1k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb h1:WaqQnd1FXpckzU5wYwtg7go8c3yKzxO5aFdQ6v7BDjc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb h1:B5qbrQHKBApHciEmOhppVPMiU6NJJnLJGjzJxS+Ohuk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb h1:xqccvHGqLH3Vi+FOIAcYvM8V98xuJd/We2rURn601Q0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb h1:OsUEHXL0JCCsN1YjpztDAPLJtnA01KeEAn1z41uMp3A= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb h1:r0nOwDhIx1Xz/W6sFjecNq8wEx68mu/ATL8LNCl3dHY= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb h1:CsobGOSl9pIlSab9AcV19gmFOgPGb5BpKfWQWrWmlec= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb h1:Qs/xFCo1veGPwdjhp3itEnV/qxdThecvONToaN6hhsw= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:Ken1KocNhJBJHBCvzeByTlXNO+oxxh982ieimC6KX4g= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb h1:fBmxKlvM3gdtnTDQXCU8Hh0+eFraPZehvtYMnODoUms= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb h1:alNMe0LCSZ93ucrlktmeC8u2SCnlZoBLVkxVbT1ZmP8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb h1:mNTpOQP3fhiYsBdBBKKW/P4+BFlSxp9l6/HhzTlKRJE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb h1:vVq3fzYhGEbXwuk+TYstFSnPWliJJdclMv7dEIFqy1E= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb h1:dlIQFdl9bCMaY2eU1QndMF4B/U0mL4TMJR3b/DBvJy0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb h1:anNa7XWrxqiM1tcUtMP+6NlBHTM1yd6Xj+EbNQwZn48= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb h1:APmTcDYVX/5Kgzm5P4THwmn+WlsIX/ByTFEPlpg1Co0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:4J7wfAzEbaohBbEGIixBHQL5SIyinxnGKUjlwn9L3YQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb h1:pLS2lmONNb/liTUz9beOCICWYPMGluuHpO0Jd3qtTIs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb h1:Z8H3kbz/66d6nfVlUg55rOtkoj8YBc4A+mhEJkUoRbc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb h1:k3TAgj24DBIS0/kydsZo3RKUYuQpg2xsnSUyo0quKUg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb h1:SlmqqVOBUOOcjOqJBuPbzEghK2wCOBmv4TnaPcVDB74= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb h1:UPDIRfEK0sCuUNdRq07UPaygIbFz8vS0ZosAcAK5+lo= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb h1:hKKTuDwVrXBNoqEvtwFsZOwDug3C8SnDircVpKRLClc= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb h1:VFDUV0pCgJ1Z4UnNB6kk1doZM0q3OspYyhMsEUJJf/4= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb h1:2P+lqdcdIPXYP/torMJFfdgEQeLc/FZ7BdJtPveDh7c= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 h1:6/ZH3q8/ETc6Rj0tMahOgWOhXbdNrPXeMebjw5yA+50= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 h1:ckgbCNKwSpD1rKXIT3zfRUU8uKbj/O/LaGOeaRJ6r/s= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2/go.mod h1:wUPaZ3kD56u1+Otpop2sGPnb5Jd05G9+CASPAq4jajM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 h1:oS2IG6DkyyLSTjB67EdlrgSvA3VGLLknVDAeYsTQjwQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 h1:dIXAsBuazC196A4ur7VMw7ETBwXdcwQQoiEaIRrVpK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 h1:GaBDD53mIwlK0QSYMaZMWfuR1lIsSZaHAbrh/tkgqEc= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 h1:dlR34OBRomnn2EVcOb+t0mBl/GpkHdhfmcI2RPaT528= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 h1:v487sV0xIkA031ifWQqPEGo5Ii6K04G7w6btFy9Yb88= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 h1:SIOupxJURZnL9np57KGJ50BI9VHdPHFxa6eZSAMnZSg= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 h1:fgA5gcAzW2f6sLjt8T+wV6pGUVfPUcK8+OSm2dnHiDo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 h1:VGO2zeE5Nfrjlx2K+RF/ypRk+n3YjRWrY0s+U7aGgDw= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2/go.mod h1:Ken1KocNhJBJHBCvzeByTlXNO+oxxh982ieimC6KX4g= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 h1:TIZ3Y0qUQUFbvRudnkCtPWl+Daf0uyH43L6nxZ7Dxhk= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 h1:1tY/Ll/pUT4n97i9KmvHLhSErXdvNfK1q67a9CQUjp8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 h1:3egiGM4yBDvEe8zm5jRruHx+/94RShK7sBwI7h+DD/8= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 h1:zu/yX1Xa2K8xJt6VCSmWo20s9wRs/lT6e/y0hQeudBE= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2 h1:EN1iIZERo14RbEzgvWXxInMUIhkKunrh5R6t8kvJMng= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 h1:ThHy+jldcBjlKiIoXG5mvsW7EOUVHmEX2n4vC9i8U9c= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 h1:Bieye4OykIiNCDdn9KaiexxVoXW0zKRKBe72J0aAPDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2/go.mod h1:4J7wfAzEbaohBbEGIixBHQL5SIyinxnGKUjlwn9L3YQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 h1:2WxUZDnDp7/PcM4rXseuwXLm8lVaSWtr5JtgQkyJdcE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 h1:g3G0YyX3ciJdm/hI+lZ1upDccawJf8Htzub7pMMrY/A= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 h1:i6tqv70WcaDmk9AK96qi/lQvwHq99X+7hTs9SovCo0Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 h1:vTkAGQPnGu54a+r5gQzG8dR2eIlr4cTQsk/ZCHuIvAw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 h1:mJ9kqTQgn3sc0CY9PATybhYioDm1yYynYlCtD7lLo+k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 h1:d/yT+wiM1PQyWt2Ft9dzKzhmqJEkd5r0mELSWtFKwVI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 h1:hnwdZp4u7ko7qXQo5KoCnLBdfVHc6XHXTPnQyAuuqtg= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 h1:XaOUiT2UMoZaZcFzawv2GSPxD5D3ZUW8BNGJYqsCs6E= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2/go.mod h1:nEqWuQNrBxCIeYnc9zWoV3/SW5Lhtrn7vvugEFVk88o= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587 h1:eZ79/F6bhtqoY78KRRxp5G5yITTgVatMnj5J/cYDumI= github.com/openshift/library-go v0.0.0-20240513090140-e22d25af5587/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco= github.com/openshift/route-controller-manager v0.0.0-20240306200724-3112b458983c h1:Y+CdtMBqLmL5RQAYzugn3O5xsKC6y0oYpqY9Ds/PMr8= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 4a48828bbb..fe8c6419e9 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -25,6 +25,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:a295621f75fadbb1c4ab5f6d8221fd408d5ac5a836a42d120aa75a414a3917c2" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05c85dfc2249b85de1103f1e9392228bcad1596c75197dd6d5349ecc2b4e4383" 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 bed3a1cf06..125b008c6c 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,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:45da6f33ff8298a688bbf1eddf4fad6f6171f90fc2633c0303efed7b7f7b24c2" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bb5470f6ac9cfd832bf138a0297e40965cd21cbfeada8f860bd7cf0d2c0f13a" 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 ed11c6bc17..00070ae221 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,93 @@ -- coredns image-amd64 5afff2a989779a52e00ef9579cfbc03f36b5334a to 04d84f7f2e17ff464fad3f2841e7b29a43c8382f - - 399a67a 2024-06-11T17:51:05+00:00 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 +- cluster-ingress-operator embedded-component 28c943937d7bc6718e10af50da82097ce8fc6877 to 9eae38dce9615897991a3b0b1f73e2cdb33b7f8e + - f552fec 2024-06-25T20:55:50+02:00 OCPBUGS-28673: Add e2e test for connect timeout + - 5850958 2024-06-20T15:48:31+00:00 OCPBUGS-35368: Add Regexp Anchor to TestAll -- coredns image-arm64 5afff2a989779a52e00ef9579cfbc03f36b5334a to 04d84f7f2e17ff464fad3f2841e7b29a43c8382f - - 399a67a 2024-06-11T17:51:05+00:00 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 +- cluster-network-operator embedded-component 84f9a080d03777c95a1c5a0d13ca16e5aa342d98 to e2f42540a5cbde654ef1b2535b1a6afc1fc7ab29 + - 6d69bad 2024-06-21T16:52:24+02:00 Update whereabouts crd + - 3bfdad8 2024-06-19T13:52:17+00:00 Create the configmap mtu if not found + +- cluster-openshift-controller-manager-operator embedded-component 899699681f8bb984d0f249dec171e630440c461b to bcc371ccbc9cab9bcb80b3f1a281a40c28011f59 + - 3a6ad51 2024-06-19T12:33:10+00:00 fix nil pointer reference + - 9dabf00 2024-05-22T13:47:20+00:00 delay deleting recently created image pull secrets + +- kubernetes embedded-component b2f5b1171deb4bbf754961c8b72ac31d2548c896 to 58452d8d4db25d4afb8e53ed5901103590766b7e + - 7bf0b7a16 2024-06-18T16:40:22+00:00 UPSTREAM: : Disable PersistentVolumeLabel by default + - 055f0886e 2024-06-14T14:40:53+01:00 UPSTREAM: 125337: add more testing for node.status.addresses + - 514975173 2024-06-14T14:40:52+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external + - 2aa044a34 2024-06-14T14:39:06+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override + +- machine-config-operator embedded-component b118fb4e80373d2ea0c1158bc5abbcdf2e8e674c to 8c4afe087d64b028fdc16df24204fe4f7f7e6127 + - a7b8ead9 2024-06-27T13:11:49-04:00 e2e test should wait for MCD pod to be running + - cf9847e0 2024-06-26T06:36:31+00:00 daemon/update: add workaround for OCPBUGS-33694 + - 5c3cf9b2 2024-06-26T06:36:31+00:00 daemon/update: disable systemd unit before overwriting + - daeeb8cd 2024-06-25T13:15:08-04:00 update events in nodecontroller should include MachineConfig / image + - 45a04895 2024-06-25T13:15:03-04:00 start MachineOSConfig informers only if the featuregate is enabled + - 120ef82d 2024-06-25T10:13:43-04:00 initial commit of MCD-side implementation + - d0b31ae5 2024-06-25T10:13:23-04:00 move canonicalizePullSecretBytes and add tests for all DockerConfig helpers + - 86b00a33 2024-06-25T10:12:52-04:00 wires up operator-side for currentimagepullsecret syncing + - b8150198 2024-06-25T09:56:52-04:00 certificatewriter should handle the internal registry pull secret + - 91f42cc1 2024-06-24T12:41:10-04:00 disable mglru service + - 84ec414d 2024-06-21T16:58:47+00:00 daemon: add check for reload crio action + - 36aec890 2024-06-19T00:46:36+00:00 Revert "Azure: add Azure specific dnsmasq ordering" + - 8c132332 2024-06-18T15:46:44+00:00 OCPBUGS-33331: Fix reference to $host_file + - 95bfa455 2024-06-14T14:05:30+00:00 Default ipv4 NODE_IP to 0.0.0.0 + - 378b355a 2024-06-12T15:39:04+00:00 Azure: add Azure specific dnsmasq ordering + +- operator-framework-olm embedded-component 1aacee6a78ceac7acd5aa03647933e550d66a12c to 555e529c944f9b8b93d2e4d9626e12de51f59854 + - aaa3a02f 2024-06-24T22:49:02-04:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217) + - f158dee0 2024-06-12T16:17:19-04:00 OCPBUGS-31522: Warn and allow CRD upgrade if validation fails but new CRD specifies a conversion strategy (#3209) + +- oc image-amd64 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b to e4cacc0be012b75a230f07e3902a1ede9a2ecba9 + - 9c93d7ec 2024-06-21T15:21:06+00:00 `upgrade status`: revert to overestimating remaining time + - 88d8c507 2024-06-21T15:21:06+00:00 `upgrade status`: lower estimated node actions to avoid inconsistency with estimation + - f9da51a8 2024-06-21T15:21:06+00:00 `upgrade status`: overestimate total duration, not remaining time + - f7bdc8ee 2024-06-21T15:21:06+00:00 `upgrade status`: change how last observed progress is computed + - 622c2331 2024-06-21T15:21:06+00:00 `upgrade status`: get baseline from history when possible + - 0774046c 2024-06-21T15:21:06+00:00 `upgrade status`: stalled or progressing-slow when over estimate + - 3f3efbc4 2024-06-21T15:21:06+00:00 `upgrade status`: show <10m when estimate is lower than 10m + - 32616e45 2024-06-21T15:21:06+00:00 `upgrade status`: overestimate remaining time by 20% + - 2a423347 2024-06-21T15:21:06+00:00 `update status`: Avoid projecting from small values + - f53d9122 2024-06-21T15:21:06+00:00 `upgrade status`: do not show estimate TTC when completed + - 98652794 2024-06-21T15:21:06+00:00 `upgrade status`: estimate better via last observed progress + - fc5e067f 2024-06-21T15:21:06+00:00 `update status`: use timewise completion estimate + - 435e3adc 2024-06-21T15:21:06+00:00 `update status`: project estimate duration from elapsed + - bc341a32 2024-06-21T15:21:06+00:00 `update status`: add baseline control plane estimate duration + - a78215a1 2024-06-21T15:21:06+00:00 `update status`: truncate subsecond durations + - e086a0d3 2024-06-21T15:21:06+00:00 `update status`: inject ns skew to eliminate input data rounding + +- ovn-kubernetes image-amd64 d90fa545e17a27bdf253fa820a1d7552e3079465 to 8a9743708ae117595226a52b4856f8c032fed2ab + - b3dde60f 2024-06-20T15:05:08+02:00 Bump OVN to 24.03.2-19 in Dockerfile.base to fix multicast bug + +- kubernetes image-amd64 b2f5b1171deb4bbf754961c8b72ac31d2548c896 to 58452d8d4db25d4afb8e53ed5901103590766b7e + - 7bf0b7a16 2024-06-18T16:40:22+00:00 UPSTREAM: : Disable PersistentVolumeLabel by default + - 055f0886e 2024-06-14T14:40:53+01:00 UPSTREAM: 125337: add more testing for node.status.addresses + - 514975173 2024-06-14T14:40:52+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external + - 2aa044a34 2024-06-14T14:39:06+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override + +- oc image-arm64 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b to e4cacc0be012b75a230f07e3902a1ede9a2ecba9 + - 9c93d7ec 2024-06-21T15:21:06+00:00 `upgrade status`: revert to overestimating remaining time + - 88d8c507 2024-06-21T15:21:06+00:00 `upgrade status`: lower estimated node actions to avoid inconsistency with estimation + - f9da51a8 2024-06-21T15:21:06+00:00 `upgrade status`: overestimate total duration, not remaining time + - f7bdc8ee 2024-06-21T15:21:06+00:00 `upgrade status`: change how last observed progress is computed + - 622c2331 2024-06-21T15:21:06+00:00 `upgrade status`: get baseline from history when possible + - 0774046c 2024-06-21T15:21:06+00:00 `upgrade status`: stalled or progressing-slow when over estimate + - 3f3efbc4 2024-06-21T15:21:06+00:00 `upgrade status`: show <10m when estimate is lower than 10m + - 32616e45 2024-06-21T15:21:06+00:00 `upgrade status`: overestimate remaining time by 20% + - 2a423347 2024-06-21T15:21:06+00:00 `update status`: Avoid projecting from small values + - f53d9122 2024-06-21T15:21:06+00:00 `upgrade status`: do not show estimate TTC when completed + - 98652794 2024-06-21T15:21:06+00:00 `upgrade status`: estimate better via last observed progress + - fc5e067f 2024-06-21T15:21:06+00:00 `update status`: use timewise completion estimate + - 435e3adc 2024-06-21T15:21:06+00:00 `update status`: project estimate duration from elapsed + - bc341a32 2024-06-21T15:21:06+00:00 `update status`: add baseline control plane estimate duration + - a78215a1 2024-06-21T15:21:06+00:00 `update status`: truncate subsecond durations + - e086a0d3 2024-06-21T15:21:06+00:00 `update status`: inject ns skew to eliminate input data rounding + +- ovn-kubernetes image-arm64 d90fa545e17a27bdf253fa820a1d7552e3079465 to 8a9743708ae117595226a52b4856f8c032fed2ab + - b3dde60f 2024-06-20T15:05:08+02:00 Bump OVN to 24.03.2-19 in Dockerfile.base to fix multicast bug + +- kubernetes image-arm64 b2f5b1171deb4bbf754961c8b72ac31d2548c896 to 58452d8d4db25d4afb8e53ed5901103590766b7e + - 7bf0b7a16 2024-06-18T16:40:22+00:00 UPSTREAM: : Disable PersistentVolumeLabel by default + - 055f0886e 2024-06-14T14:40:53+01:00 UPSTREAM: 125337: add more testing for node.status.addresses + - 514975173 2024-06-14T14:40:52+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external + - 2aa044a34 2024-06-14T14:39:06+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index af4c27958e..a61aa994c3 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,38 +1,38 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 439826e1a723c094717877db0f2ca1848d0fb10a https://github.com/openshift/cluster-dns-operator embedded-component a14431f277364605ede8e95530453c5fb7267e33 -https://github.com/openshift/cluster-ingress-operator embedded-component 28c943937d7bc6718e10af50da82097ce8fc6877 +https://github.com/openshift/cluster-ingress-operator embedded-component 9eae38dce9615897991a3b0b1f73e2cdb33b7f8e https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d790493cfc43fd33450ca27633cbe37aa17427d2 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0338b3be6912024d03def2c26f0fa10218fc2c25 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6 -https://github.com/openshift/cluster-network-operator embedded-component 84f9a080d03777c95a1c5a0d13ca16e5aa342d98 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 899699681f8bb984d0f249dec171e630440c461b +https://github.com/openshift/cluster-network-operator embedded-component e2f42540a5cbde654ef1b2535b1a6afc1fc7ab29 +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component bcc371ccbc9cab9bcb80b3f1a281a40c28011f59 https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88 https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305 -https://github.com/openshift/kubernetes embedded-component b2f5b1171deb4bbf754961c8b72ac31d2548c896 +https://github.com/openshift/kubernetes embedded-component 58452d8d4db25d4afb8e53ed5901103590766b7e https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51 -https://github.com/openshift/machine-config-operator embedded-component b118fb4e80373d2ea0c1158bc5abbcdf2e8e674c +https://github.com/openshift/machine-config-operator embedded-component 8c4afe087d64b028fdc16df24204fe4f7f7e6127 https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc -https://github.com/openshift/operator-framework-olm embedded-component 1aacee6a78ceac7acd5aa03647933e550d66a12c +https://github.com/openshift/operator-framework-olm embedded-component 555e529c944f9b8b93d2e4d9626e12de51f59854 https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6 https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac -https://github.com/openshift/oc image-amd64 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b +https://github.com/openshift/oc image-amd64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 https://github.com/openshift/coredns image-amd64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 d90fa545e17a27bdf253fa820a1d7552e3079465 -https://github.com/openshift/kubernetes image-amd64 b2f5b1171deb4bbf754961c8b72ac31d2548c896 +https://github.com/openshift/ovn-kubernetes image-amd64 8a9743708ae117595226a52b4856f8c032fed2ab +https://github.com/openshift/kubernetes image-amd64 58452d8d4db25d4afb8e53ed5901103590766b7e https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac -https://github.com/openshift/oc image-arm64 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b +https://github.com/openshift/oc image-arm64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 https://github.com/openshift/coredns image-arm64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28 https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-arm64 d90fa545e17a27bdf253fa820a1d7552e3079465 -https://github.com/openshift/kubernetes image-arm64 b2f5b1171deb4bbf754961c8b72ac31d2548c896 +https://github.com/openshift/ovn-kubernetes image-arm64 8a9743708ae117595226a52b4856f8c032fed2ab +https://github.com/openshift/kubernetes image-arm64 58452d8d4db25d4afb8e53ed5901103590766b7e https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 4cbcf870c1..b8477895a4 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.16.0-0.nightly-2024-06-14-130320" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-15-032331" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-07-02-211018" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-02-221036" diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go index 6e203c9d88..a3ed526650 100644 --- a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go +++ b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go @@ -298,7 +298,7 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) { fs.StringVar(&f.HostnameOverride, "hostname-override", f.HostnameOverride, "If non-empty, will use this string as identification instead of the actual hostname. If --cloud-provider is set, the cloud provider determines the name of the node (consult cloud provider documentation to determine if and how the hostname is used).") - fs.StringVar(&f.NodeIP, "node-ip", f.NodeIP, "IP address (or comma-separated dual-stack IP addresses) of the node. If unset, kubelet will use the node's default IPv4 address, if any, or its default IPv6 address if it has no IPv4 addresses. You can pass '::' to make it prefer the default IPv6 address rather than the default IPv4 address.") + fs.StringVar(&f.NodeIP, "node-ip", f.NodeIP, "IP address (or comma-separated dual-stack IP addresses) of the node. If unset, kubelet will use the node's default IPv4 address, if any, or its default IPv6 address if it has no IPv4 addresses. You can pass '::' to make it prefer the default IPv6 address rather than the default IPv4 address. If cloud-provider is set to external, this flag will help to bootstrap the node with the corresponding IP.") fs.StringVar(&f.CertDirectory, "cert-dir", f.CertDirectory, "The directory where the TLS certs are located. "+ "If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored.") diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go index a75cdfdde2..8a1ff225f3 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go @@ -85,7 +85,6 @@ var ( additionalDefaultOnPlugins = sets.NewString( "NodeRestriction", "OwnerReferencesPermissionEnforcement", - "PersistentVolumeLabel", "PodNodeSelector", "PodTolerationRestriction", "Priority", diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go index 1023c43e2b..31491dac6d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" cloudprovider "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" @@ -787,7 +788,7 @@ func (kl *Kubelet) defaultNodeStatusFuncs() []func(context.Context, *v1.Node) er } var setters []func(ctx context.Context, n *v1.Node) error setters = append(setters, - nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc), + nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc, utilnet.ResolveBindAddress), nodestatus.MachineInfo(string(kl.nodeName), kl.maxPods, kl.podsPerCore, kl.GetCachedMachineInfo, kl.containerManager.GetCapacity, kl.containerManager.GetDevicePluginResourceCapacity, kl.containerManager.GetNodeAllocatableReservation, kl.recordEvent, kl.supportLocalStorageCapacityIsolation()), nodestatus.VersionInfo(kl.cadvisor.VersionInfo, kl.containerRuntime.Type, kl.containerRuntime.Version), diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go index b539cbda86..d7ed00e112 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/errors" - utilnet "k8s.io/apimachinery/pkg/util/net" utilfeature "k8s.io/apiserver/pkg/util/feature" cloudprovider "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" @@ -67,6 +66,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs externalCloudProvider bool, // typically Kubelet.externalCloudProvider cloud cloudprovider.Interface, // typically Kubelet.cloud nodeAddressesFunc func() ([]v1.NodeAddress, error), // typically Kubelet.cloudResourceSyncManager.NodeAddresses + resolveAddressFunc func(net.IP) (net.IP, error), // typically k8s.io/apimachinery/pkg/util/net.ResolveBindAddress ) Setter { var nodeIP, secondaryNodeIP net.IP if len(nodeIPs) > 0 { @@ -130,12 +130,18 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs if len(node.Status.Addresses) > 0 { return nil } - // If nodeIPs are not specified wait for the external cloud-provider to set the node addresses. + // If nodeIPs are not set wait for the external cloud-provider to set the node addresses. + // If the nodeIP is the unspecified address 0.0.0.0 or ::, then use the IP of the default gateway of + // the corresponding IP family to bootstrap the node until the out-of-tree provider overrides it later. + // xref: https://github.com/kubernetes/kubernetes/issues/125348 // Otherwise uses them on the assumption that the installer/administrator has the previous knowledge // required to ensure the external cloud provider will use the same addresses to avoid the issues explained // in https://github.com/kubernetes/kubernetes/issues/120720. // We are already hinting the external cloud provider via the annotation AnnotationAlphaProvidedIPAddr. - if !nodeIPSpecified { + if nodeIP == nil { + node.Status.Addresses = []v1.NodeAddress{ + {Type: v1.NodeHostName, Address: hostname}, + } return nil } } @@ -220,7 +226,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs } if ipAddr == nil { - ipAddr, err = utilnet.ResolveBindAddress(nodeIP) + ipAddr, err = resolveAddressFunc(nodeIP) } } diff --git a/vendor/modules.txt b/vendor/modules.txt index c63536e885..2440f995c4 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1360,7 +1360,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/api v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1417,7 +1417,7 @@ k8s.io/api/scheduling/v1beta1 k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 -# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/apiextensions-apiserver v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1464,7 +1464,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/apimachinery v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1531,7 +1531,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/apiserver v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/cel @@ -1699,13 +1699,13 @@ k8s.io/apiserver/plugin/pkg/audit/webhook 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/client-go v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2043,7 +2043,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/cloud-provider v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2066,14 +2066,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-20240607103948-b2f5b1171deb +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/component-base v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2107,7 +2107,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/component-helpers v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2120,7 +2120,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/controller-manager v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2137,19 +2137,19 @@ 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-20240607103948-b2f5b1171deb +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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-20240607103948-b2f5b1171deb +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2173,13 +2173,13 @@ k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler -# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/kms v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/kube-aggregator v0.29.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2210,7 +2210,7 @@ k8s.io/kube-aggregator/pkg/controllers/status 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-20240607103948-b2f5b1171deb +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 @@ -2243,11 +2243,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-20240607103948-b2f5b1171deb +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 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-20240607103948-b2f5b1171deb +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2282,7 +2282,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.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/kubelet v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2304,7 +2304,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.29.1 => github.com/openshift/kubernetes v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/kubernetes v1.29.1 => github.com/openshift/kubernetes v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3103,7 +3103,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3145,7 +3145,7 @@ k8s.io/legacy-cloud-providers/gce/gcpcredential k8s.io/legacy-cloud-providers/vsphere k8s.io/legacy-cloud-providers/vsphere/vclib k8s.io/legacy-cloud-providers/vsphere/vclib/diskmanagers -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3160,10 +3160,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-20240607103948-b2f5b1171deb +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/pod-security-admission v0.29.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 ## explicit; go 1.21 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3314,38 +3314,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/ginkgo/v2 v2.6.1-0.20231031162821-c5e24be53ea7 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240607103948-b2f5b1171deb -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240619152203-58452d8d4db2 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240619152203-58452d8d4db2 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240125051406-969a60e9e246 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240607103948-b2f5b1171deb +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240619152203-58452d8d4db2