diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 24b72eb731..bc3cb0c55e 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=28 KUBE_GIT_VERSION=v1.28.12 -KUBE_GIT_COMMIT=396c8817940d592049f2fcfdeae4a264c953ea8e +KUBE_GIT_COMMIT=bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 3414d7ea32..4a97d753e8 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-15-000745 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-16-005250 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 1367d9a076..5bb587fc0e 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-08-13-134622 +OCP_VERSION := 4.15.0-0.nightly-2024-08-15-210543 diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 13cc6bb05d..46b092c40c 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:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2 + digest: sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa + digest: sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24 @@ -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:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d - 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:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b 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 3d80953c5a..4564a65af3 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae + digest: sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584 + digest: sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748 + digest: sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893 - 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:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f 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 f42b76f761..3ed2bc42bb 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.15.0-0.nightly-arm64-2024-08-15-000745" + "base": "4.15.0-0.nightly-arm64-2024-08-16-005250" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24" } } 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 653e851af2..c856d3c2f2 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.15.0-0.nightly-2024-08-13-134622" + "base": "4.15.0-0.nightly-2024-08-15-210543" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 0be6f3a108..69662e0273 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-08-15-000745" + "base": "4.15.0-0.nightly-arm64-2024-08-16-005250" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efc54fd99b86fd49a6d02efd073aad9cda04ea8c985bd985f67cfabccdfdd7d7", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index f54e4f365c..3f26d6e8a6 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.15.0-0.nightly-2024-08-13-134622" + "base": "4.15.0-0.nightly-2024-08-15-210543" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12cf2b77952d1eea164772ddf62ba4eb7c8c889e37b8177cd3ffc8aa33c2fddf", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb60567d8656acb417e5c02c5ad2effde241e88803ff94ec73aed0e3f67c608", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f249e969fc8c39cef5641619573cb3dbfc3ef920d6617d7836830653e1d72fe", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3d31a920ed4de1a3d57287bfc4fc913bf77f29c30701cb393a682a0e6b19fb9", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46ecf2871f92e44b2ac4a28682c96a01863e291ffbbb4ba5fbde5f20e53de171", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff", "openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d814e97131444982f18053125fc337d73a3117b1606052c417d34d9f5b01868", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:421c756e8d36fabd77e6f72681d098263628b81f24ded16ed47c9b042931fceb", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa70d58bc05e560d2cc66ee66877e11e73cc4377a2dfd2a3ad583b1e28572ebe", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e92f614e3053f7495e1ecd3c1d678c56b7c08a04a0228f349c5ba6d43d7b9b0", "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 04573e29c1..09ff461755 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -145,35 +145,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240807041704-396c8817940d // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 1aa8b3bd17..51e3c6e735 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -186,18 +186,18 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:cHzYVq github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:ERQuZVe79PI6vcC3DlKBukDCLja/L7YMu29B74Iwj4U= github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:odYEwXTw9Xh+9/jqCPRiS1SMtttO/xJDywbf1rRMe9U= github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:axB0oCjMy+cemo5290/CutIjoxlfA6KVYKD1w0uue10= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d h1:c99m9bE3To6n0n7gQomewoSlgYbLMPE/44p2e3KLTMQ= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d h1:om5MGAo+7PaNqZB1DxqdztnvrLvYofMXfG5Cquuo6iA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d h1:QgVC2qBI1deO3sSnqomV4WmgmuTU/g0gUf7KouOQGPs= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d h1:fpLkcFScYO8l+rA2Nzv2WIcVDMEReeV649UAjJZj3e0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d h1:8+5WMcxgL+sQXOzvGb4yS9QKHbkZNU0jDMj19PVSY4A= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d h1:3/YL9auTU7wCF7ECqY/yzg7Off09sPT9th2oBISH4a8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 h1:1ag3vrutwFzX4qmBp4SXKAMLTC1gWBvMfLVrLTJmW7s= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 h1:WauqctO24Wdm0YFxh6up2e/ek153pewY31kHtHwCNBE= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 h1:W+t/T21/A3bYXsaohCtJzeyXeuJbKFi50KPUPj9kEeg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 h1:mr64WNkQUWZcAZMtXKkQmdcBotQ5MNpyk3LRRl9tM/Y= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 h1:8e4wA3KpGeTmgYhT07y8YsjeyZO1gPyG2n2YL4kHNq4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 h1:INyzjiWVpXSRDlNrNP+THG8JtoKn1piXuWYqghBeH+M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index b63e42e34d..b031e71669 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -598,7 +598,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -655,7 +655,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -708,13 +708,13 @@ 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/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -860,7 +860,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -897,7 +897,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-20240807041704-396c8817940d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1025,33 +1025,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240807041704-396c8817940d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240807041704-396c8817940d -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 diff --git a/go.mod b/go.mod index 010c38338b..dddd0ae96c 100644 --- a/go.mod +++ b/go.mod @@ -237,36 +237,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240807041704-396c8817940d // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240807041704-396c8817940d // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240807041704-396c8817940d // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240813132429-bc3c7c5f9861 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes ) replace ( @@ -277,4 +277,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 // 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-20240807041704-396c8817940d // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes diff --git a/go.sum b/go.sum index ca490d5708..28bd6bc1bd 100644 --- a/go.sum +++ b/go.sum @@ -531,60 +531,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8 h1:w/Et0E3LO3/e0MLw7sPUfVzAQYHD6/XesVGyn3xE6NY= github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/kubernetes v0.0.0-20240807041704-396c8817940d h1:y+7s1zm+rgwvE7MvGjFt2uM/Bqci5O/gPxvCo0RbR1g= -github.com/openshift/kubernetes v0.0.0-20240807041704-396c8817940d/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ= +github.com/openshift/kubernetes v0.0.0-20240813132429-bc3c7c5f9861 h1:e+2ZHnWM2usawcr4KBF8r+kv7z8eOake1pS9cCQUz2U= +github.com/openshift/kubernetes v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:bsnNELIfLpXgP7zJ3NdWjYhuGs+p8ytZTox5BffcWZQ= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 h1:dFt4v5LeBJ4Ohf9oaZ5tce37PPGAeZ4sdbDIeW3R2qo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d h1:c99m9bE3To6n0n7gQomewoSlgYbLMPE/44p2e3KLTMQ= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d h1:9i4vIWbDea3/ENtzyF8w8GNO+lwPR7KBpxs+kXoksVg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d h1:om5MGAo+7PaNqZB1DxqdztnvrLvYofMXfG5Cquuo6iA= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d h1:N0rqaCOC4wVWFg0lHugsyL4kPQ9PHANHoGn12acUxvU= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d h1:QgVC2qBI1deO3sSnqomV4WmgmuTU/g0gUf7KouOQGPs= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d h1:fpLkcFScYO8l+rA2Nzv2WIcVDMEReeV649UAjJZj3e0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d h1:FCEvvXeG3xl9Enswm1R1yM/nA0OXyJfq0Z2iUrTGnr0= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d h1:XTSkq0TVnDIAO0BOhWEnTjltbDbmEQlcJq25NgK5114= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d h1:8+5WMcxgL+sQXOzvGb4yS9QKHbkZNU0jDMj19PVSY4A= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d h1:cU3iVrGsii9bcFxaAEeR1P6NWYjpAO6d4q2nGsKRWZc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d h1:Wf0IviBVwGHJxx73ya8S1KOyj/ABkJ3BJ/T8iac7nVY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d h1:UlC9W7qkqEKzRPS8dxOtUtTTF4Q2w5pW16rUz2hh1/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d h1:nNV7pPyk+yC02DI9A3jQVZKyT296Xy0EyHfb/mpXVWw= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d h1:bLpiFhKxvdSCcsndj1X6er/0toYKI7taZQlGZ/TMK58= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d h1:UsZt+PshdCuXaXp2aLpZF6f77OCVj33b8a2AM26iF/0= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d h1:K+RBMQ9pCZEkpfZmEAyJNGZb4W81N9YBloOSuYRKKYM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d h1:SMBoqcZloR50VbMAkpYW22Fci3GBblQrmPI4COQmsPg= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d h1:in95rxqAJZX2UufdySJqe4OM/YyXTDuVpmNSvcqo1zI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d h1:wzfMZLHhhIp1DXvk7r5OhfEXmyQSc+3Ud/TrV9k3peY= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d h1:3/YL9auTU7wCF7ECqY/yzg7Off09sPT9th2oBISH4a8= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d h1:iWcKmEXyauW+0kqTr72ncIzAzgMJ0pfOS08Al10N34k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d h1:lOKPj3DiXIix5UE60jru21DHPxN+kv7UIY2pfATnMaU= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d h1:W73NotO29y2n3dVuJm/x53noC7PNmFEQ0JZJfjdFwYo= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d h1:EkYlg6gYGeI+fQIHk+7DmcKPp+FsdR0331RnvOGc0OU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d h1:B4oPrh9JZo/68MB43valL6i9MDy7e4FRr6qP/bTxfYg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 h1:1ag3vrutwFzX4qmBp4SXKAMLTC1gWBvMfLVrLTJmW7s= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:O9dOFHEhPB2cBNgLfgJWxr7PQsKaZD+s4ge7yinLRK8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 h1:5mh4ctzoQOnZpt2EsTFvhy1+C2ycgtfeWY+FFMiWpB4= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:JEADgAmrcdlYUwWYmH2+4folhuDunQF6kM8XkyjlSes= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 h1:WauqctO24Wdm0YFxh6up2e/ek153pewY31kHtHwCNBE= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:7BnMj1Uk0Crj/ZzEX8nutXD+pDC9PV6dlK2Nk65O4oE= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 h1:GV5eda4fyXADZHywRhw+gxTf/hZdPVLmmYaz1nHcQng= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:Hpg+2FKUQKOUWwYlku3FZzWY6HuFxsZYaF7gSY/AWcY= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 h1:W+t/T21/A3bYXsaohCtJzeyXeuJbKFi50KPUPj9kEeg= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:hcVqKPtkg/49SbED/gEqOsCga5ErLmvpQsLB5Ecnz9k= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 h1:mr64WNkQUWZcAZMtXKkQmdcBotQ5MNpyk3LRRl9tM/Y= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:rKnUyK/VWH8h8Usz90I49JOrSZLP55QhhXo/XuiGG5g= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 h1:ek5v76hcGiUJig9NavHbrEv6ule1Qqv7qPsblNIRhSg= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:lVv1CgyClHwgW5VnkxtnlYMZ093FHDjOWZ2wWrPFwd4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 h1:3Mz/7Gv8YHvSKWvHfBeDHrAsLBgmtHqEYIwvz9Ai+gY= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:3KcUMZbIfc2yAtIqUVDV2B/ga6f20OJVcpNEvsYp3Ao= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 h1:8e4wA3KpGeTmgYhT07y8YsjeyZO1gPyG2n2YL4kHNq4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:PYRe3SAiqU7/Z5r9bQm1bmOqGk+bYRcx9QcVOMJGFgk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 h1:jt5MUxFppUSd54b5aDQi6vXKTPzgnwCaOCHP8goUX8U= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:WK3e7yoVDEdU2wygztXJq4oap6OmUEWgXs/+EeK0N6U= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 h1:H/MrLrFMZwce8heptGWCKwPpbuffzn0nRJJJFrfnGXE= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:5mPuadzKxGVO2k9j/c23Q6misGE7wxYniJdBQ8tE+S4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 h1:0mM4UAJ5TiOpxwG11teqo+UbBm9+EYLGndyvpYumDEk= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:HMmv7N9wOjHZrbf1YqRgMErFEpTqFOcIiut+GURNUDY= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 h1:yhVhVkgc8FyySYNZrYnDAQCK+PhBDoWziC4nOSGguPE= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:XGUW1T75Y4roafsC0O5ixBRF4Yqh72F6ofJidfyd7ug= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 h1:UjTRxcFHSGLDCSEsLwtrx+HXgc+Zs6ktNIs27gWVxzo= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:W5+zUyc/kGg5H+dblnCDE8NvbipxORM5w10YbT6+SiM= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 h1:gx1B5MkbwcmQZ/pkJMWk3gRJU95FrgTe+ymsQfr9CK8= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:ohENrW+TZNnuno7gvqHlzFzrI3zm6rOIoq0bAbYtn1o= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 h1:d0J0dAtn99VnUnAgfBxYAqtUpHWZPNzus6shhvZKBtY= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:1o9ZKC10P81K3Hbq87MokusYZmOUIhBtVZpWM77lrGs= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 h1:9ReLK3z62//FJEf3KoYyf0rTnDg/0eNmin0RW8NhnV4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:fMgmy+6VTrNP/xhEj66IlGfRZLZU0r2c1hYS3U/uLfE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 h1:EcW9Pprmtv9uN81WKXF5kg7A8GEMfg3d91RxPF17YWc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:EX7y9N2qRhJAneA2tQkdpT3a00BrQ7D4GfWUoM1kiEc= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 h1:MtZVQjGIrJv0jMBO+YSVSG2zOa0EL5XNuAcrLiW45BM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:A6RR84Xj6s1lgkxYAD/pU6u/4umbP5RQ64vM0P1kGig= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 h1:INyzjiWVpXSRDlNrNP+THG8JtoKn1piXuWYqghBeH+M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:tjy5O1L/8+AVf1sJ4QNuQSy6yUxB+8XKp/57p4s3oXU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 h1:Se0MOLgKKg6ACqlSz10vBvAh89WV9yhyMt7JFI9MAsE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:FQy6hmOWj0VRRbVgtj8NqBuAlNsl9ioRTWSBWnYMNf0= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 h1:FvW2jW8SC2sFE8sKdpP8mgtrSxRHHYu/YH5sCrOBIKo= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:NgGcteIwIAy0r/PqqWnL3Jv78EKxdsw6LYgW6vhvBwY= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 h1:9faOMNiOkmlljMVdVdvrSx36KyckGQazlwfoNZKnIgk= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:T1rrpTODDkDjEqupzhkEFdV1cy7MIiYvJq6inj2r0DA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 h1:Sh2PaVN5OLigONZQLAca2ZK1ZfX117mrxr3U8uUQJKY= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:aqPYdSTRGLeQ5zysObqnK3oQ0suNhDJ3DflZKfPjPFc= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 h1:5udMNIX8qgsDLYRpvgEVmb+n+oRhpTLMH5GI/+reb1g= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861/go.mod h1:nUYBUMVG4iQ6Z8Zywo64kbAxFJorSvZ5dthvNTZYTwY= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7/go.mod h1:jgxNp8aApJnZtECid9SUSr5Bu6DLo8Hfdv1DgFZaYA8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= diff --git a/packaging/crio.conf.d/microshift_amd64.conf b/packaging/crio.conf.d/microshift_amd64.conf index a03a5786d8..f22cdacb80 100644 --- a/packaging/crio.conf.d/microshift_amd64.conf +++ b/packaging/crio.conf.d/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:421c756e8d36fabd77e6f72681d098263628b81f24ded16ed47c9b042931fceb" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa70d58bc05e560d2cc66ee66877e11e73cc4377a2dfd2a3ad583b1e28572ebe" 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 512b92bbe6..f1bf88aa43 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,12 @@ -- kubernetes image-arm64 396c8817940d592049f2fcfdeae4a264c953ea8e to bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 +- kubernetes embedded-component 396c8817940d592049f2fcfdeae4a264c953ea8e to bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 + - 1a2c0f6ba 2024-08-12T11:08:41+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs + +- machine-config-operator embedded-component 39b19d5873b5d2423c3642bf7b94d2a9848b3d6e to ea70a4a28e0661dbf3c6942322b3bcbda8e767f7 + - f5964e3c 2024-08-12T18:40:31+00:00 Revert "MCD-pull: run after network-online.target in Azure" + +- operator-framework-olm embedded-component 54c9bb9ffdf3206dcf415bb78d2d37ed5178d69b to 5cf4c77a4dceccac671d50fc4ca24d8ec645f5dc + - 021cc06b 2024-08-12T22:32:20+00:00 (fix) Resolver: list CatSrc using client, instead of referring to registry-server cache (#3349) + +- kubernetes image-amd64 396c8817940d592049f2fcfdeae4a264c953ea8e to bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 - 1a2c0f6ba 2024-08-12T11:08:41+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 8e9caac5b7..e927d9e36a 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 cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/etcd embedded-component a7005ef1eae85eec6c59411860538169cea182fd -https://github.com/openshift/kubernetes embedded-component 396c8817940d592049f2fcfdeae4a264c953ea8e +https://github.com/openshift/kubernetes embedded-component bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component 39b19d5873b5d2423c3642bf7b94d2a9848b3d6e +https://github.com/openshift/machine-config-operator embedded-component ea70a4a28e0661dbf3c6942322b3bcbda8e767f7 https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 -https://github.com/openshift/operator-framework-olm embedded-component 54c9bb9ffdf3206dcf415bb78d2d37ed5178d69b +https://github.com/openshift/operator-framework-olm embedded-component 5cf4c77a4dceccac671d50fc4ca24d8ec645f5dc https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-amd64 1e41aa3e007fc60af9edfc77be1c610205943f4a @@ -24,7 +24,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd1 https://github.com/openshift/router image-amd64 dc38fbd84dfbed3a897f2d36b469d0ccfd1ecda3 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 https://github.com/openshift/ovn-kubernetes image-amd64 4b32e36356fcd35317f71b69bc20a27ddcd77fc1 -https://github.com/openshift/kubernetes image-amd64 396c8817940d592049f2fcfdeae4a264c953ea8e +https://github.com/openshift/kubernetes image-amd64 bc3c7c5f9861b366d20e45bf5b696ed56d8e4964 https://github.com/openshift/service-ca-operator image-amd64 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-arm64 1e41aa3e007fc60af9edfc77be1c610205943f4a https://github.com/openshift/coredns image-arm64 1326282c9e158078634be4261b75ded247d233d7 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 0e775b6d09..86ba916f58 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.15.0-0.nightly-2024-08-13-134622" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-15-000745" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-08-15-210543" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-08-16-005250" diff --git a/vendor/modules.txt b/vendor/modules.txt index 41c3d5249f..d3bb59b795 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1363,7 +1363,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d +# k8s.io/api v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1420,7 +1420,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.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d +# k8s.io/apiextensions-apiserver v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1467,7 +1467,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d +# k8s.io/apimachinery v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1534,7 +1534,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d +# k8s.io/apiserver v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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-20240807041704-396c8817940d +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d +# k8s.io/client-go v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -2042,7 +2042,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d +# k8s.io/cloud-provider v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2065,14 +2065,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-20240807041704-396c8817940d +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d +# k8s.io/component-base v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2106,7 +2106,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d +# k8s.io/component-helpers v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2119,7 +2119,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d +# k8s.io/controller-manager v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2136,19 +2136,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-20240807041704-396c8817940d +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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-20240807041704-396c8817940d +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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-20240807041704-396c8817940d +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/dynamic-resource-allocation/resourceclaim -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2170,13 +2170,13 @@ k8s.io/klog/v2/internal/clock k8s.io/klog/v2/internal/dbg k8s.io/klog/v2/internal/serialize k8s.io/klog/v2/internal/severity -# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d +# k8s.io/kms v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 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.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d +# k8s.io/kube-aggregator v0.28.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2207,7 +2207,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-20240807041704-396c8817940d +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 @@ -2240,12 +2240,12 @@ 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-20240807041704-396c8817940d +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/config/v1beta3 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2280,7 +2280,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.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d +# k8s.io/kubelet v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2301,7 +2301,7 @@ k8s.io/kubelet/pkg/apis/stats/v1alpha1 k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand -# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240807041704-396c8817940d +# k8s.io/kubernetes v1.28.3 => github.com/openshift/kubernetes v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3106,7 +3106,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-20240807041704-396c8817940d +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/legacy-cloud-providers/azure k8s.io/legacy-cloud-providers/azure/auth @@ -3148,7 +3148,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-20240807041704-396c8817940d +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3163,10 +3163,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-20240807041704-396c8817940d +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d +# k8s.io/pod-security-admission v0.28.3 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 ## explicit; go 1.20 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3317,38 +3317,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/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240807041704-396c8817940d -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240807041704-396c8817940d -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240807041704-396c8817940d -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240807041704-396c8817940d -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240807041704-396c8817940d +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240813132429-bc3c7c5f9861 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240813132429-bc3c7c5f9861 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240424135504-a7005ef1eae8 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861