diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index feffe3c5b6..a4f1738cce 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=29c95f359e591fae386ce64516812d8b65d285be KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b177828007..9393287d46 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-06-20-000728 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 399d8bbdbe..e2e471e7d2 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-06-19-201313 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 3904a1c9dc..a530fa80a9 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-15-032331" + "base": "4.16.0-0.nightly-arm64-2024-06-20-000728" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49240013eca227e2fbdc5d6ccb57498dd39eac9fce6d7ae3471de18c6b22fc04", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index aae4ecc471..fed97cba6c 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-06-14-130320" + "base": "4.16.0-0.nightly-2024-06-19-201313" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:454fcc7d474271d13b864fda2e7ae7b7b5235799f1423ba79cb3f2b52c05ba57", diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index bc367bbba3..a0016a9ecb 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cbb1842dab8fd775ee814c9a4dca36ea0acf20a143e4b6de55f27441375fe76f + digest: sha256:9f4aa5aa54b111b147060345ddaaa2559e2dc3e0bbd53d3cddf47c07bb896c3e - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:f7baaf5d67d20c4956504578ce1f0e1693a440e33b36189389e38a09da509f69 + digest: sha256:2db82c471ddb84d3ed87dada4f8dc80d1d763715c7f3fdb3733d0e582f51b18a - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4 @@ -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:2db82c471ddb84d3ed87dada4f8dc80d1d763715c7f3fdb3733d0e582f51b18a - 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:9f4aa5aa54b111b147060345ddaaa2559e2dc3e0bbd53d3cddf47c07bb896c3e 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..5cc8308631 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:2858d5039ccec571b6cd26627bcc15672b705846caefb817b9c8fdc52c91b2a8 + digest: sha256:7ad8985ff75c520d70815132dfb6c2e0d44acb16eea1f173e26c443c261a5ff7 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fd647545b1e1e8133f835b5842318c4a574964a1089d0c79e368492f43f4be0a + digest: sha256:8008615b8cbf3c1cdfb19e34ff799df87330671d5113f93b73f7a3d99d732fd3 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903 @@ -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:8008615b8cbf3c1cdfb19e34ff799df87330671d5113f93b73f7a3d99d732fd3 - 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:7ad8985ff75c520d70815132dfb6c2e0d44acb16eea1f173e26c443c261a5ff7 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..42a81aec1b 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-06-20-000728" }, "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", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f4aa5aa54b111b147060345ddaaa2559e2dc3e0bbd53d3cddf47c07bb896c3e", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2db82c471ddb84d3ed87dada4f8dc80d1d763715c7f3fdb3733d0e582f51b18a", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4" } } 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..379ff8f1be 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-06-19-201313" }, "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", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ad8985ff75c520d70815132dfb6c2e0d44acb16eea1f173e26c443c261a5ff7", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8008615b8cbf3c1cdfb19e34ff799df87330671d5113f93b73f7a3d99d732fd3", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1cc870d135..0c91d952a6 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-arm64-2024-06-15-032331" + "base": "4.16.0-0.nightly-arm64-2024-06-20-000728" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fac8e24eedc0903b7130df284b883346a54a5be198841a2a49bec22d6f1d69b9", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79126008c41c45c332110557c2984a96a14801316d7c86f479e528c7cb113ac4", "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", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba90cfcbed355c04303a98c57e78290cf4805a266efa2ae2871d7079077a27b4", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:159a677b5c3ee7a78d31cf5e0772ddbfc40aaefc4a12e247c11ed4610c89f8f4", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 22977468ed..1bf4632eb9 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.16.0-0.nightly-2024-06-14-130320" + "base": "4.16.0-0.nightly-2024-06-19-201313" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6994ed1b1593f7638e3a8732c503356885a02dc245451ceddc3809f61023dce", @@ -9,7 +9,7 @@ "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69f0ea9c4dd64fcb95e7d523331e9e46cf36132427af07bd759cbd1837eaf903", "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", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce0319702e115e7248d135e58342ccf3f458e19c39e86dc8e79036f578ce80a4", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24216f0c25a6e1d33af5f8798e7066a97c6c468ad09b8fad7342ee280db29d9d", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", diff --git a/etcd/go.mod b/etcd/go.mod index aee9a613ce..f60500c027 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-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240617024313-29c95f359e59 // 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-20240617024313-29c95f359e59 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 52de248435..26d21dfd0b 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-20240617024313-29c95f359e59 h1:SGZaBW+5AvHYRA78dKhKQ6Foyfn+MRTZSUPAP8RfAnA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240617024313-29c95f359e59/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 h1:U/wfFiTm7vGQbvI+Y30MANgGkBlVLKxaCfYb3RynODc= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 h1:WQ7qWY3/tcAF693A/JgNI7XQUzfHpXTYMbOl53NX7ew= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 h1:P1uKJAtBC83MNfdo76BwLyiUqTsgISvDWhj4Gu0u2qg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 h1:CnEZ3zc2lhojCPRW48R7rGWA9SSWmVf71aHqOVhNHok= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 h1:dGr7DtqL782wWsdePMTuUkQ+tAmEUMlQKSZUGG4ZHKo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 h1:MgRg9Y2AwyCYfw++DwD8P2iq6Nv98yseA6XiK0YRiH8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59/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..c29289052f 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240617024313-29c95f359e59 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240617024313-29c95f359e59 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240617024313-29c95f359e59 diff --git a/go.mod b/go.mod index 0fa52c7923..ae4eb5aabc 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-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240617024313-29c95f359e59 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240617024313-29c95f359e59 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240617024313-29c95f359e59 // 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-20240617024313-29c95f359e59 // staging kubernetes diff --git a/go.sum b/go.sum index 50a3a69ea5..2fc99a21b4 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-20240617024313-29c95f359e59 h1:qEmyOkWLXKMzqGuYa8BKO8DDSvwEq0Z9hHad5gn+cfY= +github.com/openshift/kubernetes v0.0.0-20240617024313-29c95f359e59/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-20240617024313-29c95f359e59 h1:SGZaBW+5AvHYRA78dKhKQ6Foyfn+MRTZSUPAP8RfAnA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240617024313-29c95f359e59/go.mod h1:oIThoHpI6Q+T3cndFnOnKY4n2GzS7mYQvvBIQ/VvI8M= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59 h1:ztavxVHFBniIcaYtmHT/rPIpNlRVUjeFUR1VScjuNK0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59/go.mod h1:wUPaZ3kD56u1+Otpop2sGPnb5Jd05G9+CASPAq4jajM= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 h1:U/wfFiTm7vGQbvI+Y30MANgGkBlVLKxaCfYb3RynODc= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59/go.mod h1:IhHRRF080N9VU1QEEJ5zTYAQkPElZ84OH08nPyo0Lw0= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 h1:WQ7qWY3/tcAF693A/JgNI7XQUzfHpXTYMbOl53NX7ew= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59/go.mod h1:sjU09dvDkAwHERssOwGL7Dh0XzRuddq+gDAImcKFLo4= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 h1:P1uKJAtBC83MNfdo76BwLyiUqTsgISvDWhj4Gu0u2qg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59/go.mod h1:eq1ArtMJ3o/VUDn7NTP/eryQG8pTGjtattESXd5g42U= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 h1:CnEZ3zc2lhojCPRW48R7rGWA9SSWmVf71aHqOVhNHok= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59/go.mod h1:68E0AiovGRxyJ30s/QzLPLardQJCx/gm2GhdaAzJ10M= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59 h1:a9BoS5Lt2BfBY73C+C2onOkKVQWXS/coUDaHYrVxzfs= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59/go.mod h1:BMxEHFgDwf6lIiU/WFf9JaKhPjqKY2C3KPRaEF981TE= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59 h1:OkFngrfM62wA0IO1d3ZalHlpSWAK8F8wt9PwjC7Bdpk= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59/go.mod h1:NMIqLZ1bjJKn/OxQs/urOq9Mo7o4Z9SgaEkDi8r0iDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 h1:dGr7DtqL782wWsdePMTuUkQ+tAmEUMlQKSZUGG4ZHKo= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59/go.mod h1:JnCQWqQaTRtB1Mp/WKNpwndJeyVDa0DX0XfjeQlmB1M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59 h1:cj6Q0xljTVrKD/XEGjLEhHYKx9egCjIHLgn4gxRVS9o= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59/go.mod h1:Ken1KocNhJBJHBCvzeByTlXNO+oxxh982ieimC6KX4g= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59 h1:Zqqg+6uaLlC5D+VNXhmmG6+Qf/f8Zpozk7C3IuGnCGM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59/go.mod h1:lP4RyYBciOkhbVCTb5MbSN0/GOauZTwGgpbTkwb7kEw= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59 h1:TH7MnZPprbeDUvLsyKyRLn/ZnXij4x44yd9JblRUtzk= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59/go.mod h1:9Tgle7RkZOzgRM2VCSvvXZZjsQqOC6dxLtYy6BF+5PE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59 h1:izQ5jS/eRy40++3sPZ6fUKXr0QVSkR3IHQ+nD/Ql55c= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59/go.mod h1:bKXDOUmiy/juOoPYsnxt3RbUKZKx+LFKsfCZw8nxsos= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59 h1:HJtvrwDfELa2LgCwpkLAOtngaRSr330TeK+EgoFeoMo= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59/go.mod h1:ia6wL8kICRq0a6Zj2idep1RncpGA/8/qdTbL5rYqxz0= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240617024313-29c95f359e59 h1:upkN2OlHaz1Dq8Z12i1p0f0Up/IML38wnw8Ji3F5+UU= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240617024313-29c95f359e59/go.mod h1:O/HKBFPaFbGb++MLSF/NSRMvksaQ3yfgOgXLuykggQA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59 h1:RHygTNXforxw4DPddEQ98YSCe48oPl2d8Yv6KrXCHVk= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59/go.mod h1:4pCpiW+pKMCqRLVoGPw11lrvEriSyd8o7DSvCw2u9vY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59 h1:cQIyyJeB47p7/kl6a3cEjnTSezvWU9NWYT0kwRGqpCc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59/go.mod h1:4J7wfAzEbaohBbEGIixBHQL5SIyinxnGKUjlwn9L3YQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59 h1:fJWepjLtPg4SCxQSY2AlpldxWAkNYKUeDeH6v3Li0mo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59/go.mod h1:GzLfPndMG5N4amYe78K2d9Y32Dtdz7IxAsR+jvYNAxM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59 h1:lp0dnkk9/KWtnHt+Gtq9NPanpXO0Iml3nuuDFdjfTAs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59/go.mod h1:iCnLhShFPbA6+0cBJHMIC8osA4ukveEZbQweXjn+oXo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 h1:MgRg9Y2AwyCYfw++DwD8P2iq6Nv98yseA6XiK0YRiH8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59/go.mod h1:L0N5ONv4vn8oIGy8gjX0ZzkLT7GLQxP2G9R2+K/osEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59 h1:Bo14BN3XOQXYeb1SuzbI6tkQxkM8JYjXCr/f95yT59Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59/go.mod h1:KvraWPlwZlgVhDnR3yjrAQTIPAk2Qia7iA6f7MWmZ6k= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59 h1:9OlGACK+7mzIN/vGPMP1oVvLOVclsgCDM6eNDDzZyqQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59/go.mod h1:W4g9/bUJ1/X01jOJGx395Ob4wKV2R58OrGvDhVdZSjw= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59 h1:R8l7A8woUYIvjbtM3dXBYfEC+iU1nB0cyg4fMzOeLX8= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59/go.mod h1:wcQC0ObNu0HtMRBaJJL6OJgg+DzcrdgW9ek5i7AncbE= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59 h1:u+UmMXtoAapV3NGV3a09Pp2bKgNZfenF3Lbexkf6I7w= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59/go.mod h1:4KmkE88Y4LDYrotr6iqMrolXDcWWY7UqmroXTO/sxFw= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59 h1:UgBXym9ydDgmAjVDAQbjd6ExQmFZDAcqr3xDFjFhuVU= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59/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..c038a45618 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:ce0319702e115e7248d135e58342ccf3f458e19c39e86dc8e79036f578ce80a4" 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..d2ccc81a61 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:ba90cfcbed355c04303a98c57e78290cf4805a266efa2ae2871d7079077a27b4" 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..06d13b343a 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,6 +1,23 @@ -- coredns image-amd64 5afff2a989779a52e00ef9579cfbc03f36b5334a to 04d84f7f2e17ff464fad3f2841e7b29a43c8382f - - 399a67a 2024-06-11T17:51:05+00:00 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 +- kubernetes embedded-component b2f5b1171deb4bbf754961c8b72ac31d2548c896 to 29c95f359e591fae386ce64516812d8b65d285be + - 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 -- coredns image-arm64 5afff2a989779a52e00ef9579cfbc03f36b5334a to 04d84f7f2e17ff464fad3f2841e7b29a43c8382f - - 399a67a 2024-06-11T17:51:05+00:00 UPSTREAM: 6692: openshift: Fix OCPBUGS-34619 +- machine-config-operator embedded-component b118fb4e80373d2ea0c1158bc5abbcdf2e8e674c to e03a9a494ef840b3c8d6cc827577552525bf993f + - 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 66ef61a4f0a37003564f06514e695a9b68123a6c + - 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) + +- kubernetes image-amd64 b2f5b1171deb4bbf754961c8b72ac31d2548c896 to 29c95f359e591fae386ce64516812d8b65d285be + - 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 + +- 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..598e33a951 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -9,11 +9,11 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed 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 29c95f359e591fae386ce64516812d8b65d285be 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 e03a9a494ef840b3c8d6cc827577552525bf993f 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 66ef61a4f0a37003564f06514e695a9b68123a6c 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 @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415 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/kubernetes image-amd64 29c95f359e591fae386ce64516812d8b65d285be https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac https://github.com/openshift/oc image-arm64 a2450418f7b12a71e8f3562a4e9aa8a976bbf85b https://github.com/openshift/coredns image-arm64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f @@ -34,5 +34,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415 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/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..90a2060968 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-06-19-201313" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-06-20-000728" 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/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..843cf20234 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 ## 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-20240617024313-29c95f359e59 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240617024313-29c95f359e59 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240617024313-29c95f359e59 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240617024313-29c95f359e59 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240617024313-29c95f359e59 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240617024313-29c95f359e59 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240617024313-29c95f359e59 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240617024313-29c95f359e59 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240617024313-29c95f359e59 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240617024313-29c95f359e59 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240617024313-29c95f359e59 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240617024313-29c95f359e59 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240617024313-29c95f359e59 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240617024313-29c95f359e59 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240617024313-29c95f359e59 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240617024313-29c95f359e59 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240617024313-29c95f359e59 # 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-20240617024313-29c95f359e59