diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 2f1d182115..11d5f46c39 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.3 -KUBE_GIT_COMMIT=1601b9e27d8570364d9a1b94be16a0ca7b744a7e +KUBE_GIT_COMMIT=d365efdad4f566821463becaf0d5551a1a5c322f KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 8a175256ff..924c7c5b97 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-26-001623 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-26-121623 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 21dbbb7aa1..e2ae7a36bf 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-03-21-030708 +OCP_VERSION := 4.19.0-0.nightly-2025-03-26-070608 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index eae333ed17..5d598dbb95 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb + digest: sha256:95ed448743774ec9d3ba04b595a27eedd584d321e8a27783db11f3291de59142 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index bd37944f39..0df2408d9d 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05 + digest: sha256:38aa521aa0848f5a19c09c9a6d143cab63f0db8b0722ac3bb396648d7fb922b6 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3b0c01535948b9e6234f08ca5053a121b9480e3fac6e1897eb66c55a91e48a87 + digest: sha256:fe8f06d31e1a8812a133626d497d322cf25dd4fea866043a5a2689c39144831d diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 6eef63b2b7..5e71169567 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-26-001623" + "base": "4.19.0-0.nightly-arm64-2025-03-26-121623" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:750b41e57c2fbfa3ed582c01ea000e534d66c1ac3ea1410288205554de2c46fb", + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95ed448743774ec9d3ba04b595a27eedd584d321e8a27783db11f3291de59142", "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a0f91d4b23e94f2d0b2d32bf47bda7020987d4668a1b19e1bd4715e3546ee7" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 74e940f10c..46b95fc1fb 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-21-030708" + "base": "4.19.0-0.nightly-2025-03-26-070608" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51f2c63ee30f30ba87f6d3a6a345b3d2121c9d86f77f1550fa3f52387a4e1a05", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0c01535948b9e6234f08ca5053a121b9480e3fac6e1897eb66c55a91e48a87" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38aa521aa0848f5a19c09c9a6d143cab63f0db8b0722ac3bb396648d7fb922b6", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe8f06d31e1a8812a133626d497d322cf25dd4fea866043a5a2689c39144831d" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index c5ed1d0d0b..a067a59757 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:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887 + digest: sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a + digest: sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea @@ -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:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d - 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:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572 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 69a8741ce9..11d08c36ad 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-26-001623" + "base": "4.19.0-0.nightly-arm64-2025-03-26-121623" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4132023c1e9b8c905dd87b77f45d50139760eb73c9c563ae7a873af5a01679", 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 cce84127c4..a430c899e8 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-21-030708" + "base": "4.19.0-0.nightly-2025-03-26-070608" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7f604e73c6e88c1f5e3d062028931f08dc28f15f6b11b1f2ff4a23434843887", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:39657d23d56003b4f65088085e45f8fc6e14ef95f1fcaad4ba097833a21ca91a", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c8834fd9e1f968631fb05225988070f6e397391ec495a7ad4222b953ab3572", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8e5124aba15a6e5bab604245690345ecd32f01b8411330f600e043f0141907d", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 2a67d72f09..9fd88324f2 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-03-26-001623" + "base": "4.19.0-0.nightly-arm64-2025-03-26-121623" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d8c4b589090f40aa80c6c1035d2e4fd77504096cfcf6fc184e9e0ea529ae9d4", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fba8811fde9ad2f30597b2aac6083a59846010d97ef9cbe6387561e7462992d0", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fc1a08dc6e15c424adddd3725c033ac24846298ffc8176e13db1b674df32c37", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f1ed729aca82c2d32b00451a98fa68d1d4910fad968e310a50647eec8aa15b", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf218c10be35ac48a7b4dc7f7fae559cdda361e96de69a18f871ed58e28e60a7", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 127a2ab56c..66c78a7304 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.19.0-0.nightly-2025-03-21-030708" + "base": "4.19.0-0.nightly-2025-03-26-070608" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b67ad6072cfc6a6ccb0ced3595c7df91bd7eb93af8382a6a81fe24f0f6eaabe", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f8f983ff0e5f24d2a35fb475f0f3e98e1a7c74b2ea39af410e55e25fc3fc920", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:72880c00efec22b664c708f822c0911ad99ede8f0cf915696bbcb3c05ee5aa90", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd8e4e830b2c617da30666d5767803668de904c13c09e22ea9e1d1f747461a29", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3bb1e5615fb2641e20024b3a4407bd9ff35de0a1c273b4539efa7432a9bec6ea", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5598bb4202a4832e6702a662921bee1ecbc61b47d5a4d686cad64ebe46966d60", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d280326c69e7383bb352877a4004961c5ee2b8974fc815ab04ea476c492bb1fb", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6a978d5c3c939392d78361fa3913b17ee3f50e044dbc243a9d4d1a55bd91d33", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7bf5dcb06fb631fc3b8051e63219ae149396b7edd8e21b97f0315659a3d8fad", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b218d15219fabf2a83c934fa4a6bf3ce41ebbf229355216faf3d69e31512216c", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:c5f0ad26372afdd4d3e6a37fdb5cdf0c91304c0e994ec885e2db89e851081504", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a403e7e23287b4dc77ce28895e31018ac1cde5e4040c6caddcfeea1c208e51d0" diff --git a/etcd/go.mod b/etcd/go.mod index d1aac27d4a..0900080826 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -144,45 +144,45 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 6761c785fd..47cf818e78 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -162,32 +162,32 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:xny/uj7u0TWsGvQLEVN+WnheDi+/DIDpvhH5TJzYLkw= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:u90Ktpuiiu55OQNLa9ze5AXNjzMx36L9FUlV/qN+NGk= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:2jb7nf8eFobn1SV2L5d3Z0A9n11mhPLf+7wlsojfeik= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:Z/1Tk1+E2AkHNJf/8MEJ3oWPQssL3Lr9h8X3OcbkBEo= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:0sMAKVLJTpP4Og4oN8O2as9ph1f3copxUPfvi+RZ3zE= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:QQSZ5k6ne3fntjTJZADmwz2ZWHuVGKjRneB/l9vbr1w= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:WKCdvqs9USiM72tau3LZEyybDWKbyaQV0k135O3C4xw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:RIwaMAMxe8Hnn+7MOVNmOGCTY5CKJ1NOSZURyn2O2mY= -github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:sEMCH1EdYxuWsFu2PzH31jEsmeCQqTUZ7E1uSo9gpg0= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 h1:kfaz5mEtKZPKZv/775D7p7M9ghbMcdYfglSAcbckZBo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 h1:hWDkMAEkG7n7MWQwvaFbBcYOCrzcszLqt4QZnAxJF4k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 h1:FDYhbSifxW3sv14zJIlli98WI2H9jsZucA3tb5aQxm4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 h1:qkRBfXQ7YPH1ejE10oE8F6CvarIXMySiRdGbxQHi2rQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 h1:5Xz0hBQkb0z1fV11UTyIr9wcA1cmxJrnOXHudMkZsrU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 h1:SqInBPd+clyW3JpxF8M561teaiUXyb+Orv8G3fVJHu4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 h1:HwVTbBCjkjW0RC+bvLqnQ2JmqHRCvWu0BvlLHourLZo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:Q71fudTMkYSd6w+fQ039oP/lthHbyQLU+rN9k2T1sBs= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:RdijKV/FQ9NLxQr/4tG3+oJZi9ona78q1YX5OfJKk7I= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:yCup3R3frOD2IA587Mka7YMR0HAySVEuwBEqH7E+sFE= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:5SlF/W82uc0FMCTPdIw+2GMGjOSN00YZka96UG9USoY= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:0sMAKVLJTpP4Og4oN8O2as9ph1f3copxUPfvi+RZ3zE= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:6Rc7/4GsKY8m6HwgfOqwHC+yrQcWJ7e6tASm2/E1yLM= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:WKCdvqs9USiM72tau3LZEyybDWKbyaQV0k135O3C4xw= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:SfFNJ+gAQZKLD0rZ7UT2JefSJ8oVXXdiZoMSsdtXGMI= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:sEMCH1EdYxuWsFu2PzH31jEsmeCQqTUZ7E1uSo9gpg0= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 h1:bBX//H2g9AwjGW+8GHhUL+KczqPdCsEutkanAfVl0o4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 h1:oSrVZIvfi69w8WHqyak/Iu4Yd9A+GMjdNgPZqMd1y88= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 h1:YL1iIN6pu8900QaPOQcKP6h/CN+iJN8OwHRNg0R2wUI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 h1:wOSqu9ellPw/QoQNai6nq0vwiawS5tRKce029Imsi1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 h1:8JGa8e6xxZWYCjN+HuGI+LJFk7pZbydWUxCYajPZS/Y= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 h1:dnERtQpz8F+yEQSgwpBLXTX/NMJnmWWr7hbYlS7veq8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 h1:lK28diLI/PFLDS7snfBSbcwRcgmw5l7MulYMLrjKYXw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp/pipeline.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp/pipeline.go index de3b459118..1909e8cdba 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp/pipeline.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp/pipeline.go @@ -165,7 +165,7 @@ func (p *pipeline) post(data []byte) (err error) { p.picker.unreachable(u) // errMemberRemoved is a critical error since a removed member should // always be stopped. So we use reportCriticalError to report it to errorc. - if err == errMemberRemoved { + if err == errMemberRemoved || err == ErrClusterIDMismatch { reportCriticalError(err, p.errorc) } return err diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go index b022c68fb0..0eddd266ba 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/raft.go @@ -19,6 +19,7 @@ import ( "expvar" "fmt" "log" + "math/rand/v2" "sort" "sync" "time" @@ -578,7 +579,7 @@ func restartAsStandaloneNode(cfg config.ServerConfig, snapshot *raftpb.Snapshot, if snapshot != nil { walsnap.Index, walsnap.Term = snapshot.Metadata.Index, snapshot.Metadata.Term } - w, id, cid, st, ents := readWAL(cfg.Logger, cfg.WALDir(), walsnap, cfg.UnsafeNoFsync) + w, id, _, st, ents := readWAL(cfg.Logger, cfg.WALDir(), walsnap, cfg.UnsafeNoFsync) // discard the previously uncommitted entries for i, ent := range ents { @@ -604,8 +605,12 @@ func restartAsStandaloneNode(cfg config.ServerConfig, snapshot *raftpb.Snapshot, ) ents = append(ents, toAppEnts...) + cl := membership.NewCluster(cfg.Logger, membership.WithMaxLearners(cfg.ExperimentalMaxLearners)) + cid := types.ID(rand.Uint64()) + cl.SetID(id, cid) + // force commit newly appended entries - err := w.Save(raftpb.HardState{}, toAppEnts) + err := w.SaveWithMetadata(raftpb.HardState{}, toAppEnts, &pb.Metadata{NodeID: uint64(id), ClusterID: uint64(cid)}) if err != nil { cfg.Logger.Fatal("failed to save hard state and entries", zap.Error(err)) } @@ -627,8 +632,6 @@ func restartAsStandaloneNode(cfg config.ServerConfig, snapshot *raftpb.Snapshot, zap.Uint64("commit-index", st.Commit), ) - cl := membership.NewCluster(cfg.Logger, membership.WithMaxLearners(cfg.ExperimentalMaxLearners)) - cl.SetID(id, cid) s := raft.NewMemoryStorage() if snapshot != nil { s.ApplySnapshot(*snapshot) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go index 69011025fa..f315176ce2 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/wal.go @@ -27,6 +27,8 @@ import ( "sync" "time" + "go.etcd.io/etcd/api/v3/etcdserverpb" + "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3" @@ -42,6 +44,7 @@ const ( stateType crcType snapshotType + metadataModType // warnSyncDuration is the amount of time allotted to an fsync before // logging a warning @@ -62,6 +65,7 @@ var ( ErrSnapshotNotFound = errors.New("wal: snapshot not found") ErrSliceOutOfRange = errors.New("wal: slice bounds out of range") ErrDecoderNotFound = errors.New("wal: decoder not found") + ErrNoMetadata = errors.New("wal: no metadata found") crcTable = crc32.MakeTable(crc32.Castagnoli) ) @@ -471,6 +475,18 @@ func (w *WAL) ReadAll() (metadata []byte, state raftpb.HardState, ents []raftpb. } metadata = rec.Data + case metadataModType: + if metadata == nil { + state.Reset() + return nil, state, nil, ErrNoMetadata + } + + var meta, metaMod etcdserverpb.Metadata + pbutil.MustUnmarshal(&meta, metadata) + pbutil.MustUnmarshal(&metaMod, rec.Data) + meta.ClusterID = metaMod.ClusterID + metadata = pbutil.MustMarshal(&meta) + case crcType: crc := decoder.crc.Sum32() // current crc of decoder must match the crc of the record. @@ -929,12 +945,25 @@ func (w *WAL) saveState(s *raftpb.HardState) error { return w.encoder.encode(rec) } +func (w *WAL) SaveMetadata(metadata *etcdserverpb.Metadata) error { + b := pbutil.MustMarshal(metadata) + rec := &walpb.Record{Type: metadataModType, Data: b} + if err := w.encoder.encode(rec); err != nil { + return err + } + return nil +} + func (w *WAL) Save(st raftpb.HardState, ents []raftpb.Entry) error { + return w.SaveWithMetadata(st, ents, nil) +} + +func (w *WAL) SaveWithMetadata(st raftpb.HardState, ents []raftpb.Entry, metadata *etcdserverpb.Metadata) error { w.mu.Lock() defer w.mu.Unlock() // short cut, do not call sync - if raft.IsEmptyHardState(st) && len(ents) == 0 { + if metadata == nil && raft.IsEmptyHardState(st) && len(ents) == 0 { return nil } @@ -946,6 +975,13 @@ func (w *WAL) Save(st raftpb.HardState, ents []raftpb.Entry) error { return err } } + + if metadata != nil { + if err := w.SaveMetadata(metadata); err != nil { + return err + } + } + if err := w.saveState(&st); err != nil { return err } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index e220ce7a5b..7a99f158f3 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -282,7 +282,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -291,7 +291,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -304,14 +304,14 @@ go.etcd.io/etcd/client/pkg/v3/types # go.etcd.io/etcd/client/v2 v2.305.19 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.19 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/v3 v3.5.19 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/concurrency go.etcd.io/etcd/client/v3/credentials go.etcd.io/etcd/client/v3/internal/endpoint go.etcd.io/etcd/client/v3/internal/resolver -# go.etcd.io/etcd/pkg/v3 v3.5.19 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/pkg/v3 v3.5.19 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -328,14 +328,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.19 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/raft/v3 v3.5.19 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -631,7 +631,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -692,7 +692,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -754,18 +754,18 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -924,7 +924,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -961,7 +961,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1078,41 +1078,41 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5 diff --git a/go.mod b/go.mod index fbe65f8dc8..0b700134de 100644 --- a/go.mod +++ b/go.mod @@ -216,47 +216,47 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250320083338-1601b9e27d85 // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250320083338-1601b9e27d85 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250320083338-1601b9e27d85 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250325034931-d365efdad4f5 // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250325034931-d365efdad4f5 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250325034931-d365efdad4f5 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5 // staging kubernetes diff --git a/go.sum b/go.sum index 1f882fc463..048faf4b4a 100644 --- a/go.sum +++ b/go.sum @@ -255,68 +255,68 @@ github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqV github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686 h1:nGyo9X9HcK6qs6jmFKFZgzkTl0b1adD0VumMCjDXzBA= github.com/openshift/cluster-policy-controller v0.0.0-20250310152427-748524784686/go.mod h1:O5k9FNYPPYp5xt+1batZMRgfXihz26l9pGKKUfLoHJA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:xny/uj7u0TWsGvQLEVN+WnheDi+/DIDpvhH5TJzYLkw= -github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:u90Ktpuiiu55OQNLa9ze5AXNjzMx36L9FUlV/qN+NGk= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 h1:2jb7nf8eFobn1SV2L5d3Z0A9n11mhPLf+7wlsojfeik= -github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= -github.com/openshift/kubernetes v0.0.0-20250320083338-1601b9e27d85 h1:Kj6R26B6IFgcsNiRslvfRFIGlUN2ceR45k+ksbOYzL4= -github.com/openshift/kubernetes v0.0.0-20250320083338-1601b9e27d85/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:Q71fudTMkYSd6w+fQ039oP/lthHbyQLU+rN9k2T1sBs= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:QqKGViq4KTgOG43dr/uH0vmGWIaoJY3ggFi6ZH0TH/U= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:RdijKV/FQ9NLxQr/4tG3+oJZi9ona78q1YX5OfJKk7I= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:qaOi1k4ZA9lVLejXNvyPABrVEe7VymMF2433yyRQ7O0= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 h1:yCup3R3frOD2IA587Mka7YMR0HAySVEuwBEqH7E+sFE= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6/go.mod h1:FNzyinmMIl0oVsty1zA3hFeUrxXI/JpEnz4sG+POzjU= +github.com/openshift/kubernetes v0.0.0-20250325034931-d365efdad4f5 h1:zTjWyJQkHV103RtcNE/acIzwITKdhXkLzU+PViIpJvY= +github.com/openshift/kubernetes v0.0.0-20250325034931-d365efdad4f5/go.mod h1:kYKiuMo4pAcEkOTRTzAzJeogeK5+HBuvT7zGZoHleG4= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 h1:kfaz5mEtKZPKZv/775D7p7M9ghbMcdYfglSAcbckZBo= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 h1:KMW/WJPmLcGues6kP9hcOKeYzw60AyKfge54ULBl54g= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 h1:hWDkMAEkG7n7MWQwvaFbBcYOCrzcszLqt4QZnAxJF4k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 h1:FDYhbSifxW3sv14zJIlli98WI2H9jsZucA3tb5aQxm4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 h1:qkRBfXQ7YPH1ejE10oE8F6CvarIXMySiRdGbxQHi2rQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 h1:5Xz0hBQkb0z1fV11UTyIr9wcA1cmxJrnOXHudMkZsrU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 h1:EfUoujeJ9qZEhclTcWWLWa9Tyn6znKpSj4GAi37MkTU= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 h1:nQqREVSDSFkIRmuMYomi2aYpNfL7DJz5DYq/S31hNZw= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 h1:SqInBPd+clyW3JpxF8M561teaiUXyb+Orv8G3fVJHu4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 h1:3RZqHaxf0oZcgspDxCpm0ZgY+RThq7TOdnEfxJg3YoM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 h1:Cr6xFONau0MEdUSzljOJCupk/1S84aHRNlqpE04GII8= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 h1:hn5h9pOszpINf3ZUeAidC/kb+gxB02tqRnrzNRwPvXI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 h1:rezfmUGf1Sj9Lmz7Q1MsQIWcNxBNPTvrtleicSQuFXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 h1:k4eO2YBKbTeG0MySQ3b2bLLDCy1Lw7MIyxjNZfUdK5M= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 h1:omio1ScjnOTNqzMmY2ez6Qp7pmxHbD+fhfLnL15Usc0= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 h1:8KV32LBFitLmxBvqWZvqiYZUCPllP7/mjt1cseFyOKM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 h1:O7c5bEDEOa0J8RL3LufaiCMPGN3liP9izmXfwc4WyUg= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 h1:E6x1O/BZ83MhQUkJ12wr531agllCS4CpHeis2UGMVck= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 h1:O/XgqIVajX2ykcSmYCHIp0cpdXBra1LOwG468pb8xHM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 h1:UtIgNCDvqDIFrAiMPRaIOeCvhaOG8JPbLJIQ3DZ1j1o= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 h1:vMjBGugHVJS5k01poMESR7Ms2EeQtnWmHLGXEBVuHNM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 h1:HwVTbBCjkjW0RC+bvLqnQ2JmqHRCvWu0BvlLHourLZo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 h1:+pWgwTCic60tr3fiGJgnxXEXNmV/7xD2JwsxESPrBQU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 h1:vfpNhgQHNC+GbxQZzs2Ld7O8Qjues3uYPqayzczCBEs= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 h1:FZPHLQt8Lq+qND1lvXHN30BCQtx7emC0d7Imp+pYSyI= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 h1:MZcpICTeQE+wEfe19XjQj9TnTROW6+DucCV0h3T0Z9I= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 h1:bBX//H2g9AwjGW+8GHhUL+KczqPdCsEutkanAfVl0o4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 h1:0m9ujoZYrClTOeU185rdoydTG/EzOCu9I9qzEgRKWEo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 h1:oSrVZIvfi69w8WHqyak/Iu4Yd9A+GMjdNgPZqMd1y88= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 h1:YL1iIN6pu8900QaPOQcKP6h/CN+iJN8OwHRNg0R2wUI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 h1:wOSqu9ellPw/QoQNai6nq0vwiawS5tRKce029Imsi1Y= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 h1:8JGa8e6xxZWYCjN+HuGI+LJFk7pZbydWUxCYajPZS/Y= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 h1:E/brGZN/CjEpAn5Dmq+s4yroLeMGVKxTCte6E3oMR8k= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 h1:Fo0uBuTdKUJhcfDV8gjc7qhux8rJX80HmC7geQ/vKeM= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 h1:dnERtQpz8F+yEQSgwpBLXTX/NMJnmWWr7hbYlS7veq8= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 h1:lRQBZeydOzn4du0UF42tMWZnFXGJxnBQ/H8VYQ5lSwE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 h1:3UR9mYARq0yWyf6Q0klpxZD/C7y2Q0cnkoNRLo2rC24= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 h1:qRAcWODHRHawIlH3lGlHMAhMGTB8L24/O7uyv1lFzps= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 h1:8/cjgZi1+rGYf3W6gCHxyE4tmvsRaqJ6PhIbCmwwUEM= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 h1:YzSovG5OiykhgWHY9t7c390QLfEwbC7fdoU0WZZpOuo= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 h1:8KkjNKCTepSIlLW+Omnlq+eQUAiCqI0xzLKMlGl7gu4= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 h1:rAietEDiB9LROIJHVtyqv3lxQii7v93oC2FORY7oPlE= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5 h1:XTL+2OjyfCc0STaIp++hXAd6Llx+HFHxV8f24Dl6tKk= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 h1:dd+og5v9Hnin7GqXh3Q4JKjT/COaBu74JTpj3ZPnJlk= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 h1:c/bVLIHnLkxv0pOxRJct1L4uK0r+mLrPG7/j/CNs4Yg= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 h1:KBeFnHc0CVz2uG7fLIK7JNlQOXfYatlS7TxyfYv7EVQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 h1:cUUlYUmMb7yXMZg2j8M2Z4oJ50IuQxu2Esiw5O7kUKo= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 h1:lK28diLI/PFLDS7snfBSbcwRcgmw5l7MulYMLrjKYXw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 h1:nWAlRtRgl70agsTBQy/PBTrMpiIwBKe3GvRUV9DdqxI= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 h1:fzvSPM/eYBC/j5T/0MI0G2hvfZig7Z5++2tjxlyIOWs= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 h1:keRBoIsAURXElORrRXLvunTCLOInRyY/yAcAJbQPxCA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 h1:cJNP0qEbZIc0LRNCNmHPZ6KYK3ozVx20wIR+NFIHfCI= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 85c6d3b9ba..62de8c6ad7 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:d280326c69e7383bb352877a4004961c5ee2b8974fc815ab04ea476c492bb1fb" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7bf5dcb06fb631fc3b8051e63219ae149396b7edd8e21b97f0315659a3d8fad" 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 c64412981d..9a6fbcd0fa 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,69 @@ -- ovn-kubernetes image-arm64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b to 12b33c120f3240ed9df2bdfcc01d3bd0a313b3c7 +- api embedded-component 3aa9dd5b9002b370acc8ca4b4b041d682c22ca85 to 0f14a211af331fdff85df33c6112e48cb8405dd3 + - d8e63009 2025-03-25T14:40:26+00:00 Update vendor + - af37962a 2025-03-25T13:45:28+00:00 Update compatibility gen to gengo v2 + - ed97866d 2025-03-25T13:45:27+00:00 Execute updated deepcopy gen + - 1f374da4 2025-03-25T13:45:25+00:00 Update deepcopy generator to gengo v2 + - 4790b499 2025-03-24T17:06:03+01:00 feat: update insightsDataGather to v1alpha2 with GathererConfig + - 4207302a 2025-03-20T09:20:11-04:00 ability-to-add-second-logo-pt6 + - 8ada9f62 2025-03-12T17:55:45+05:30 make update + - 9e752e31 2025-03-12T17:55:23+05:30 [FeatureGate/KMSEncryptionProvider] APIServer config for AWS KMS + +- cluster-csi-snapshot-controller-operator embedded-component b1a1105065835fcd881529299bc431921f4aa156 to 7d1e842d8920df6788b92a36b7f0564cb4a49f0e + - 43315ac 2025-02-18T15:33:20+01:00 update readme link + - ff0b5f8 2025-02-18T15:21:10+01:00 remove csi-snapshot-validation-webhook image + +- cluster-ingress-operator embedded-component 924279a66d42d633d658113846d68e8d3805ec26 to 1b72b75bd12ae929dbae3ff0e71ab3bb7017c4c8 + - 95b36d0 2025-03-24T15:15:32-04:00 dns/gcp: Allow configuring custom endpoints + - 25dde98 2025-03-21T00:39:15-04:00 gatewayapi-conformance.sh: Shorten gatewayclass + - 0aeb2d3 2025-03-21T00:39:15-04:00 gatewayclass: Reconcile the oldest gatewayclass + - 8fe21cc 2025-03-21T00:39:15-04:00 gatewayapi-conformance.sh: Fix CoreDNS deployment + - cfb791d 2025-03-21T00:39:15-04:00 assertHttpRouteConnection: Increase error logging + - 7fd3169 2025-03-21T00:39:15-04:00 gatewayclass: Improve ownerReferences handling + - 01ec282 2025-03-21T00:39:15-04:00 gatewayapi-conformance.sh: Fix MaxTimeToConsistency + - 863e2ac 2025-03-21T00:39:15-04:00 Add gateway-labeler controller + - 3567b7f 2025-03-21T00:39:15-04:00 Move gatewayclass controller consts to names.go + - decc04b 2025-03-21T00:39:15-04:00 createGatewayClass: Fix get error handling + - fd4db95 2025-03-21T00:39:15-04:00 ensureCRDs: Report all served versions of the CRDs + - e48a111 2025-03-21T00:39:15-04:00 assertGatewaySuccessful: Log gateway on failure + - 2c2213b 2025-03-21T00:39:15-04:00 gatewayapi-conformance.sh: Echo clone dir + - 5c76a85 2025-03-21T00:39:15-04:00 desiredSubscription: Add "owned" annotation + - 5b17879 2025-03-21T00:39:15-04:00 Bump to OSSM 3.0 for Gateway API support + - 5c30510 2025-03-20T15:44:17+01:00 TestGatewayAPI: Remove t.Helper() from subtests + - 70d00ff 2025-03-20T15:44:17+01:00 NE-1953: Add experimental Gateway API group to Validating Admission Policy + +- etcd embedded-component 80d288f7ccb6c11128e2d697e7d26805c487150b to 2f703d6792c6f60b89f5b51d8018ba70a24d6472 + - f0cf6bb7 2025-03-12T11:04:19-04:00 add new internal wal type to track metadata changes + - 16beb959 2025-03-11T09:53:21-04:00 try failing again + - 799a807a 2025-03-07T17:24:40-05:00 revert fatal log + - a8e02927 2025-03-07T16:07:49-05:00 make sure to update metadata if we're given it + - e5527181 2025-03-07T13:20:08-05:00 add fatal log where non-recovery members are hot looping + - 176edcf3 2025-03-07T10:42:19-05:00 Try to save new cluster id to wal + - 0f0a5929 2025-03-03T08:56:29-05:00 Add time component to cluster id during --force-new-cluster + +- kubernetes embedded-component 1601b9e27d8570364d9a1b94be16a0ca7b744a7e to d365efdad4f566821463becaf0d5551a1a5c322f + - e8636393a 2025-03-21T08:42:50-03:00 UPSTREAM: : update test annotations + - de143cff7 2025-03-21T08:38:12-03:00 UPSTREAM: : annotate networking test as broken as per Jira ticket + +- machine-config-operator embedded-component fe8353e4ea7e72dfd69105069b870a37a87478ec to dadb5688c841aa042f279729d3789309325ef1fe + - 3549f569 2025-03-25T14:59:35-04:00 upgrade monitor: update not yet set default value + - d599cff2 2025-03-05T16:55:58-05:00 update (Cluster)Imagepolicy PKI config to policy.json + +- operator-framework-olm embedded-component e7c4a6900a8b47fef5bf8f5587b0088ba4a057c8 to 84b340e84ff53899465eed6ddb6d790a6297be2d + - 9c5364a8 2025-03-20T00:03:55+00:00 :seedling: Bump github.com/onsi/ginkgo/v2 from 2.22.2 to 2.23.0 (#3539) + - e2c0090a 2025-03-20T00:02:50+00:00 :seedling: Bump github.com/prometheus/common from 0.62.0 to 0.63.0 (#3542) + - 344fe18e 2025-03-20T00:02:32+00:00 :seedling: Bump github.com/containerd/containerd from 1.7.25 to 1.7.27 (#3543) + +- oc image-amd64 57018b1991282fd743495e240efe056f5f37be4a to f2c6ae49d3ba3b58e506d5948bceb3a752def432 + - 7adf7721 2025-03-25T06:22:37+08:00 Fix: Use ProxyFromEnvironment when creating HTTP transport + - 1157fa2f 2025-03-20T19:26:19+01:00 debug: suggest nsenter in addition to chroot + +- ovn-kubernetes image-amd64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b to 12b33c120f3240ed9df2bdfcc01d3bd0a313b3c7 - 9c4499b0 2025-03-20T14:51:14+01:00 Update OVN to FDP25.A.1 24.09.2-41. -- kubernetes image-arm64 1601b9e27d8570364d9a1b94be16a0ca7b744a7e to d365efdad4f566821463becaf0d5551a1a5c322f +- kubernetes image-amd64 1601b9e27d8570364d9a1b94be16a0ca7b744a7e to d365efdad4f566821463becaf0d5551a1a5c322f - e8636393a 2025-03-21T08:42:50-03:00 UPSTREAM: : update test annotations - de143cff7 2025-03-21T08:38:12-03:00 UPSTREAM: : annotate networking test as broken as per Jira ticket +- oc image-arm64 33cbfe154012e938b00420aa6c4a62e38184da99 to f2c6ae49d3ba3b58e506d5948bceb3a752def432 + - 7adf7721 2025-03-25T06:22:37+08:00 Fix: Use ProxyFromEnvironment when creating HTTP transport + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index b1c88d2c94..79371716cb 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,7 +1,7 @@ -https://github.com/openshift/api embedded-component 3aa9dd5b9002b370acc8ca4b4b041d682c22ca85 -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component b1a1105065835fcd881529299bc431921f4aa156 +https://github.com/openshift/api embedded-component 0f14a211af331fdff85df33c6112e48cb8405dd3 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 7d1e842d8920df6788b92a36b7f0564cb4a49f0e https://github.com/openshift/cluster-dns-operator embedded-component 659813065170f4e52f80b7a29bbab64bfa9aa172 -https://github.com/openshift/cluster-ingress-operator embedded-component 924279a66d42d633d658113846d68e8d3805ec26 +https://github.com/openshift/cluster-ingress-operator embedded-component 1b72b75bd12ae929dbae3ff0e71ab3bb7017c4c8 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component e41854880dcb1a9df3322c1494c93e9a9ac0babe https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 75f30cdb07d58ce71c0a247207a5d91799a48cc0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4210c04aec1c7fde8f4c294421e090ebf9248285 @@ -9,23 +9,23 @@ https://github.com/openshift/cluster-network-operator embedded-component 1daca87 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a https://github.com/openshift/cluster-policy-controller embedded-component 748524784686a5f397490563882cbfb88f9acd01 https://github.com/openshift/csi-external-snapshotter embedded-component 1fc6ee158070b34f84a94489b33accb333714727 -https://github.com/openshift/etcd embedded-component 80d288f7ccb6c11128e2d697e7d26805c487150b -https://github.com/openshift/kubernetes embedded-component 1601b9e27d8570364d9a1b94be16a0ca7b744a7e +https://github.com/openshift/etcd embedded-component 2f703d6792c6f60b89f5b51d8018ba70a24d6472 +https://github.com/openshift/kubernetes embedded-component d365efdad4f566821463becaf0d5551a1a5c322f https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component fe8353e4ea7e72dfd69105069b870a37a87478ec +https://github.com/openshift/machine-config-operator embedded-component dadb5688c841aa042f279729d3789309325ef1fe https://github.com/openshift/openshift-controller-manager embedded-component ed3eae5db73699e2b6ad0b513589e06b4bf6f5aa -https://github.com/openshift/operator-framework-olm embedded-component e7c4a6900a8b47fef5bf8f5587b0088ba4a057c8 +https://github.com/openshift/operator-framework-olm embedded-component 84b340e84ff53899465eed6ddb6d790a6297be2d https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component fdd9502ff3446725b4f1fbf6902547dba9266061 -https://github.com/openshift/oc image-amd64 57018b1991282fd743495e240efe056f5f37be4a +https://github.com/openshift/oc image-amd64 f2c6ae49d3ba3b58e506d5948bceb3a752def432 https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-amd64 1fc6ee158070b34f84a94489b33accb333714727 https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 -https://github.com/openshift/ovn-kubernetes image-amd64 66faee9937abbd9abc8e72e160c6fb2f4e606e9b -https://github.com/openshift/kubernetes image-amd64 1601b9e27d8570364d9a1b94be16a0ca7b744a7e +https://github.com/openshift/ovn-kubernetes image-amd64 12b33c120f3240ed9df2bdfcc01d3bd0a313b3c7 +https://github.com/openshift/kubernetes image-amd64 d365efdad4f566821463becaf0d5551a1a5c322f https://github.com/openshift/service-ca-operator image-amd64 fdd9502ff3446725b4f1fbf6902547dba9266061 -https://github.com/openshift/oc image-arm64 33cbfe154012e938b00420aa6c4a62e38184da99 +https://github.com/openshift/oc image-arm64 f2c6ae49d3ba3b58e506d5948bceb3a752def432 https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b34f84a94489b33accb333714727 https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index c92bdf187d..e3acc93228 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-21-030708" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-26-001623" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-03-26-070608" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-26-121623" diff --git a/vendor/modules.txt b/vendor/modules.txt index 85f6e450a2..23d90379f7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -805,7 +805,7 @@ github.com/x448/float16 # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/api/v3 v3.5.19 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -813,7 +813,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/pkg/v3 v3.5.19 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -821,7 +821,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 ## explicit; go 1.23.0 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1167,7 +1167,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1228,7 +1228,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1275,7 +1275,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1347,7 +1347,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1528,13 +1528,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1898,7 +1898,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1917,14 +1917,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1961,7 +1961,7 @@ k8s.io/component-base/version/verflag k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz k8s.io/component-base/zpages/statusz -# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1975,7 +1975,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1992,35 +1992,35 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache k8s.io/endpointslice/trafficdist k8s.io/endpointslice/util -# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/externaljwt/apis/v1alpha1 # k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 @@ -2041,13 +2041,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2080,7 +2080,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f @@ -2113,11 +2113,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2152,7 +2152,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2174,7 +2174,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2995,7 +2995,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3010,10 +3010,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 ## explicit; go 1.23.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3160,39 +3160,39 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250320083338-1601b9e27d85 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250317220800-80d288f7ccb6 -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250317220800-80d288f7ccb6 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250325034931-d365efdad4f5 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250325050633-2f703d6792c6 +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250325050633-2f703d6792c6 # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250320083338-1601b9e27d85 -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250320083338-1601b9e27d85 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250325034931-d365efdad4f5 +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250325034931-d365efdad4f5