diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 751ae84715..1cc3b794e5 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.1 -KUBE_GIT_COMMIT=44fc19fb798581a27cd21fa453a4b9ec50441bdc +KUBE_GIT_COMMIT=d0324787c86dcd13d4f16745da43b216a6787040 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index e3b36ca1f7..755e582a5b 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-19-222614 +OCP_VERSION := 4.17.0-0.nightly-arm64-2024-06-23-145411 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 62a1ad9894..5474c95783 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-06-13-010514 +OCP_VERSION := 4.17.0-0.nightly-2024-06-23-145410 diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index 9de6ce0706..2793118481 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:0780db0c13f5e18c3e10f32d6da2783888c8b44e1cc369a27576683bdbebf5f2 + digest: sha256:a65d1c102dbc2110cd2fa4545814a3899aa8a2ec98d602a077dfaf923b60296d - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1f80aa441c51e8b84b2b30d8186ecb195c6e063ca76f0f752cd6b10e88249f94 + digest: sha256:73081732331615bc4b8848e8cdebc73cd12e097d253f3289df11bf3a34118713 diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 6008f9a7ef..c788a68aad 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:b80eb27386550915e9c07a082249845d31ec1aeebc1fe1d74cd9c869f1d65f6d + digest: sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:991b2799ab9971d3388482c90fd41dfb7cb3db93c161d240c9de12c94f982d52 + digest: sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 49e25bf14a..e74c4741ba 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-06-19-222614" + "base": "4.17.0-0.nightly-arm64-2024-06-23-145411" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0780db0c13f5e18c3e10f32d6da2783888c8b44e1cc369a27576683bdbebf5f2", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f80aa441c51e8b84b2b30d8186ecb195c6e063ca76f0f752cd6b10e88249f94" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a65d1c102dbc2110cd2fa4545814a3899aa8a2ec98d602a077dfaf923b60296d", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73081732331615bc4b8848e8cdebc73cd12e097d253f3289df11bf3a34118713" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 9a14ad6051..317423ab92 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.17.0-0.nightly-2024-06-13-010514" + "base": "4.17.0-0.nightly-2024-06-23-145410" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b80eb27386550915e9c07a082249845d31ec1aeebc1fe1d74cd9c869f1d65f6d", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:991b2799ab9971d3388482c90fd41dfb7cb3db93c161d240c9de12c94f982d52" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770" } } diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml index 8cee4376b3..c55c5bc0f8 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml @@ -1027,19 +1027,15 @@ spec: SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be - run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default - value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error. - When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be - set to `legacy`. - - - In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs - with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes. + run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be + determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod + will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was + specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older + catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/' type: string - default: legacy enum: - legacy - restricted diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index de765de383..21d81d1536 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ba638074f62ffe18c54e4dafde68909e1eaa9bd6a176e287e8504c33f33c52c2 + digest: sha256:b4b4c5d0a6b1e841f041e50be6d1e37edb5a143101017d9e5ddef38079459d0c - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5b63435c9f74e3f5606500438cdbdd93b595b6fa802bf06bc46da4db2f98dbce + digest: sha256:1c69e053dc814bad642d2b6639c5d79d7e6c40c508a4719ed87d9ebcfbc35afc - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd + digest: sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b63435c9f74e3f5606500438cdbdd93b595b6fa802bf06bc46da4db2f98dbce + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c69e053dc814bad642d2b6639c5d79d7e6c40c508a4719ed87d9ebcfbc35afc - 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:ba638074f62ffe18c54e4dafde68909e1eaa9bd6a176e287e8504c33f33c52c2 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4b4c5d0a6b1e841f041e50be6d1e37edb5a143101017d9e5ddef38079459d0c target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 19ee7d0b45..0a8a838ac5 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:198ce11f5f2330c184187b4297244c137a3647977a5c428ca493858633c4317d + digest: sha256:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:357be5682b14f57aef412a7a04d990e5545c54d6b0994e946409bf2a00a22319 + digest: sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ef1e09a11f5cbe8ef83bc18c4c4a7cc56e60f46ba5a16fef50d0af508427d76f + digest: sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:357be5682b14f57aef412a7a04d990e5545c54d6b0994e946409bf2a00a22319 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504 - 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:198ce11f5f2330c184187b4297244c137a3647977a5c428ca493858633c4317d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0 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 df67d780a4..80493e1e8c 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-06-19-222614" + "base": "4.17.0-0.nightly-arm64-2024-06-23-145411" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba638074f62ffe18c54e4dafde68909e1eaa9bd6a176e287e8504c33f33c52c2", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5b63435c9f74e3f5606500438cdbdd93b595b6fa802bf06bc46da4db2f98dbce", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4b4c5d0a6b1e841f041e50be6d1e37edb5a143101017d9e5ddef38079459d0c", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c69e053dc814bad642d2b6639c5d79d7e6c40c508a4719ed87d9ebcfbc35afc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba" } } 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 e6a9700c52..41e16f7741 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.17.0-0.nightly-2024-06-13-010514" + "base": "4.17.0-0.nightly-2024-06-23-145410" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198ce11f5f2330c184187b4297244c137a3647977a5c428ca493858633c4317d", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:357be5682b14f57aef412a7a04d990e5545c54d6b0994e946409bf2a00a22319", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef1e09a11f5cbe8ef83bc18c4c4a7cc56e60f46ba5a16fef50d0af508427d76f" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index b198a99275..b55a2022e8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-06-19-222614" + "base": "4.17.0-0.nightly-arm64-2024-06-23-145411" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fcfe8fbcc246ee0ee489937fa00eaafddbf9d4743c0ee78fc75b71b3d2a8742", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:276732a7fe4dc9b219af761a17c1381071733bd58eae5d00f451f5dd270ca9f4", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ce658f45b1c0d8e3ddc925921b75fed2fbdd7d40aacceef3d5a5b5653832480", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:143f63871cb94ebe526744b8d1c910d9217c8ca7162d2dda6211ad47eb1c67cd", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:822d8f3bad3de9d3e0952011a898c14918ce2b999c75041e68cb360e7eb1c108", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f56ab46f4de90aa652b594689070bc3aff4b3a0f5ef2984f38ca406493b319e", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d94cd2f26513a3142b0b5bc17b04ce2d40db58a047a4ceb0753f21e7930374c1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8021b12fd2db530e72b36b372e4c5338056e9a42e5562ee1f6840fba0c7b67ba", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf4e23fa7131acb93484ebc3ca97e809a32135419a809039589c34b04a55e005", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1acc060a3dc9e9df31ca00703d295a94280090bbee20aae86840f2d2fe0a5d16", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58d999e9f3a80d3f7a24de3f175b1152cf79cc6e86526b9271eddab1afeb1db1", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ef113223a70ed1ef3d2fe260d07868a37a0a31d96f99e2150cc6675c5e5aadd", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0dad79eca25c92d00bf123571267885992f80885a4e47d22112e26cf0d2c8f3e", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c239885606463c7dc49f0f0b3d144007fbfa0b3ef4a58a58cd920c36d9b32e4a", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:885dbed23707b545dbd96326d3b6fb03c593ad7967736f2fa45002d084d37a0c", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6806ea72bb31bb95235d2212117686b2290cc885f99497f9d082f01591e82aa4", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37c656f2bbb84aae9a70ebf3f016f60c05755edcbc4d0f6a93f846dd6c0ba959" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0ea816d2f738e44d561295b30727857388a026cf25175770d4fc668e8963c56", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fb1800201cb821f6ec397abc67e63c105faba8c79d967ff10d0beddd4bb01fd", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:326c222e4ff6f497f83d05b5cc75e539f8333c60b8bf822fa7c7c56532bec5a8" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 9b91a13379..6462c14ed7 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,23 +1,23 @@ { "release": { - "base": "4.17.0-0.nightly-2024-06-13-010514" + "base": "4.17.0-0.nightly-2024-06-23-145410" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b9d2ddcc84e8d5f4ac46e6097bfa46b84041ea3c1fb1ff8877f16a8e8576c84b", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bd8dfe7ff8a797aa415f351aad4284b75f186f1e2f17252df0e097dbbda5123", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03b72d44046c540af70f09773296c5d3b782ddaef6c1e27a10ba60f2e8d7c612", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef1e09a11f5cbe8ef83bc18c4c4a7cc56e60f46ba5a16fef50d0af508427d76f", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07e8d95d810db091ec0c72f4afb2ee055a9f32eda8979f04a99a11da9cfd7003", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af0de476b81c85944009f585e9d0d17f1745cf204df9983369ac19f9743044b8", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b7715267733f2b8fcb7190a0456d03348b9b3bb280d6dd45bfa73846b39ed3", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7a42c3243d8ea76b0a5231bc319eededd0f7566ab7d2665ebea095771887f6f", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99f05292cfae4ccced4302f061bbbb929e7e7fbd630906e5dd214256f33fc101", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff52c8dd7df9b133377c942fb4f30f61efc32e88ff1d7ee8ba87e0179d9d4fd3", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f445e037af9a314307a6af7d7e3f0b634dcb09b9ccdbb341c0b13c9db1ab8e", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:566bf08daa0f3536090027e870383da6ac2d09ae3c9c516fb2e20dc515bff021", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40f7953f07715c04755720b8c2112be3bf079d506008ab53b7472e4a651375a8", "topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0", "topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470", "topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6", "topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111", "topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765", - "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fb3f8eee0b7b83fd6180b185fad3edd7836c6fd8c6bab4715e8417c6049bf5a", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f80c1d971bfb9c7a352d5bc301f5974fc8c0650a77b4920f38c9e830807e4fb0", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b4180d754a7e121f01a3873c5874e300d19f94136e8cf3c4a0647c4f584ecb" + "csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f16a7104e080e0b1a4e224df4c645a988534e219387ab37a6b8ab6958aa9ae2", + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d552cb424a00d65c3f08725bffb9001b2ace10ba4c10bb5484c13d78d2751ef6", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1277525b951258ad8101613b0a7f8332258fdf3b10103bc76fb1bb5f84e780f0" } } diff --git a/etcd/go.mod b/etcd/go.mod index 5c1b671013..ac25f6c092 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -100,13 +100,13 @@ require ( github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.etcd.io/bbolt v1.3.9 // indirect - go.etcd.io/etcd/api/v3 v3.5.13 - go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect - go.etcd.io/etcd/client/v2 v2.305.13 // indirect - go.etcd.io/etcd/client/v3 v3.5.13 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect - go.etcd.io/etcd/raft/v3 v3.5.13 // indirect + go.etcd.io/bbolt v1.3.10 // indirect + go.etcd.io/etcd/api/v3 v3.5.14 + go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect + go.etcd.io/etcd/client/v2 v2.305.14 // indirect + go.etcd.io/etcd/client/v3 v3.5.14 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.14 // indirect + go.etcd.io/etcd/raft/v3 v3.5.14 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 // indirect go.opentelemetry.io/otel v1.20.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect @@ -144,41 +144,41 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index a5fcbabbb3..6ec3f6805c 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -188,32 +188,32 @@ github.com/openshift/api v0.0.0-20240530053948-b01900f1982a h1:EyLN5c8dxine8V9Xa github.com/openshift/api v0.0.0-20240530053948-b01900f1982a/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs= github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:CPC1D3nY1m2aIL2LUzyWIkAfIdBiAqyvGICkucNxV0Q= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:sPFgi7snRPA+JPe9S1b2d1p9ivY0JcwdsMeNVv5BoMU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:QiMilff+WWQIr795unbVvFTDlw4sVLQWXfBUhCuUgtE= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:jng4kucY9+LW8ukF8RbmkMIAu/Ol8UhLathE5RgQV4A= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:teKs0qRUloMhGx8cUPw0vnuvmlxC8RDwdUuJivHGqDM= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:GlR/O0wJ+P3O89hVYf5Mid7+j52BHqxFLQssfQNrM50= -github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 h1:p6NiK27ICSwKnTQ1Ht1Pf0RElcQ0wAJw0plsHjLbElc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 h1:+hcsf8duVDkvAjKfWIW9+fzzQd8qAv0fHtBLNDldj/k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 h1:DBBmYRaA9in0e4qB9KH63wb6k91btxXkDGL7nY+Dtg4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 h1:UhLuIk3vkK1jnmC/2qhM4+aCXn07l1sGWsp/HhXMei4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 h1:BI92oareJYu89LFwdh5sHC2UNf4J+AHeUMNJc+R0KqU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 h1:A3EydgQTQ2iZnDZV+Nq0OluYxXD75B0BGgrXrcx7OCI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 h1:6RMLi9Wk1OL50CPTIwROztmC0gLb7lADurrVMnmPHvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:zzsNVnNTCry40xKJ4tOfsJeMN0cgmBFeSPb0j6Nig3g= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:TGRifTWFBIvYvVB/EFsa1hqunssqE+m8mJhT3iqGIx0= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:dth3HGSUg52NBfrClZuu584PNgACrrDWtTBeUhFyU+A= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:S1EvI0PLnF/ivSWZsKRoTD3aUdljqeVv0XBsqU/6z94= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:FTiX5LxVDANyfvDKXyPgf0B8qYgUFR8GQMCUVAYVkvc= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:i9O8+g5h9+10hk3bT2ocVTXRwJ2pJpNTLXLqJZqJ3Mk= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:hlets2VEeYF+XgTh3LjKq3xe574wlGuGwb+oYZDSjog= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:gAL0Hw/h7vE2UMP69wEFI2Ze5aHppyOYoHofHdYXVic= +github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d h1:iG3mzyPQQ4B98xnvBJi+hkOFDOu8JBjt5LOGJ4C2F1U= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d h1:k1q2PqvFtKgmMKFTZmB+Lb0oq3YFRsAWAIHgV+KB7fw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d h1:A30h5YO6B4LyJz61YopJliXmcbGcbdJFJdqqCwlpKlk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d h1:O/hq1RMY7fMA1c5ZDjykotYKjP007qnKvGCVFlet2PU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d h1:pqfmw3HdQ9pceULJGSQGPWXitZ0jF2UGNobizb5/+zM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d h1:hbE7QtUDO7Q/825t/7G3RTp5j53n1bq9bT9LhDduCUA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d h1:oOL8X2jNCrE7iVEzCCeCKOxHLNa/IJhwHFcqXgc7ga0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= @@ -279,10 +279,10 @@ github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8= -go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= +go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0= +go.etcd.io/bbolt v1.3.10/go.mod h1:bK3UQLPJZly7IlNmV7uVHJDxfe5aK9Ll93e/74Y9oEQ= +go.etcd.io/etcd/client/v2 v2.305.14 h1:v5ASLyFuMlVd/gKU6uf6Cod+vSWKa4Rsv9+eghl0Nwk= +go.etcd.io/etcd/client/v2 v2.305.14/go.mod h1:AWYT0lLEkBuqVaGw0UVMtA4rxCb3/oGE8PxZ8cUS4tI= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 h1:PzIubN4/sjByhDRHLviCjJuweBXWFZWhghjg7cS28+M= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0/go.mod h1:Ct6zzQEuGK3WpJs2n4dn+wfJYzd/+hNnxMRTWjGn30M= go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc= diff --git a/etcd/vendor/go.etcd.io/bbolt/.go-version b/etcd/vendor/go.etcd.io/bbolt/.go-version new file mode 100644 index 0000000000..f124bfa155 --- /dev/null +++ b/etcd/vendor/go.etcd.io/bbolt/.go-version @@ -0,0 +1 @@ +1.21.9 diff --git a/etcd/vendor/go.etcd.io/bbolt/README.md b/etcd/vendor/go.etcd.io/bbolt/README.md index 2be669a60a..495a93ef8f 100644 --- a/etcd/vendor/go.etcd.io/bbolt/README.md +++ b/etcd/vendor/go.etcd.io/bbolt/README.md @@ -421,10 +421,19 @@ Prev() Move to the previous key. ``` Each of those functions has a return signature of `(key []byte, value []byte)`. -When you have iterated to the end of the cursor then `Next()` will return a -`nil` key. You must seek to a position using `First()`, `Last()`, or `Seek()` -before calling `Next()` or `Prev()`. If you do not seek to a position then -these functions will return a `nil` key. +You must seek to a position using `First()`, `Last()`, or `Seek()` before calling +`Next()` or `Prev()`. If you do not seek to a position then these functions will +return a `nil` key. + +When you have iterated to the end of the cursor, then `Next()` will return a +`nil` key and the cursor still points to the last element if present. When you +have iterated to the beginning of the cursor, then `Prev()` will return a `nil` +key and the cursor still points to the first element if present. + +If you remove key/value pairs during iteration, the cursor may automatically +move to the next position if present in current node each time removing a key. +When you call `c.Next()` after removing a key, it may skip one key/value pair. +Refer to [pull/611](https://github.com/etcd-io/bbolt/pull/611) to get more detailed info. During iteration, if the key is non-`nil` but the value is `nil`, that means the key refers to a bucket rather than a value. Use `Bucket.Bucket()` to @@ -850,6 +859,12 @@ Here are a few things to note when evaluating and using Bolt: to grow. However, it's important to note that deleting large chunks of data will not allow you to reclaim that space on disk. +* Removing key/values pairs in a bucket during iteration on the bucket using + cursor may not work properly. Each time when removing a key/value pair, the + cursor may automatically move to the next position if present. When users + call `c.Next()` after removing a key, it may skip one key/value pair. + Refer to https://github.com/etcd-io/bbolt/pull/611 for more detailed info. + For more information on page allocation, [see this comment][page-allocation]. [page-allocation]: https://github.com/boltdb/bolt/issues/308#issuecomment-74811638 diff --git a/etcd/vendor/go.etcd.io/bbolt/cursor.go b/etcd/vendor/go.etcd.io/bbolt/cursor.go index 5dafb0cac3..bbfd92a9bc 100644 --- a/etcd/vendor/go.etcd.io/bbolt/cursor.go +++ b/etcd/vendor/go.etcd.io/bbolt/cursor.go @@ -71,7 +71,7 @@ func (c *Cursor) Last() (key []byte, value []byte) { // If this is an empty page (calling Delete may result in empty pages) // we call prev to find the last page that is not empty - for len(c.stack) > 0 && c.stack[len(c.stack)-1].count() == 0 { + for len(c.stack) > 1 && c.stack[len(c.stack)-1].count() == 0 { c.prev() } @@ -254,6 +254,15 @@ func (c *Cursor) prev() (key []byte, value []byte, flags uint32) { elem.index-- break } + // If we've hit the beginning, we should stop moving the cursor, + // and stay at the first element, so that users can continue to + // iterate over the elements in reverse direction by calling `Next`. + // We should return nil in such case. + // Refer to https://github.com/etcd-io/bbolt/issues/733 + if len(c.stack) == 1 { + c.first() + return nil, nil, 0 + } c.stack = c.stack[:i] } diff --git a/etcd/vendor/go.etcd.io/bbolt/freelist.go b/etcd/vendor/go.etcd.io/bbolt/freelist.go index 50f2d0e174..61d43f81b4 100644 --- a/etcd/vendor/go.etcd.io/bbolt/freelist.go +++ b/etcd/vendor/go.etcd.io/bbolt/freelist.go @@ -282,9 +282,8 @@ func (f *freelist) read(p *page) { if count == 0 { f.ids = nil } else { - var ids []pgid - data := unsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), unsafe.Sizeof(ids[0]), idx) - unsafeSlice(unsafe.Pointer(&ids), data, count) + data := unsafeIndex(unsafe.Pointer(p), unsafe.Sizeof(*p), unsafe.Sizeof(pgid(0)), idx) + ids := unsafe.Slice((*pgid)(data), count) // copy the ids, so we don't modify on the freelist page directly idsCopy := make([]pgid, count) @@ -322,15 +321,13 @@ func (f *freelist) write(p *page) error { p.count = uint16(l) } else if l < 0xFFFF { p.count = uint16(l) - var ids []pgid data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p)) - unsafeSlice(unsafe.Pointer(&ids), data, l) + ids := unsafe.Slice((*pgid)(data), l) f.copyall(ids) } else { p.count = 0xFFFF - var ids []pgid data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p)) - unsafeSlice(unsafe.Pointer(&ids), data, l+1) + ids := unsafe.Slice((*pgid)(data), l+1) ids[0] = pgid(l) f.copyall(ids[1:]) } diff --git a/etcd/vendor/go.etcd.io/bbolt/page.go b/etcd/vendor/go.etcd.io/bbolt/page.go index 379645c97f..bb081b031e 100644 --- a/etcd/vendor/go.etcd.io/bbolt/page.go +++ b/etcd/vendor/go.etcd.io/bbolt/page.go @@ -74,9 +74,8 @@ func (p *page) leafPageElements() []leafPageElement { if p.count == 0 { return nil } - var elems []leafPageElement data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p)) - unsafeSlice(unsafe.Pointer(&elems), data, int(p.count)) + elems := unsafe.Slice((*leafPageElement)(data), int(p.count)) return elems } @@ -91,9 +90,8 @@ func (p *page) branchPageElements() []branchPageElement { if p.count == 0 { return nil } - var elems []branchPageElement data := unsafeAdd(unsafe.Pointer(p), unsafe.Sizeof(*p)) - unsafeSlice(unsafe.Pointer(&elems), data, int(p.count)) + elems := unsafe.Slice((*branchPageElement)(data), int(p.count)) return elems } diff --git a/etcd/vendor/go.etcd.io/bbolt/unsafe.go b/etcd/vendor/go.etcd.io/bbolt/unsafe.go index c0e5037500..7745d32ce1 100644 --- a/etcd/vendor/go.etcd.io/bbolt/unsafe.go +++ b/etcd/vendor/go.etcd.io/bbolt/unsafe.go @@ -1,7 +1,6 @@ package bbolt import ( - "reflect" "unsafe" ) @@ -26,14 +25,3 @@ func unsafeByteSlice(base unsafe.Pointer, offset uintptr, i, j int) []byte { // all), so this is believed to be correct. return (*[maxAllocSize]byte)(unsafeAdd(base, offset))[i:j:j] } - -// unsafeSlice modifies the data, len, and cap of a slice variable pointed to by -// the slice parameter. This helper should be used over other direct -// manipulation of reflect.SliceHeader to prevent misuse, namely, converting -// from reflect.SliceHeader to a Go slice type. -func unsafeSlice(slice, data unsafe.Pointer, len int) { - s := (*reflect.SliceHeader)(slice) - s.Data = uintptr(data) - s.Cap = len - s.Len = len -} diff --git a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go index d20b3a0202..6b5177fc3c 100644 --- a/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/etcd/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.13" + Version = "3.5.14" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go index 8a2225b227..312d03e7a6 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/client.go @@ -86,7 +86,7 @@ func New(cfg Config) (*Client, error) { // service interface implementations and do not need connection management. func NewCtxClient(ctx context.Context, opts ...Option) *Client { cctx, cancel := context.WithCancel(ctx) - c := &Client{ctx: cctx, cancel: cancel, lgMu: new(sync.RWMutex)} + c := &Client{ctx: cctx, cancel: cancel, lgMu: new(sync.RWMutex), mu: new(sync.RWMutex)} for _, opt := range opts { opt(c) } diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go b/etcd/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go index 7dc5ddae0f..8c50dcfa93 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go @@ -19,6 +19,7 @@ package clientv3 import ( "context" + "errors" "io" "sync" "time" @@ -85,7 +86,7 @@ func (c *Client) unaryClientInterceptor(optFuncs ...retryOption) grpc.UnaryClien } continue } - if !isSafeRetry(c.lg, lastErr, callOpts) { + if !isSafeRetry(c, lastErr, callOpts) { return lastErr } } @@ -279,7 +280,7 @@ func (s *serverStreamingRetryingStream) receiveMsgAndIndicateRetry(m interface{} return true, err } - return isSafeRetry(s.client.lg, err, s.callOpts), err + return isSafeRetry(s.client, err, s.callOpts), err } func (s *serverStreamingRetryingStream) reestablishStreamAndResendBuffer(callCtx context.Context) (grpc.ClientStream, error) { @@ -319,17 +320,28 @@ func waitRetryBackoff(ctx context.Context, attempt uint, callOpts *options) erro } // isSafeRetry returns "true", if request is safe for retry with the given error. -func isSafeRetry(lg *zap.Logger, err error, callOpts *options) bool { +func isSafeRetry(c *Client, err error, callOpts *options) bool { if isContextError(err) { return false } + + // Situation when learner refuses RPC it is supposed to not serve is from the server + // perspective not retryable. + // But for backward-compatibility reasons we need to support situation that + // customer provides mix of learners (not yet voters) and voters with an + // expectation to pick voter in the next attempt. + // TODO: Ideally client should be 'aware' which endpoint represents: leader/voter/learner with high probability. + if errors.Is(err, rpctypes.ErrGPRCNotSupportedForLearner) && len(c.Endpoints()) > 1 { + return true + } + switch callOpts.retryPolicy { case repeatable: return isSafeRetryImmutableRPC(err) case nonRepeatable: return isSafeRetryMutableRPC(err) default: - lg.Warn("unrecognized retry policy", zap.String("retryPolicy", callOpts.retryPolicy.String())) + c.lg.Warn("unrecognized retry policy", zap.String("retryPolicy", callOpts.retryPolicy.String())) return false } } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go b/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go index 7dcf3bcbf0..cbcd699040 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/config/config.go @@ -187,6 +187,9 @@ type ServerConfig struct { // a shared buffer in its readonly check operations. ExperimentalTxnModeWriteWithSharedBuffer bool `json:"experimental-txn-mode-write-with-shared-buffer"` + // ExperimentalStopGRPCServiceOnDefrag enables etcd gRPC service to stop serving client requests on defragmentation. + ExperimentalStopGRPCServiceOnDefrag bool `json:"experimental-stop-grpc-service-on-defrag"` + // ExperimentalBootstrapDefragThresholdMegabytes is the minimum number of megabytes needed to be freed for etcd server to // consider running defrag during bootstrap. Needs to be set to non-zero value to take effect. ExperimentalBootstrapDefragThresholdMegabytes uint `json:"experimental-bootstrap-defrag-threshold-megabytes"` diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config.go index 1d10d1a06e..df5c0ca31d 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/config.go @@ -152,7 +152,7 @@ type Config struct { // follower to catch up. // WARNING: only change this for tests. // Always use "DefaultSnapshotCatchUpEntries" - SnapshotCatchUpEntries uint64 + SnapshotCatchUpEntries uint64 `json:"experimental-snapshot-catch-up-entries"` MaxSnapFiles uint `json:"max-snapshots"` MaxWalFiles uint `json:"max-wals"` @@ -417,6 +417,9 @@ type Config struct { // ExperimentalTxnModeWriteWithSharedBuffer enables write transaction to use a shared buffer in its readonly check operations. ExperimentalTxnModeWriteWithSharedBuffer bool `json:"experimental-txn-mode-write-with-shared-buffer"` + // ExperimentalStopGRPCServiceOnDefrag enables etcd gRPC service to stop serving client requests on defragmentation. + ExperimentalStopGRPCServiceOnDefrag bool `json:"experimental-stop-grpc-service-on-defrag"` + // V2Deprecation describes phase of API & Storage V2 support V2Deprecation config.V2DeprecationEnum `json:"v2-deprecation"` } @@ -443,13 +446,15 @@ type configJSON struct { } type securityConfig struct { - CertFile string `json:"cert-file"` - KeyFile string `json:"key-file"` - ClientCertFile string `json:"client-cert-file"` - ClientKeyFile string `json:"client-key-file"` - CertAuth bool `json:"client-cert-auth"` - TrustedCAFile string `json:"trusted-ca-file"` - AutoTLS bool `json:"auto-tls"` + CertFile string `json:"cert-file"` + KeyFile string `json:"key-file"` + ClientCertFile string `json:"client-cert-file"` + ClientKeyFile string `json:"client-key-file"` + CertAuth bool `json:"client-cert-auth"` + TrustedCAFile string `json:"trusted-ca-file"` + AutoTLS bool `json:"auto-tls"` + AllowedCN string `json:"allowed-cn"` + AllowedHostname string `json:"allowed-hostname"` } // NewConfig creates a new Config populated with default values. @@ -519,6 +524,7 @@ func NewConfig() *Config { ExperimentalMemoryMlock: false, ExperimentalTxnModeWriteWithSharedBuffer: true, ExperimentalMaxLearners: membership.DefaultMaxLearners, + ExperimentalStopGRPCServiceOnDefrag: false, ExperimentalCompactHashCheckEnabled: false, ExperimentalCompactHashCheckTime: time.Minute, @@ -629,6 +635,8 @@ func (cfg *configYAML) configFromFile(path string) error { tls.ClientKeyFile = ysc.ClientKeyFile tls.ClientCertAuth = ysc.CertAuth tls.TrustedCAFile = ysc.TrustedCAFile + tls.AllowedCN = ysc.AllowedCN + tls.AllowedHostname = ysc.AllowedHostname } copySecurityDetails(&cfg.ClientTLSInfo, &cfg.ClientSecurityJSON) copySecurityDetails(&cfg.PeerTLSInfo, &cfg.PeerSecurityJSON) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go index 7176d56ab6..5645b5fb2c 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/etcd.go @@ -222,6 +222,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) { WarningApplyDuration: cfg.ExperimentalWarningApplyDuration, ExperimentalMemoryMlock: cfg.ExperimentalMemoryMlock, ExperimentalTxnModeWriteWithSharedBuffer: cfg.ExperimentalTxnModeWriteWithSharedBuffer, + ExperimentalStopGRPCServiceOnDefrag: cfg.ExperimentalStopGRPCServiceOnDefrag, ExperimentalBootstrapDefragThresholdMegabytes: cfg.ExperimentalBootstrapDefragThresholdMegabytes, ExperimentalMaxLearners: cfg.ExperimentalMaxLearners, V2Deprecation: cfg.V2DeprecationEffective(), diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3client/v3client.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3client/v3client.go index 8342dc434c..de0da81afb 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3client/v3client.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3client/v3client.go @@ -39,7 +39,7 @@ func New(s *etcdserver.EtcdServer) *clientv3.Client { wc := adapter.WatchServerToWatchClient(v3rpc.NewWatchServer(s)) c.Watcher = &watchWrapper{clientv3.NewWatchFromWatchClient(wc, c)} - mc := adapter.MaintenanceServerToMaintenanceClient(v3rpc.NewMaintenanceServer(s)) + mc := adapter.MaintenanceServerToMaintenanceClient(v3rpc.NewMaintenanceServer(s, nil)) c.Maintenance = clientv3.NewMaintenanceFromMaintenanceClient(mc, c) clc := adapter.ClusterServerToClusterClient(v3rpc.NewClusterServer(s)) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/grpc.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/grpc.go index 349ebea400..6947903a38 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/grpc.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/grpc.go @@ -76,13 +76,10 @@ func Server(s *etcdserver.EtcdServer, tls *tls.Config, interceptor grpc.UnarySer pb.RegisterLeaseServer(grpcServer, NewQuotaLeaseServer(s)) pb.RegisterClusterServer(grpcServer, NewClusterServer(s)) pb.RegisterAuthServer(grpcServer, NewAuthServer(s)) - pb.RegisterMaintenanceServer(grpcServer, NewMaintenanceServer(s)) - // server should register all the services manually - // use empty service name for all etcd services' health status, - // see https://github.com/grpc/grpc/blob/master/doc/health-checking.md for more hsrv := health.NewServer() - hsrv.SetServingStatus("", healthpb.HealthCheckResponse_SERVING) + healthNotifier := newHealthNotifier(hsrv, s) + pb.RegisterMaintenanceServer(grpcServer, NewMaintenanceServer(s, healthNotifier)) healthpb.RegisterHealthServer(grpcServer, hsrv) // set zero values for metrics registered for this grpc server diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/health.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/health.go new file mode 100644 index 0000000000..f58396d1c3 --- /dev/null +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/health.go @@ -0,0 +1,77 @@ +// Copyright 2023 The etcd Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package v3rpc + +import ( + "go.etcd.io/etcd/server/v3/etcdserver" + "go.uber.org/zap" + "google.golang.org/grpc/health" + healthpb "google.golang.org/grpc/health/grpc_health_v1" +) + +const ( + allGRPCServices = "" +) + +type notifier interface { + defragStarted() + defragFinished() +} + +func newHealthNotifier(hs *health.Server, s *etcdserver.EtcdServer) notifier { + if hs == nil { + panic("unexpected nil gRPC health server") + } + hc := &healthNotifier{hs: hs, lg: s.Logger(), stopGRPCServiceOnDefrag: s.Cfg.ExperimentalStopGRPCServiceOnDefrag} + // set grpc health server as serving status blindly since + // the grpc server will serve iff s.ReadyNotify() is closed. + hc.startServe() + return hc +} + +type healthNotifier struct { + hs *health.Server + lg *zap.Logger + + stopGRPCServiceOnDefrag bool +} + +func (hc *healthNotifier) defragStarted() { + if !hc.stopGRPCServiceOnDefrag { + return + } + hc.stopServe("defrag is active") +} + +func (hc *healthNotifier) defragFinished() { hc.startServe() } + +func (hc *healthNotifier) startServe() { + hc.lg.Info( + "grpc service status changed", + zap.String("service", allGRPCServices), + zap.String("status", healthpb.HealthCheckResponse_SERVING.String()), + ) + hc.hs.SetServingStatus(allGRPCServices, healthpb.HealthCheckResponse_SERVING) +} + +func (hc *healthNotifier) stopServe(reason string) { + hc.lg.Warn( + "grpc service status changed", + zap.String("service", allGRPCServices), + zap.String("status", healthpb.HealthCheckResponse_NOT_SERVING.String()), + zap.String("reason", reason), + ) + hc.hs.SetServingStatus(allGRPCServices, healthpb.HealthCheckResponse_NOT_SERVING) +} diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/maintenance.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/maintenance.go index 42f8b0da2e..7db17e1a00 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/maintenance.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/api/v3rpc/maintenance.go @@ -76,10 +76,12 @@ type maintenanceServer struct { hdr header cs ClusterStatusGetter d Downgrader + + healthNotifier notifier } -func NewMaintenanceServer(s *etcdserver.EtcdServer) pb.MaintenanceServer { - srv := &maintenanceServer{lg: s.Cfg.Logger, rg: s, hasher: s.KV().HashStorage(), kg: s, bg: s, a: s, lt: s, hdr: newHeader(s), cs: s, d: s} +func NewMaintenanceServer(s *etcdserver.EtcdServer, healthNotifier notifier) pb.MaintenanceServer { + srv := &maintenanceServer{lg: s.Cfg.Logger, rg: s, hasher: s.KV().HashStorage(), kg: s, bg: s, a: s, lt: s, hdr: newHeader(s), cs: s, d: s, healthNotifier: healthNotifier} if srv.lg == nil { srv.lg = zap.NewNop() } @@ -88,6 +90,8 @@ func NewMaintenanceServer(s *etcdserver.EtcdServer) pb.MaintenanceServer { func (ms *maintenanceServer) Defragment(ctx context.Context, sr *pb.DefragmentRequest) (*pb.DefragmentResponse, error) { ms.lg.Info("starting defragment") + ms.healthNotifier.defragStarted() + defer ms.healthNotifier.defragFinished() err := ms.bg.Backend().Defrag() if err != nil { ms.lg.Warn("failed to defragment", zap.Error(err)) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go index aca92dd8e4..80dee105c6 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go @@ -1000,6 +1000,14 @@ func (s *EtcdServer) Process(ctx context.Context, m raftpb.Message) error { ) return httptypes.NewHTTPError(http.StatusForbidden, "cannot process message from removed member") } + if s.ID() != types.ID(m.To) { + lg.Warn( + "rejected Raft message to mismatch member", + zap.String("local-member-id", s.ID().String()), + zap.String("mismatch-member-id", types.ID(m.To).String()), + ) + return httptypes.NewHTTPError(http.StatusForbidden, "cannot process message to mismatch member") + } if m.Type == raftpb.MsgApp { s.stats.RecvAppendReq(types.ID(m.From).String(), m.Size()) } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go index b6e7a80679..a9e1f3586a 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/etcdserver/v3_server.go @@ -377,6 +377,9 @@ func (s *EtcdServer) leaseTimeToLive(ctx context.Context, r *pb.LeaseTimeToLiveR if err := s.waitAppliedIndex(); err != nil { return nil, err } + + // gofail: var beforeLookupWhenLeaseTimeToLive struct{} + // primary; timetolive directly from leader le := s.lessor.Lookup(lease.LeaseID(r.ID)) if le == nil { @@ -392,6 +395,15 @@ func (s *EtcdServer) leaseTimeToLive(ctx context.Context, r *pb.LeaseTimeToLiveR } resp.Keys = kbs } + + // The leasor could be demoted if leader changed during lookup. + // We should return error to force retry instead of returning + // incorrect remaining TTL. + if le.Demoted() { + // NOTE: lease.ErrNotPrimary is not retryable error for + // client. Instead, uses ErrLeaderChanged. + return nil, ErrLeaderChanged + } return resp, nil } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/leasehttp/http.go b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/leasehttp/http.go index 1b9390d97f..9c815cbaec 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/leasehttp/http.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/leasehttp/http.go @@ -103,6 +103,9 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { http.Error(w, ErrLeaseHTTPTimeout.Error(), http.StatusRequestTimeout) return } + + // gofail: var beforeLookupWhenForwardLeaseTimeToLive struct{} + l := h.l.Lookup(lease.LeaseID(lreq.LeaseTimeToLiveRequest.ID)) if l == nil { http.Error(w, lease.ErrLeaseNotFound.Error(), http.StatusNotFound) @@ -126,6 +129,14 @@ func (h *leaseHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { resp.LeaseTimeToLiveResponse.Keys = kbs } + // The leasor could be demoted if leader changed during lookup. + // We should return error to force retry instead of returning + // incorrect remaining TTL. + if l.Demoted() { + http.Error(w, lease.ErrNotPrimary.Error(), http.StatusInternalServerError) + return + } + v, err = resp.Marshal() if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go index abeeb09bf4..e0c2273dfc 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/lease/lessor.go @@ -900,6 +900,13 @@ func (l *Lease) forever() { l.expiry = forever } +// Demoted returns true if the lease's expiry has been reset to forever. +func (l *Lease) Demoted() bool { + l.expiryMu.Lock() + defer l.expiryMu.Unlock() + return l.expiry == forever +} + // Keys returns all the keys attached to the lease. func (l *Lease) Keys() []string { l.mu.RLock() diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/backend.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/backend.go index f156ae9948..7d77da12fd 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/backend.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/backend/backend.go @@ -36,10 +36,10 @@ var ( defragLimit = 10000 - // initialMmapSize is the initial size of the mmapped region. Setting this larger than + // InitialMmapSize is the initial size of the mmapped region. Setting this larger than // the potential max db size can prevent writer from blocking reader. // This only works for linux. - initialMmapSize = uint64(10 * 1024 * 1024 * 1024) + InitialMmapSize = uint64(10 * 1024 * 1024 * 1024) // minSnapshotWarningTimeout is the minimum threshold to trigger a long running snapshot warning. minSnapshotWarningTimeout = 30 * time.Second @@ -151,11 +151,13 @@ type BackendConfig struct { Hooks Hooks } +type BackendConfigOption func(*BackendConfig) + func DefaultBackendConfig() BackendConfig { return BackendConfig{ BatchInterval: defaultBatchInterval, BatchLimit: defaultBatchLimit, - MmapSize: initialMmapSize, + MmapSize: InitialMmapSize, } } @@ -163,9 +165,19 @@ func New(bcfg BackendConfig) Backend { return newBackend(bcfg) } -func NewDefaultBackend(path string) Backend { +func WithMmapSize(size uint64) BackendConfigOption { + return func(bcfg *BackendConfig) { + bcfg.MmapSize = size + } +} + +func NewDefaultBackend(path string, opts ...BackendConfigOption) Backend { bcfg := DefaultBackendConfig() bcfg.Path = path + for _, opt := range opts { + opt(&bcfg) + } + return newBackend(bcfg) } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore.go index e1f74760ed..828d81549a 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore.go @@ -237,7 +237,7 @@ func (s *store) checkPrevCompactionCompleted() bool { return scheduledCompact == finishedCompact && scheduledCompactFound == finishedCompactFound } -func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevCompactionCompleted bool) (<-chan struct{}, error) { +func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevCompactionCompleted bool) <-chan struct{} { ch := make(chan struct{}) var j = func(ctx context.Context) { if ctx.Err() != nil { @@ -262,7 +262,7 @@ func (s *store) compact(trace *traceutil.Trace, rev, prevCompactRev int64, prevC s.fifoSched.Schedule(j) trace.Step("schedule compaction") - return ch, nil + return ch } func (s *store) compactLockfree(rev int64) (<-chan struct{}, error) { @@ -272,7 +272,7 @@ func (s *store) compactLockfree(rev int64) (<-chan struct{}, error) { return ch, err } - return s.compact(traceutil.TODO(), rev, prevCompactRev, prevCompactionCompleted) + return s.compact(traceutil.TODO(), rev, prevCompactRev, prevCompactionCompleted), nil } func (s *store) Compact(trace *traceutil.Trace, rev int64) (<-chan struct{}, error) { @@ -287,7 +287,7 @@ func (s *store) Compact(trace *traceutil.Trace, rev int64) (<-chan struct{}, err } s.mu.Unlock() - return s.compact(trace, rev, prevCompactRev, prevCompactionCompleted) + return s.compact(trace, rev, prevCompactRev, prevCompactionCompleted), nil } func (s *store) Commit() { @@ -380,6 +380,17 @@ func (s *store) restore() error { if s.currentRev < s.compactMainRev { s.currentRev = s.compactMainRev } + + // If the latest revision was a tombstone revision and etcd just compacted + // it, but crashed right before persisting the FinishedCompactRevision, + // then it would lead to revision decreasing in bbolt db file. In such + // a scenario, we should adjust the current revision using the scheduled + // compact revision on bootstrap when etcd gets started again. + // + // See https://github.com/etcd-io/etcd/issues/17780#issuecomment-2061900231 + if s.currentRev < scheduledCompact { + s.currentRev = scheduledCompact + } s.revMu.Unlock() } @@ -408,15 +419,18 @@ func (s *store) restore() error { if scheduledCompact != 0 { if _, err := s.compactLockfree(scheduledCompact); err != nil { - s.lg.Warn("compaction encountered error", zap.Error(err)) + s.lg.Warn("compaction encountered error", + zap.Int64("scheduled-compact-revision", scheduledCompact), + zap.Error(err), + ) + } else { + s.lg.Info( + "resume scheduled compaction", + zap.Stringer("meta-bucket-name", buckets.Meta), + zap.String("meta-bucket-name-key", string(scheduledCompactKeyName)), + zap.Int64("scheduled-compact-revision", scheduledCompact), + ) } - - s.lg.Info( - "resume scheduled compaction", - zap.Stringer("meta-bucket-name", buckets.Meta), - zap.String("meta-bucket-name-key", string(scheduledCompactKeyName)), - zap.Int64("scheduled-compact-revision", scheduledCompact), - ) } return nil diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go index c7d343d5c3..89defbd9e7 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/kvstore_compaction.go @@ -59,6 +59,7 @@ func (s *store) scheduleCompaction(compactMainRev, prevCompactRev int64) (KeyVal } if len(keys) < s.cfg.CompactionBatchLimit { + // gofail: var compactBeforeSetFinishedCompact struct{} rbytes := make([]byte, 8+1+8) revToBytes(revision{main: compactMainRev}, rbytes) tx.UnsafePut(buckets.Meta, finishedCompactKeyName, rbytes) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/encoder.go b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/encoder.go index 61b4c20efb..2642e156c8 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/encoder.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/encoder.go @@ -20,6 +20,7 @@ import ( "io" "os" "sync" + "time" "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/ioutil" @@ -84,17 +85,9 @@ func (e *encoder) encode(rec *walpb.Record) error { data = e.buf[:n] } - lenField, padBytes := encodeFrameSize(len(data)) - if err = writeUint64(e.bw, lenField, e.uint64buf); err != nil { - return err - } + data, lenField := prepareDataWithPadding(data) - if padBytes != 0 { - data = append(data, make([]byte, padBytes)...) - } - n, err = e.bw.Write(data) - walWriteBytes.Add(float64(n)) - return err + return write(e.bw, e.uint64buf, data, lenField) } func encodeFrameSize(dataBytes int) (lenField uint64, padBytes int) { @@ -115,10 +108,28 @@ func (e *encoder) flush() error { return err } -func writeUint64(w io.Writer, n uint64, buf []byte) error { - // http://golang.org/src/encoding/binary/binary.go - binary.LittleEndian.PutUint64(buf, n) - nv, err := w.Write(buf) +func prepareDataWithPadding(data []byte) ([]byte, uint64) { + lenField, padBytes := encodeFrameSize(len(data)) + if padBytes != 0 { + data = append(data, make([]byte, padBytes)...) + } + return data, lenField +} + +func write(w io.Writer, uint64buf, data []byte, lenField uint64) error { + // write padding info + binary.LittleEndian.PutUint64(uint64buf, lenField) + + start := time.Now() + nv, err := w.Write(uint64buf) walWriteBytes.Add(float64(nv)) + if err != nil { + return err + } + + // write the record with padding + n, err := w.Write(data) + walWriteSec.Observe(time.Since(start).Seconds()) + walWriteBytes.Add(float64(n)) return err } diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/metrics.go b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/metrics.go index 814d654cdd..65e3c34a7b 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/wal/metrics.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/wal/metrics.go @@ -28,6 +28,15 @@ var ( Buckets: prometheus.ExponentialBuckets(0.001, 2, 14), }) + walWriteSec = prometheus.NewHistogram(prometheus.HistogramOpts{ + Namespace: "etcd", + Subsystem: "disk", + Name: "wal_write_duration_seconds", + Help: "The latency distributions of write called by WAL.", + + Buckets: prometheus.ExponentialBuckets(0.001, 2, 14), + }) + walWriteBytes = prometheus.NewGauge(prometheus.GaugeOpts{ Namespace: "etcd", Subsystem: "disk", diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 6752d0549b..2cdc454ef9 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -267,10 +267,10 @@ github.com/xiang90/probing # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/bbolt v1.3.9 -## explicit; go 1.17 +# go.etcd.io/bbolt v1.3.10 +## explicit; go 1.21 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -279,7 +279,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.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -289,17 +289,17 @@ 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/v2 v2.305.13 +# go.etcd.io/etcd/client/v2 v2.305.14 ## explicit; go 1.21 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.13 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/client/v3 v3.5.14 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 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.13 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/pkg/v3 v3.5.14 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -316,14 +316,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.13 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/raft/v3 v3.5.14 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 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.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/server/v3 v3.5.10 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -677,7 +677,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -733,17 +733,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -892,7 +892,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -929,7 +929,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-20240606123447-44fc19fb7985 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1050,39 +1050,39 @@ sigs.k8s.io/yaml # 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.20240314173009-2cd07f4ca53d -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d diff --git a/go.mod b/go.mod index a4ca1fecce..3534f8351f 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/vishvananda/netlink v1.1.0 - go.etcd.io/etcd/client/pkg/v3 v3.5.13 + go.etcd.io/etcd/client/pkg/v3 v3.5.14 go.etcd.io/etcd/client/v3 v3.5.10 golang.org/x/sys v0.18.0 gopkg.in/yaml.v3 v3.0.1 @@ -157,7 +157,7 @@ require ( github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/vishvananda/netns v0.0.4 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.13 // indirect + go.etcd.io/etcd/api/v3 v3.5.14 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect @@ -219,44 +219,44 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240606123447-44fc19fb7985 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240606123447-44fc19fb7985 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240606123447-44fc19fb7985 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 // 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-20240606123447-44fc19fb7985 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d // staging kubernetes diff --git a/go.sum b/go.sum index 7b3d46b7e9..b1f00bac5c 100644 --- a/go.sum +++ b/go.sum @@ -461,66 +461,66 @@ github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 h1:JtLhaGpSEco github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87/go.mod h1:3IPD4U0qyovZS4EFady2kqY32m8lGcbs/Wx+yprg9z8= github.com/openshift/cluster-policy-controller v0.0.0-20240604062218-c502ece1b8bd h1:KUji/55xEo527H11bkoN/saLXf9LVQfu2uP6z9TuSmY= github.com/openshift/cluster-policy-controller v0.0.0-20240604062218-c502ece1b8bd/go.mod h1:kcmuMziFH9/IdFAZwbBwO49c4Dspy+hsvHeV2nC3b4A= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:CPC1D3nY1m2aIL2LUzyWIkAfIdBiAqyvGICkucNxV0Q= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:sPFgi7snRPA+JPe9S1b2d1p9ivY0JcwdsMeNVv5BoMU= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b h1:QiMilff+WWQIr795unbVvFTDlw4sVLQWXfBUhCuUgtE= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= -github.com/openshift/kubernetes v0.0.0-20240606123447-44fc19fb7985 h1:aGgeTGe8iA9oltABvf3fx4GGC0mH+ohqL8mqko/ZsNQ= -github.com/openshift/kubernetes v0.0.0-20240606123447-44fc19fb7985/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:zzsNVnNTCry40xKJ4tOfsJeMN0cgmBFeSPb0j6Nig3g= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:TGRifTWFBIvYvVB/EFsa1hqunssqE+m8mJhT3iqGIx0= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:dth3HGSUg52NBfrClZuu584PNgACrrDWtTBeUhFyU+A= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= +github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d h1:QHiqhfLia95bhESQidjfnuFDmdH9amaAard802LkSh4= +github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d/go.mod h1:O7LoefGxDBYnVI/vFe3RlR9DP04xbaQxrConIGfj+Bc= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 h1:Eq3Ql8dFdv5hvkxKGTxxLb22xcin771AvZj+24HlCI0= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 h1:p6NiK27ICSwKnTQ1Ht1Pf0RElcQ0wAJw0plsHjLbElc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 h1:bI+JnIZIov1OvlSRIAKZOjtcU8vqqcLfH4UTnibn39w= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 h1:+hcsf8duVDkvAjKfWIW9+fzzQd8qAv0fHtBLNDldj/k= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 h1:DBBmYRaA9in0e4qB9KH63wb6k91btxXkDGL7nY+Dtg4= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 h1:UhLuIk3vkK1jnmC/2qhM4+aCXn07l1sGWsp/HhXMei4= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 h1:BI92oareJYu89LFwdh5sHC2UNf4J+AHeUMNJc+R0KqU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 h1:bHfH3i9BWhJNOi6ncESKfTgVblY35IZpEyj0AlXaz/c= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985 h1:FFNKbT0optyyhHpB5+PNIBOikI2ZcQaTp7kHFge5gmE= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 h1:A3EydgQTQ2iZnDZV+Nq0OluYxXD75B0BGgrXrcx7OCI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 h1:ALQcAuFAQioUmt2L8UkCHdn9gATve8ge0fuOpInnrds= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 h1:2/bg0pSKxt9erFdbpG1NH0EZzgtjIuz6RxFxG2+kceI= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985 h1:QlgulfTC8XtG4XfHi0XFKL1GmLUCXlZhp0QQUYWtPJ0= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 h1:SYvgBT8Gc4CcGCKogb1iD35hJv8cio0rOLegRPlG8XE= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985 h1:A+vcl1E/WeLSNRv0KCCNwtNx0UrV+hL3XPV2eXX+XGw= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985 h1:N5kB/w5mz9O8I37Dlp4yuyZso+ym609Ymj8JV9C2IX4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 h1:61Z4dUpPh2uQORXSaXDymyvSGEsZ7jlz+O+CAUXP8Vw= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 h1:WK/tO6Njbtyy024+oJ4ujIhKy1IWelOFoGp9Rk81yUI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 h1:sjiu4lbzyqyTTGDv87LF08D8YLrwmRQN35RMORxBNug= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985 h1:6oSSPTwgB4ZUIeO/jUnzw0m7beRP76hdvJVzzUdRZxs= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 h1:6RMLi9Wk1OL50CPTIwROztmC0gLb7lADurrVMnmPHvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985 h1:RZw0m9V6MVF735grsr7BQvD8g+3SCD52olsyu0oAl2w= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 h1:hZnNr6O6P01oXhUPVWVfoTLUrENYA2c1x1LRepJOofY= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 h1:X8M9KRKYevciF1hTjOSfSALTZnppm3Mu5hJlJBwYWSw= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985 h1:eKgpM1rU0SJCtP7lMtEUXV3puWIp71g+K9pJqO5MQrs= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 h1:4vx9oX5GO1aBznyyEHicqIll6KfvEmwIY4vSMNOFFYo= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d h1:iG3mzyPQQ4B98xnvBJi+hkOFDOu8JBjt5LOGJ4C2F1U= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d/go.mod h1:rJDw35BTBuoND6Zb2mW6xI6ZBECNPnNFlv/pBcV/6+E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d h1:wfzfg25LxVeJwk6DHWzIjpuf/VNMWLr1eZHEwdoEf9Q= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:RmYPUiJqNMGLsK3uUyCyJNEyKDxwsMms0yBJf81tdf4= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d h1:k1q2PqvFtKgmMKFTZmB+Lb0oq3YFRsAWAIHgV+KB7fw= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d h1:A30h5YO6B4LyJz61YopJliXmcbGcbdJFJdqqCwlpKlk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d/go.mod h1:QQdpJKZfazwRWadtIlZnvrL6IgohPT0Ivl62y2fJTsk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d h1:O/hq1RMY7fMA1c5ZDjykotYKjP007qnKvGCVFlet2PU= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d h1:pqfmw3HdQ9pceULJGSQGPWXitZ0jF2UGNobizb5/+zM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d h1:nNJgxSdpAwqh/HomlOdyTo6O8LOe5q9iUbF0WG+y+4s= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d h1:I1D1lSVWqFa5ZibpCI+I6TLUGl4wgK4YF8mR8QojFZw= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d h1:hbE7QtUDO7Q/825t/7G3RTp5j53n1bq9bT9LhDduCUA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d/go.mod h1:Ey4tC7jpNEBgS+7YUJ8C9NLojn0gtY6R73q/j4Q3Ei4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d h1:1EHpeoSFpFjRalIx0EfOAjDiievSoJOiL39TSl75Kms= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d/go.mod h1:/GpbeW3TMwFJvxadjFJ1h6Z2BHYIGw8iQpySGTy3Yo0= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d h1:iIlu22abHE+AD9H18+emMFtLAincK33Vr3tytT/bLI0= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d h1:1BWrGJH4WxnVf4vfAzwq3iUxIT/jhhdgoZQUE7t1nQI= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d h1:qtDyiOXq0+4XokoEG9QSbWKhUHvQCX6sDlEuc/5BNLY= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d h1:XQPFaNWSSRaKpxX84jKKkEGAZNs1gvlFHm7HcVnzmTA= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d h1:l52lS9KBxE/28E/y21NCwMlXafCzVlSgeueJFDMrRFM= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d h1:o57Xt+HOpJhDtm2N7rlz+fr4NZpNty8ZhPAR/4TlFVA= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d h1:mUvC5Bh7zoe9lDGqeyxS2l0luFcBQWTm7kyw4S9ZkC4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d/go.mod h1:hLpnLX3MoPYx4fxUmhCY1QBdGgAWWZqCBWpiZcnQvDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d h1:JeNrCorD42EVrC6XirtiXQ6MSYN4sgc1kpZSMf9GwEA= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d h1:BGqfT/7J3ah4Wd1wHioiGhmWDJXb16mKi3tVSyNUiow= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d h1:oOL8X2jNCrE7iVEzCCeCKOxHLNa/IJhwHFcqXgc7ga0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d h1:7Vmy8zNEXUOl/99SZHatipmhHzN0arcwEtJ1JOHA3YE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d h1:4SkVJMTCc2xJMypSvmQS7rzELaqSIrOCoKzBMrh4xBU= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d h1:h5Pg7NcC/cm0w3G1XTQ1uahVl8kUriVAqXBOjcnKo48= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d h1:ciqASem8kqk5C37emywMDM/YZr7kM6/ajIERGYJ6phA= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d h1:bRjMHnUjkKBKvBI4koRPshF2LSGohvinHLeqt/xQD0k= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index e0ea863377..55664dd65c 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:99f05292cfae4ccced4302f061bbbb929e7e7fbd630906e5dd214256f33fc101" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:566bf08daa0f3536090027e870383da6ac2d09ae3c9c516fb2e20dc515bff021" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index a1a26c841f..b3f77be9af 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -25,6 +25,6 @@ plugin_dirs = [ # for community builds on top of OKD, this setting has no effect [crio.image] global_auth_file="/etc/crio/openshift-pull-secret" -pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1acc060a3dc9e9df31ca00703d295a94280090bbee20aae86840f2d2fe0a5d16" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0dad79eca25c92d00bf123571267885992f80885a4e47d22112e26cf0d2c8f3e" 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 e69de29bb2..447f21c243 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -0,0 +1,228 @@ +- api embedded-component 5c2b46e4709a950e98cda1f3733f9a46cd9737cd to 987b8890c273cdcc262028806fa85ae5ab3ed92f + - 7dd065a 2024-06-18T16:38:24+02:00 NO-JIRA: remove beta enabled features from feature gates + - 7932d7b 2024-06-17T17:42:27-04:00 generated + - fc3f569 2024-06-17T17:42:27-04:00 close featureset hole + - 14a7205 2024-06-10T23:10:53+05:30 CFE-1063: Add PlacementGroupPartition of placement group + +- cluster-ingress-operator embedded-component ddd1ee6dfb7e7c37d9525f48242baab55c7527fc to 4e621359cea8ef2ae8497101ee3daf9f474b4b66 + - 397cfb0 2024-06-19T09:29:24+01:00 Add grzpiotrowski to OWNERS + - 9e45b5f 2024-06-18T09:40:09+01:00 addowner-Thealisyed + - 478b9bc 2024-06-13T12:34:48-04:00 Change canary route to use passthrough + - 3ebff1f 2024-06-13T12:34:48-04:00 Remove dependency on canary route from various e2e tests + - 34fb0eb 2024-06-12T17:53:06-04:00 OCPBUGS-35368: Add Regexp Anchor to TestAll + - 091ce22 2024-06-12T10:30:32-04:00 OCPBUGS-35356: Retry IngressController updates in router status E2E + +- cluster-kube-apiserver-operator embedded-component 58d79ab9d65972bbd706e0787d149e7c0aef1774 to a88d4ae8e0a9c8d3457e8488d9da7f04680240d3 + - 6f3d201 2024-06-19T14:38:22+02:00 NO-JIRA: update library-go + - 88976d9 2024-06-19T11:34:45+04:00 Revert "Add sno section to alert description" + - 5b7bf4c 2024-06-14T15:35:17+04:00 add highcpuusagesnoalertcontroller tests + - 0894a6a 2024-06-14T15:35:14+04:00 add SNO control plane high cpu usage alert + +- cluster-kube-controller-manager-operator embedded-component a1afb4c381b817e9465105f9860560607e338fb9 to 0a9ed573e35751455bfb24842fd2de0b05379ed0 + - ba6d45b 2024-06-19T14:08:38+02:00 NO-JIRA: update library-go + - 36b73b0 2024-06-03T15:56:12+02:00 manifests: set owning-component for csr-signer-signer + +- cluster-kube-scheduler-operator embedded-component 42cd901d6af5d0a1deaab55cf377082b9f76b4d6 to 796d029c836e76e9312aefabf72fdde028a286b3 + - 8a6ee7b 2024-06-19T14:39:25+02:00 NO-JIRA: update library-go + +- cluster-network-operator embedded-component 6addd5e12150973804abf26991dcc6cfb8e9ff36 to 32e733b32f942ccd823f02ac0a77c52101eaf79e + - 60183c6 2024-06-18T05:02:27-04:00 Create the configmap mtu if not found + - b84c41d 2024-06-17T12:49:30+02:00 Update whereabouts crd + - 29d98a5 2024-05-25T12:14:31+00:00 Updating cluster-network-operator-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/cluster-network-operator.yml + - 4d60be9 2024-05-17T15:01:21-05:00 improve error handling of multus deployment not being found + - 3e0f005 2024-05-17T13:59:56-05:00 Propogate hypershift priority class override to multus and preserve container requests + - f00021a 2024-04-30T14:01:54+02:00 Use applyconfigurations for updating network.oprerator status + - 1636a82 2024-04-30T13:15:19+02:00 Vendor fake client-go operator client + +- cluster-openshift-controller-manager-operator embedded-component f35cc815f8f50a10233d0767c119279adc20c4de to 2bb0cde622cd4a705720987cf897719229acf3d8 + - 8cb1916 2024-06-18T16:27:38-04:00 fix nil pointer reference + - cffbb7e 2024-06-17T11:44:51+01:00 WRKLDS-1327: Replace wildcards by explicit list of verbs + +- etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305 to 1fb3165305efc8d986344b555b22592e6e6c1786 + - 2a22bdc9 2024-06-12T23:15:31+02:00 DOWNSTREAM : use build image go1.21-ocp4.17 + - ff0bd3b9 2024-05-30T19:02:27+02:00 DOWNSTREAM : drop go toolchain directive + - 99c665b0 2024-05-30T14:46:05+02:00 DOWNSTREAM : add native binary to installer images + - 4324cff9 2024-05-30T14:36:39+02:00 CORS-3249: DOWNSTREAM : installer: make etcd binaries static + - 2f6e3fce 2024-05-30T14:34:09+02:00 DOWNSTREAM : add installer Dockerfile for ART builds + - 83a8a3cf 2024-05-30T14:33:22+02:00 DOWNSTREAM : update Dockerfile golang 1.20 ocp 4.16 + - fb5975b6 2024-05-30T14:32:26+02:00 DOWNSTREAM: : Add Dockerfile to build etcd for openshift-installer + - 88241cbf 2024-05-30T14:32:04+02:00 Merge pull request #236 from openshift-bot/art-consistency-openshift-4.16-ose-etcd + - 95c92c74 2024-05-30T14:31:56+02:00 DOWNSTREAM : update Dockerfile golang 1.20 ocp 4.16 + - f40f8a03 2024-05-30T14:26:47+02:00 DOWNSTREAM : resolve merge conflicts + - bf51a53a 2024-05-30T06:33:09+12:00 version: bump up to 3.5.14 + - 8bc3271a 2024-05-23T23:37:11+05:30 config: support AllowedCN and AllowedHostname through config file + - 3c990bc4 2024-05-16T14:45:48+05:30 scripts: default to using .go-version's version for tests and builds + - 47403158 2024-05-16T14:45:42+05:30 .*: sync go toolchain version and add ability to verify versions + - f715ffd7 2024-05-10T18:25:42+05:30 update the go v1.21.10 + - 9e1dadd7 2024-05-09T21:41:23-04:00 etcdutl: Fix snapshot restore memory alloc issue + - 6abc349d 2024-05-09T21:41:16-04:00 server: Implement WithMmapSize option for backend config + - 99a64341 2024-05-06T10:31:18-07:00 Add cluster downgrade test. + - a5eec4d7 2024-05-06T12:02:49+02:00 Bump bbolt to 1.3.10 for 3.5 + - cee181d1 2024-05-06T10:03:08+02:00 v3rpc: run health notifier to listen on online defrag state change + - 22ca6151 2024-05-01T17:26:02+00:00 build(deps): bump distroless/static-debian11 from `046b92c` to `6d31326` + - 750bc0b1 2024-04-30T15:09:51+02:00 gRPC health server sets serving status to NOT_SERVING on defrag + - daec41c2 2024-04-29T18:55:52+00:00 e2e: add mix version test of adding last ver to current ver. + - 0af22abc 2024-04-24T12:28:20+08:00 server/mvcc: should update currentRev in revMu + - c06b17b9 2024-04-24T12:25:19+08:00 server/storage: update currentRev if scheduledCompact > currentRev + - 7beff571 2024-04-24T12:23:33+08:00 tests/e2e: reproduce #17780 + - 6b034466 2024-04-24T12:14:27+08:00 server/mvcc: introduce compactBeforeSetFinishedCompact failpoint + - adf1c3f2 2024-04-21T13:17:07+01:00 Update the compaction log when bootstrap and update compact's signature + - c391d69b 2024-04-18T19:08:05+00:00 test: add checking snapshot be sent in mix_version_test. + - 9331ee32 2024-04-17T13:50:23+02:00 [backport-3.5] server: ignore raft messages if member id mismatch #17078 + - 464df4a9 2024-04-15T17:04:44-07:00 add experimental-snapshot-catchup-entries flag. + - c06ec722 2024-04-08T21:37:06+00:00 test: add mix version e2e test. + - 51f31343 2024-04-06T22:58:32+08:00 feat: observe wal write at one time + - b6df59cb 2024-04-06T14:40:05+00:00 Add approvals gh workflows. + - 1404f5aa 2024-04-05T01:08:21+05:30 [3.5]Add trivy scan as a job in release workflow + - 94a1d0c1 2024-04-04T22:33:05+08:00 *: LeaseTimeToLive returns error if leader changed + - b78b2140 2024-04-04T22:33:05+08:00 .github: enable failpoints for integration tests + - 600b6bfe 2024-04-04T10:55:45+02:00 Bump golang.org/x/net to v0.23.0 + - 5776e213 2024-04-04T10:55:45+02:00 Bump go-version to 1.21.9 for release-3.5 due to CVE-2023-45288 + - 61a85b7a 2024-04-03T08:49:28+02:00 Backport initialization of mu in NewCtxClient to release-3.5 + - 953a023b 2024-04-03T10:50:15+13:00 Backport updates to shellcheck ignores for release.sh script. + - 1868848b 2024-04-03T09:51:54+13:00 Backport rename of release script to release.sh. + - 107412fc 2024-04-03T09:28:31+13:00 Backport update for release script to use ssh. + - d1eb35d5 2024-04-01T17:41:43+00:00 build(deps): bump distroless/static-debian11 from `7e5c6a2` to `046b92c` + - 0c2f2083 2024-04-01T09:07:24+00:00 Fix retry requests when receiving ErrGPRCNotSupportedForLearner + +- kubernetes embedded-component 44fc19fb798581a27cd21fa453a4b9ec50441bdc to d0324787c86dcd13d4f16745da43b216a6787040 + - b624017bd 2024-06-21T15:29:05+02:00 UPSTREAM: : extend termination events + - 8a574865a 2024-06-19T12:55:22+02:00 UPSTREAM: : don't fail integration due to too many goroutines - revert + - 2d9336513 2024-06-18T14:45:21+02:00 UPSTREAM: : Disable PersistentVolumeLabel by default + - 42d1658bc 2024-06-14T13:30:31+01:00 UPSTREAM: 125337: Account for differences in fork test suite + - e5e3222bc 2024-06-14T13:30:17+01:00 UPSTREAM: 125337: add more testing for node.status.addresses + - d4f87b5ce 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external + - 7e664dd3d 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: ccm integration test for node status addresses and provided-node-ip annotation + - 3b29f23df 2024-06-12T18:02:26+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override + +- machine-config-operator embedded-component fc878b8614b1aed5e2e44e4a1a89e6673674880d to 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab + - 459d4c0d 2024-06-18T13:36:38-04:00 Format policy.json + - 719d21b3 2024-06-14T14:48:42-04:00 Revert "Azure: add Azure specific dnsmasq ordering" + - 65be00a1 2024-06-13T18:09:55+01:00 Default ipv4 NODE_IP to 0.0.0.0 + - d2aff6e7 2024-05-27T22:24:41+02:00 Use Role instead of ClusterRole for on-prem services + - d42572e2 2024-05-27T22:18:33+02:00 OCPBUGS-32348: Allow system:node read config maps in infra namespaces + - 8b0c7382 2024-05-08T21:46:38-04:00 OCPBUGS-31710: Unify machineconfig file format for kubeletconfig to use YAML encoding instead of JSON encoding + - ca329fbd 2024-05-07T08:18:17-05:00 OCPBUGS-33331: Fix reference to $host_file + - 23015aab 2024-05-01T12:00:21+02:00 OCPBUGS-32348: Mount pod namespace for on-prem components + +- operator-framework-olm embedded-component c921a18b08a10e8d4366b70103a7de0ec6c50747 to 06c943a5bd529b7fb6fa278f637747889f4fab73 + - 893b225f 2024-06-20T07:25:28-05:00 UPSTREAM: : fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image + - 07496420 2024-06-19T00:04:15+00:00 build(deps): bump k8s.io/component-base from 0.30.1 to 0.30.2 (#3320) + - 0e65f3ef 2024-06-19T00:02:40+00:00 build(deps): bump k8s.io/api from 0.30.1 to 0.30.2 (#3321) + - 92be8755 2024-06-19T00:02:23+00:00 build(deps): bump k8s.io/code-generator from 0.30.1 to 0.30.2 (#3319) + - 36ef5362 2024-06-19T00:02:06+00:00 build(deps): bump github.com/spf13/cobra from 1.8.0 to 1.8.1 (#3318) + - 4219fb96 2024-06-14T00:04:50+00:00 remove default value of catsrc.spec.grpcPodConfig.securityContextConfig (#342) + - 37a76685 2024-06-14T00:03:24+00:00 Bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 + - f6c501de 2024-06-14T00:03:10+00:00 Bump sigs.k8s.io/controller-runtime from 0.18.2 to 0.18.3 + - b7422a5d 2024-06-14T00:02:58+00:00 Bump github.com/sirupsen/logrus from 1.9.2 to 1.9.3 + - 78cf43fd 2024-06-14T00:02:41+00:00 bump of/api to v0.26.0 (#3317) + +- service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac to 1f7d6472fea332fc307d9c8911f8c3cf57347755 + - cc1c71e 2024-05-09T12:30:19+08:00 fix outdated doc links + +- oc image-amd64 7b485f76af31da5be136158d070db8130465216a to 34c69c72be5a0c71863965a5c6480c236b0f843e + - f32f01f2 2024-06-19T18:48:07+02:00 `upgrade status`: revert to overestimating remaining time + - 4814246c 2024-06-19T18:47:54+02:00 `upgrade status`: lower estimated node actions to avoid inconsistency with estimation + - ab821326 2024-06-19T18:47:52+02:00 `upgrade status`: overestimate total duration, not remaining time + - 543f99e8 2024-06-19T18:47:11+02:00 `upgrade status`: change how last observed progress is computed + - c698af9e 2024-06-19T18:46:45+02:00 `upgrade status`: get baseline from history when possible + - 82fbfada 2024-06-19T18:46:26+02:00 `upgrade status`: stalled or progressing-slow when over estimate + - 7a74b494 2024-06-19T18:45:32+02:00 `upgrade status`: show <10m when estimate is lower than 10m + - aa1b3e8c 2024-06-19T18:44:36+02:00 `upgrade status`: overestimate remaining time by 20% + - af2121a1 2024-06-19T18:44:06+02:00 `update status`: Avoid projecting from small values + - 89ee1785 2024-06-19T18:43:46+02:00 `upgrade status`: do not show estimate TTC when completed + - 03cc7b43 2024-06-19T18:42:57+02:00 `upgrade status`: estimate better via last observed progress + - 8b5fbdad 2024-06-19T18:42:33+02:00 `update status`: use timewise completion estimate + - c578a1ce 2024-06-19T18:42:08+02:00 `update status`: project estimate duration from elapsed + - 503b0f5f 2024-06-19T18:40:18+02:00 `update status`: add baseline control plane estimate duration + - fee046bc 2024-06-19T18:39:23+02:00 `update status`: truncate subsecond durations + - f7a8fbb4 2024-06-19T18:38:37+02:00 `update status`: inject ns skew to eliminate input data rounding + +- ovn-kubernetes image-amd64 f4509354bc253dbffdd35c0fdf391f476dafeeed to 56c123fe65143eb4005558d9845c89d243c8573c + - 31bb9418 2024-06-20T15:03:25+02:00 Bump OVN to 24.03.2-19 in Dockerfile.base to fix multicast bug + - 6b7e03be 2024-06-14T22:01:15+02:00 nit-fix: log statement had extra %s + - 966db159 2024-06-14T19:11:45+02:00 docs-nit-fix + - fabb87bb 2024-06-14T17:49:14+02:00 Rename packages + - bb9b9f38 2024-06-14T16:51:53+02:00 Add release documentation + - d8a27117 2024-06-14T16:51:51+02:00 docs: Fix configuration docs + - 1dba29d4 2024-06-14T16:48:00+02:00 Update Helm Chart version to 1.0.0 + - 61d5c593 2024-06-14T16:48:00+02:00 Update OVN_DAEMONSET_VERSION to be 1.0.0 + - c4e61703 2024-06-14T16:48:00+02:00 OVN Kubernetes v1.0.0 release + - c92e512f 2024-06-14T12:37:42+02:00 Update hardware offloads to hardware acceleration + - de5cbaa1 2024-06-08T21:49:15-04:00 Update README.md + - 71336e65 2024-06-07T20:48:04-04:00 Starting to refactor developer documentation + - a509b306 2024-06-07T07:22:28-07:00 OVS-DOCA configuration instructions + - b95d28d0 2024-06-07T07:21:09-07:00 Support OVS-DOCA + - 014b1c5d 2024-06-07T11:13:28+02:00 Add events for >99 priority + - 7aeba71f 2024-06-07T11:13:24+02:00 ANP: Allow two ANPs at the same priority + - 16da3ced 2024-06-06T14:32:11-07:00 ovnkube-node: add support for comma-separated IPs in external_ids:ovn-encap-ip + - f59f8335 2024-06-06T14:32:11-07:00 add multi-vtep doc + - b9fc456d 2024-06-06T14:32:11-07:00 multi-vtep: set ovn-encap-ip on OVS Port when adding it to br-int + - a8c47e37 2024-06-06T07:11:13-07:00 Added SDN Dashboard helm chart + - 85a5c4f4 2024-06-05T21:22:44-07:00 ingress: update image to registry.k8s.io/ingress-nginx/controller:v1.10.1 + - f046e767 2024-06-05T21:18:54-07:00 CNI: Add VFIO support for SR-IOV enabled systems + - 2556a88e 2024-06-05T15:12:15-04:00 Remove FakeAddressSet from EgressIP testing + - b1bb8edf 2024-06-05T10:07:28+00:00 Fix race condition when creating/deleting namespace address set + - c70c8927 2024-06-04T21:41:41+02:00 Fix labeler file alingment for github action + - 8ce0b0ca 2024-06-04T11:14:49-07:00 Consolidate use of errors + - 47408e0d 2024-06-04T23:20:31+05:30 Implementation required to enable Forwarding if it is already disabled + - ef45f218 2024-06-04T10:43:51-07:00 CGO_ENABLED=0 for cross-platform windows build + - 414a0f2f 2024-06-03T12:13:00-07:00 Add documentation guide + - 106177fd 2024-06-03T12:13:00-07:00 Add introduction docs for API Reference + - 96c994aa 2024-06-03T12:13:00-07:00 Move API reference to new sub-heading + - ce6445db 2024-06-01T09:19:29-07:00 Add labels for ServiceMonitor K8S objects + - b221855d 2024-05-31T14:19:09+02:00 Move pr-labeler workflow to workflows + - 307dd428 2024-05-29T14:30:36+02:00 Unskip OVS CPU affinity pinning E2Es for IPv6 + - 0ba87329 2024-05-28T10:27:21-04:00 Modify MEG ingress tests for ICMP + - db30a9e7 2024-05-27T21:44:55+02:00 Change area labels on issues + - e7670ab9 2024-05-27T21:43:22+02:00 Add labeler workflow for PRs + - 948b3171 2024-05-27T20:58:25+02:00 Add github actions for stale issues + - 39d3e649 2024-05-27T19:39:09+02:00 e2e: Re-enable PASS action logging + - b00345c7 2024-05-27T18:13:37+02:00 Bump OVN to 24.03.2.5 + - 03f117ef 2024-05-27T10:21:47+02:00 kubevirt: Propertly remove migration leftovers + - 54bc5a19 2024-05-25T15:52:25+00:00 Updating ose-ovn-kubernetes-container image to be consistent with ART for 4.17 Reconciling with https://github.com/openshift/ocp-build-data/tree/4c1326094222f9209876f06833179a1b9178faf7/images/ose-ovn-kubernetes.yml + - 8b76acc9 2024-05-24T19:50:02+02:00 Remove stale FAQ + - 05f27491 2024-05-24T19:50:02+02:00 Add ovn-kubernetes ADOPTERS + - 4e9b559e 2024-05-23T11:16:42-04:00 Fixes waiting for level-driven informers to stop + +- kubernetes image-amd64 44fc19fb798581a27cd21fa453a4b9ec50441bdc to d0324787c86dcd13d4f16745da43b216a6787040 + - b624017bd 2024-06-21T15:29:05+02:00 UPSTREAM: : extend termination events + - 8a574865a 2024-06-19T12:55:22+02:00 UPSTREAM: : don't fail integration due to too many goroutines - revert + - 2d9336513 2024-06-18T14:45:21+02:00 UPSTREAM: : Disable PersistentVolumeLabel by default + - 42d1658bc 2024-06-14T13:30:31+01:00 UPSTREAM: 125337: Account for differences in fork test suite + - e5e3222bc 2024-06-14T13:30:17+01:00 UPSTREAM: 125337: add more testing for node.status.addresses + - d4f87b5ce 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: document kubelet node-ip with cloud provider external + - 7e664dd3d 2024-06-12T18:02:35+01:00 UPSTREAM: 125337: ccm integration test for node status addresses and provided-node-ip annotation + - 3b29f23df 2024-06-12T18:02:26+01:00 UPSTREAM: 124516: Fix behavior with external cloud provider and --hostname-override + +- service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac to 1f7d6472fea332fc307d9c8911f8c3cf57347755 + - cc1c71e 2024-05-09T12:30:19+08:00 fix outdated doc links + +- oc image-arm64 7b485f76af31da5be136158d070db8130465216a to 34c69c72be5a0c71863965a5c6480c236b0f843e + - f32f01f2 2024-06-19T18:48:07+02:00 `upgrade status`: revert to overestimating remaining time + - 4814246c 2024-06-19T18:47:54+02:00 `upgrade status`: lower estimated node actions to avoid inconsistency with estimation + - ab821326 2024-06-19T18:47:52+02:00 `upgrade status`: overestimate total duration, not remaining time + - 543f99e8 2024-06-19T18:47:11+02:00 `upgrade status`: change how last observed progress is computed + - c698af9e 2024-06-19T18:46:45+02:00 `upgrade status`: get baseline from history when possible + - 82fbfada 2024-06-19T18:46:26+02:00 `upgrade status`: stalled or progressing-slow when over estimate + - 7a74b494 2024-06-19T18:45:32+02:00 `upgrade status`: show <10m when estimate is lower than 10m + - aa1b3e8c 2024-06-19T18:44:36+02:00 `upgrade status`: overestimate remaining time by 20% + - af2121a1 2024-06-19T18:44:06+02:00 `update status`: Avoid projecting from small values + - 89ee1785 2024-06-19T18:43:46+02:00 `upgrade status`: do not show estimate TTC when completed + - 03cc7b43 2024-06-19T18:42:57+02:00 `upgrade status`: estimate better via last observed progress + - 8b5fbdad 2024-06-19T18:42:33+02:00 `update status`: use timewise completion estimate + - c578a1ce 2024-06-19T18:42:08+02:00 `update status`: project estimate duration from elapsed + - 503b0f5f 2024-06-19T18:40:18+02:00 `update status`: add baseline control plane estimate duration + - fee046bc 2024-06-19T18:39:23+02:00 `update status`: truncate subsecond durations + - f7a8fbb4 2024-06-19T18:38:37+02:00 `update status`: inject ns skew to eliminate input data rounding + +- ovn-kubernetes image-arm64 6681cfb01a3d083a8e281c26e1be5292749c350d to 56c123fe65143eb4005558d9845c89d243c8573c + - 31bb9418 2024-06-20T15:03:25+02:00 Bump OVN to 24.03.2-19 in Dockerfile.base to fix multicast bug + +- kubernetes image-arm64 7d2df9acbc57af584985832795709e23fbdf7fb2 to d0324787c86dcd13d4f16745da43b216a6787040 + - b624017bd 2024-06-21T15:29:05+02:00 UPSTREAM: : extend termination events + - 8a574865a 2024-06-19T12:55:22+02:00 UPSTREAM: : don't fail integration due to too many goroutines - revert + +- service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac to 1f7d6472fea332fc307d9c8911f8c3cf57347755 + - cc1c71e 2024-05-09T12:30:19+08:00 fix outdated doc links + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ab0da744ee..fd62ff7d56 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,39 +1,39 @@ -https://github.com/openshift/api embedded-component 5c2b46e4709a950e98cda1f3733f9a46cd9737cd +https://github.com/openshift/api embedded-component 987b8890c273cdcc262028806fa85ae5ab3ed92f https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component e8e9cc1b8038a777459d745e69b786066b45d47f https://github.com/openshift/cluster-dns-operator embedded-component 3c5bb64b9b5f9b4c3132c4c38d74155037009370 -https://github.com/openshift/cluster-ingress-operator embedded-component ddd1ee6dfb7e7c37d9525f48242baab55c7527fc -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 58d79ab9d65972bbd706e0787d149e7c0aef1774 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a1afb4c381b817e9465105f9860560607e338fb9 -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 42cd901d6af5d0a1deaab55cf377082b9f76b4d6 -https://github.com/openshift/cluster-network-operator embedded-component 6addd5e12150973804abf26991dcc6cfb8e9ff36 -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f35cc815f8f50a10233d0767c119279adc20c4de +https://github.com/openshift/cluster-ingress-operator embedded-component 4e621359cea8ef2ae8497101ee3daf9f474b4b66 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a88d4ae8e0a9c8d3457e8488d9da7f04680240d3 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 796d029c836e76e9312aefabf72fdde028a286b3 +https://github.com/openshift/cluster-network-operator embedded-component 32e733b32f942ccd823f02ac0a77c52101eaf79e +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2bb0cde622cd4a705720987cf897719229acf3d8 https://github.com/openshift/cluster-policy-controller embedded-component c502ece1b8bdccdbc58a327520685d9a1d2f59cf https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b3868f0597a114df25531d866aa2cd1191 -https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305 -https://github.com/openshift/kubernetes embedded-component 44fc19fb798581a27cd21fa453a4b9ec50441bdc +https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 +https://github.com/openshift/kubernetes embedded-component d0324787c86dcd13d4f16745da43b216a6787040 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component fc878b8614b1aed5e2e44e4a1a89e6673674880d +https://github.com/openshift/machine-config-operator embedded-component 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6 -https://github.com/openshift/operator-framework-olm embedded-component c921a18b08a10e8d4366b70103a7de0ec6c50747 +https://github.com/openshift/operator-framework-olm embedded-component 06c943a5bd529b7fb6fa278f637747889f4fab73 https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 -https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac -https://github.com/openshift/oc image-amd64 7b485f76af31da5be136158d070db8130465216a +https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 +https://github.com/openshift/oc image-amd64 34c69c72be5a0c71863965a5c6480c236b0f843e https://github.com/openshift/coredns image-amd64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-amd64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/router image-amd64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 f4509354bc253dbffdd35c0fdf391f476dafeeed -https://github.com/openshift/kubernetes image-amd64 44fc19fb798581a27cd21fa453a4b9ec50441bdc -https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac -https://github.com/openshift/oc image-arm64 7b485f76af31da5be136158d070db8130465216a +https://github.com/openshift/ovn-kubernetes image-amd64 56c123fe65143eb4005558d9845c89d243c8573c +https://github.com/openshift/kubernetes image-amd64 d0324787c86dcd13d4f16745da43b216a6787040 +https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 +https://github.com/openshift/oc image-arm64 34c69c72be5a0c71863965a5c6480c236b0f843e https://github.com/openshift/coredns image-arm64 f80a0b3882f36832a33f07b720007956717e324d https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/csi-external-snapshotter image-arm64 43de97b3868f0597a114df25531d866aa2cd1191 https://github.com/openshift/router image-arm64 4d9b8c4afa6cd89b41f4bd5e7c09ccddd8679bc6 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-arm64 6681cfb01a3d083a8e281c26e1be5292749c350d -https://github.com/openshift/kubernetes image-arm64 7d2df9acbc57af584985832795709e23fbdf7fb2 -https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac +https://github.com/openshift/ovn-kubernetes image-arm64 56c123fe65143eb4005558d9845c89d243c8573c +https://github.com/openshift/kubernetes image-arm64 d0324787c86dcd13d4f16745da43b216a6787040 +https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 18317c2209..e3de41fef0 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.17.0-0.nightly-2024-06-13-010514" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-19-222614" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-23-145410" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-23-145411" diff --git a/vendor/go.etcd.io/etcd/api/v3/version/version.go b/vendor/go.etcd.io/etcd/api/v3/version/version.go index d20b3a0202..6b5177fc3c 100644 --- a/vendor/go.etcd.io/etcd/api/v3/version/version.go +++ b/vendor/go.etcd.io/etcd/api/v3/version/version.go @@ -26,7 +26,7 @@ import ( var ( // MinClusterVersion is the min cluster version this etcd binary is compatible with. MinClusterVersion = "3.0.0" - Version = "3.5.13" + Version = "3.5.14" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/go.etcd.io/etcd/client/v3/client.go b/vendor/go.etcd.io/etcd/client/v3/client.go index 8a2225b227..312d03e7a6 100644 --- a/vendor/go.etcd.io/etcd/client/v3/client.go +++ b/vendor/go.etcd.io/etcd/client/v3/client.go @@ -86,7 +86,7 @@ func New(cfg Config) (*Client, error) { // service interface implementations and do not need connection management. func NewCtxClient(ctx context.Context, opts ...Option) *Client { cctx, cancel := context.WithCancel(ctx) - c := &Client{ctx: cctx, cancel: cancel, lgMu: new(sync.RWMutex)} + c := &Client{ctx: cctx, cancel: cancel, lgMu: new(sync.RWMutex), mu: new(sync.RWMutex)} for _, opt := range opts { opt(c) } diff --git a/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go b/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go index 7dc5ddae0f..8c50dcfa93 100644 --- a/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go +++ b/vendor/go.etcd.io/etcd/client/v3/retry_interceptor.go @@ -19,6 +19,7 @@ package clientv3 import ( "context" + "errors" "io" "sync" "time" @@ -85,7 +86,7 @@ func (c *Client) unaryClientInterceptor(optFuncs ...retryOption) grpc.UnaryClien } continue } - if !isSafeRetry(c.lg, lastErr, callOpts) { + if !isSafeRetry(c, lastErr, callOpts) { return lastErr } } @@ -279,7 +280,7 @@ func (s *serverStreamingRetryingStream) receiveMsgAndIndicateRetry(m interface{} return true, err } - return isSafeRetry(s.client.lg, err, s.callOpts), err + return isSafeRetry(s.client, err, s.callOpts), err } func (s *serverStreamingRetryingStream) reestablishStreamAndResendBuffer(callCtx context.Context) (grpc.ClientStream, error) { @@ -319,17 +320,28 @@ func waitRetryBackoff(ctx context.Context, attempt uint, callOpts *options) erro } // isSafeRetry returns "true", if request is safe for retry with the given error. -func isSafeRetry(lg *zap.Logger, err error, callOpts *options) bool { +func isSafeRetry(c *Client, err error, callOpts *options) bool { if isContextError(err) { return false } + + // Situation when learner refuses RPC it is supposed to not serve is from the server + // perspective not retryable. + // But for backward-compatibility reasons we need to support situation that + // customer provides mix of learners (not yet voters) and voters with an + // expectation to pick voter in the next attempt. + // TODO: Ideally client should be 'aware' which endpoint represents: leader/voter/learner with high probability. + if errors.Is(err, rpctypes.ErrGPRCNotSupportedForLearner) && len(c.Endpoints()) > 1 { + return true + } + switch callOpts.retryPolicy { case repeatable: return isSafeRetryImmutableRPC(err) case nonRepeatable: return isSafeRetryMutableRPC(err) default: - lg.Warn("unrecognized retry policy", zap.String("retryPolicy", callOpts.retryPolicy.String())) + c.lg.Warn("unrecognized retry policy", zap.String("retryPolicy", callOpts.retryPolicy.String())) return false } } diff --git a/vendor/k8s.io/apiserver/pkg/server/config.go b/vendor/k8s.io/apiserver/pkg/server/config.go index 96ad8e2513..cc82d9db6e 100644 --- a/vendor/k8s.io/apiserver/pkg/server/config.go +++ b/vendor/k8s.io/apiserver/pkg/server/config.go @@ -21,7 +21,6 @@ import ( "crypto/sha256" "encoding/base32" "fmt" - "io/ioutil" "net" "net/http" "os" @@ -37,7 +36,6 @@ import ( "github.com/google/uuid" "golang.org/x/crypto/cryptobyte" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" @@ -764,8 +762,8 @@ func (c *RecommendedConfig) Complete() CompletedConfig { if len(ns) == 0 { ns = "default" } - c.EventSink = &v1.EventSinkImpl{ - Interface: kubernetes.NewForConfigOrDie(c.ClientConfig).CoreV1().Events(ns), + c.EventSink = clientEventSink{ + &v1.EventSinkImpl{Interface: kubernetes.NewForConfigOrDie(c.ClientConfig).CoreV1().Events(ns)}, } } } @@ -779,39 +777,6 @@ var allowedMediaTypes = []string{ runtime.ContentTypeProtobuf, } -func eventReference() (*corev1.ObjectReference, error) { - ns := os.Getenv("POD_NAMESPACE") - pod := os.Getenv("POD_NAME") - if len(ns) == 0 && len(pod) > 0 { - serviceAccountNamespaceFile := "/var/run/secrets/kubernetes.io/serviceaccount/namespace" - if _, err := os.Stat(serviceAccountNamespaceFile); err == nil { - bs, err := ioutil.ReadFile(serviceAccountNamespaceFile) - if err != nil { - return nil, err - } - ns = string(bs) - } - } - if len(ns) == 0 { - pod = "" - ns = "openshift-kube-apiserver" - } - if len(pod) == 0 { - return &corev1.ObjectReference{ - Kind: "Namespace", - Name: ns, - APIVersion: "v1", - }, nil - } - - return &corev1.ObjectReference{ - Kind: "Pod", - Namespace: ns, - Name: pod, - APIVersion: "v1", - }, nil -} - // New creates a new server which logically combines the handling chain with the passed server. // name is used to differentiate for logging. The handler chain in particular can be difficult as it starts delegating. // delegationTarget may not be nil. @@ -908,8 +873,9 @@ func (c completedConfig) New(name string, delegationTarget DelegationTarget) (*G ref, err := eventReference() if err != nil { klog.Warningf("Failed to derive event reference, won't create events: %v", err) - c.EventSink = nullEventSink{} + s.OpenShiftGenericAPIServerPatch.eventSink = nullEventSink{} } + s.RegisterDestroyFunc(c.EventSink.Destroy) s.eventRef = ref if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.AggregatedDiscoveryEndpoint) { @@ -1268,9 +1234,3 @@ func SetHostnameFuncForTests(name string) { return } } - -type nullEventSink struct{} - -func (nullEventSink) Create(event *corev1.Event) (*corev1.Event, error) { - return nil, nil -} diff --git a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go index a140f94ce9..ac1ea0d7d4 100644 --- a/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go +++ b/vendor/k8s.io/apiserver/pkg/server/patch_genericapiserver.go @@ -18,6 +18,7 @@ package server import ( "fmt" + "io/ioutil" "net" "net/http" "os" @@ -31,6 +32,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + v1 "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/klog/v2" netutils "k8s.io/utils/net" ) @@ -38,6 +40,7 @@ import ( // EventSink allows to create events. type EventSink interface { Create(event *corev1.Event) (*corev1.Event, error) + Destroy() } type OpenShiftGenericAPIServerPatch struct { @@ -110,6 +113,39 @@ func (s *GenericAPIServer) Eventf(eventType, reason, messageFmt string, args ... } } +func eventReference() (*corev1.ObjectReference, error) { + ns := os.Getenv("POD_NAMESPACE") + pod := os.Getenv("POD_NAME") + if len(ns) == 0 && len(pod) > 0 { + serviceAccountNamespaceFile := "/var/run/secrets/kubernetes.io/serviceaccount/namespace" + if _, err := os.Stat(serviceAccountNamespaceFile); err == nil { + bs, err := ioutil.ReadFile(serviceAccountNamespaceFile) + if err != nil { + return nil, err + } + ns = string(bs) + } + } + if len(ns) == 0 { + pod = "" + ns = "openshift-kube-apiserver" + } + if len(pod) == 0 { + return &corev1.ObjectReference{ + Kind: "Namespace", + Name: ns, + APIVersion: "v1", + }, nil + } + + return &corev1.ObjectReference{ + Kind: "Pod", + Namespace: ns, + Name: pod, + APIVersion: "v1", + }, nil +} + // terminationLoggingListener wraps the given listener to mark late connections // as such, identified by the remote address. In parallel, we have a filter that // logs bad requests through these connections. We need this filter to get @@ -230,3 +266,19 @@ func isLocal(req *http.Request) bool { func isKubeApiserverLoopBack(req *http.Request) bool { return strings.HasPrefix(req.UserAgent(), "kube-apiserver/") } + +type nullEventSink struct{} + +func (nullEventSink) Create(event *corev1.Event) (*corev1.Event, error) { + return nil, nil +} + +func (nullEventSink) Destroy() { +} + +type clientEventSink struct { + *v1.EventSinkImpl +} + +func (clientEventSink) Destroy() { +} diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/patch_server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/patch_server.go new file mode 100644 index 0000000000..2c9ecaf016 --- /dev/null +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/patch_server.go @@ -0,0 +1,66 @@ +/* +Copyright 2024 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package app + +import ( + "context" + "fmt" + "time" + + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apiserver/pkg/endpoints/request" + genericapiserver "k8s.io/apiserver/pkg/server" + "k8s.io/kubernetes/pkg/apis/core" + v1 "k8s.io/kubernetes/pkg/apis/core/v1" + eventstorage "k8s.io/kubernetes/pkg/registry/core/event/storage" +) + +// eventRegistrySink wraps an event registry in order to be used as direct event sync, without going through the API. +type eventRegistrySink struct { + *eventstorage.REST +} + +var _ genericapiserver.EventSink = eventRegistrySink{} + +func (s eventRegistrySink) Create(v1event *corev1.Event) (*corev1.Event, error) { + ctx := request.WithNamespace(request.WithRequestInfo(request.NewContext(), &request.RequestInfo{APIVersion: "v1"}), v1event.Namespace) + // since we are bypassing the API set a hard timeout for the storage layer + ctx, cancel := context.WithTimeout(ctx, 3*time.Second) + defer cancel() + + var event core.Event + if err := v1.Convert_v1_Event_To_core_Event(v1event, &event, nil); err != nil { + return nil, err + } + + obj, err := s.REST.Create(ctx, &event, nil, &metav1.CreateOptions{}) + if err != nil { + return nil, err + } + ret, ok := obj.(*core.Event) + if !ok { + return nil, fmt.Errorf("expected corev1.Event, got %T", obj) + } + + var v1ret corev1.Event + if err := v1.Convert_core_Event_To_v1_Event(ret, &v1ret, nil); err != nil { + return nil, err + } + + return &v1ret, nil +} diff --git a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go index 9c15657057..bb44db0e8c 100644 --- a/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go +++ b/vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go @@ -20,13 +20,11 @@ limitations under the License. package app import ( - "context" "crypto/tls" "fmt" "net/http" "net/url" "os" - "time" "k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement" "k8s.io/kubernetes/openshift-kube-apiserver/enablement" @@ -34,17 +32,14 @@ import ( "github.com/spf13/cobra" - corev1 "k8s.io/api/core/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" extensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" utilerrors "k8s.io/apimachinery/pkg/util/errors" utilnet "k8s.io/apimachinery/pkg/util/net" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/admission" genericapifilters "k8s.io/apiserver/pkg/endpoints/filters" - "k8s.io/apiserver/pkg/endpoints/request" genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/egressselector" utilfeature "k8s.io/apiserver/pkg/util/feature" @@ -69,8 +64,6 @@ import ( "k8s.io/kubernetes/cmd/kube-apiserver/app/options" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/apis/core" - v1 "k8s.io/kubernetes/pkg/apis/core/v1" "k8s.io/kubernetes/pkg/capabilities" "k8s.io/kubernetes/pkg/controlplane" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver" @@ -449,38 +442,3 @@ func buildServiceResolver(enabledAggregatorRouting bool, hostname string, inform } return serviceResolver } - -// eventRegistrySink wraps an event registry in order to be used as direct event sync, without going through the API. -type eventRegistrySink struct { - *eventstorage.REST -} - -var _ genericapiserver.EventSink = eventRegistrySink{} - -func (s eventRegistrySink) Create(v1event *corev1.Event) (*corev1.Event, error) { - ctx := request.WithNamespace(request.WithRequestInfo(request.NewContext(), &request.RequestInfo{APIVersion: "v1"}), v1event.Namespace) - // since we are bypassing the API set a hard timeout for the storage layer - ctx, cancel := context.WithTimeout(ctx, 3*time.Second) - defer cancel() - - var event core.Event - if err := v1.Convert_v1_Event_To_core_Event(v1event, &event, nil); err != nil { - return nil, err - } - - obj, err := s.REST.Create(ctx, &event, nil, &metav1.CreateOptions{}) - if err != nil { - return nil, err - } - ret, ok := obj.(*core.Event) - if !ok { - return nil, fmt.Errorf("expected corev1.Event, got %T", obj) - } - - var v1ret corev1.Event - if err := v1.Convert_core_Event_To_v1_Event(ret, &v1ret, nil); err != nil { - return nil, err - } - - return &v1ret, nil -} diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go index 7214fa8231..d00be731fa 100644 --- a/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go +++ b/vendor/k8s.io/kubernetes/cmd/kubelet/app/options/options.go @@ -298,7 +298,7 @@ func (f *KubeletFlags) AddFlags(mainfs *pflag.FlagSet) { fs.StringVar(&f.HostnameOverride, "hostname-override", f.HostnameOverride, "If non-empty, will use this string as identification instead of the actual hostname. If --cloud-provider is set, the cloud provider determines the name of the node (consult cloud provider documentation to determine if and how the hostname is used).") - fs.StringVar(&f.NodeIP, "node-ip", f.NodeIP, "IP address (or comma-separated dual-stack IP addresses) of the node. If unset, kubelet will use the node's default IPv4 address, if any, or its default IPv6 address if it has no IPv4 addresses. You can pass '::' to make it prefer the default IPv6 address rather than the default IPv4 address.") + fs.StringVar(&f.NodeIP, "node-ip", f.NodeIP, "IP address (or comma-separated dual-stack IP addresses) of the node. If unset, kubelet will use the node's default IPv4 address, if any, or its default IPv6 address if it has no IPv4 addresses. You can pass '::' to make it prefer the default IPv6 address rather than the default IPv4 address. If cloud-provider is set to external, this flag will help to bootstrap the node with the corresponding IP.") fs.StringVar(&f.CertDirectory, "cert-dir", f.CertDirectory, "The directory where the TLS certs are located. "+ "If --tls-cert-file and --tls-private-key-file are provided, this flag will be ignored.") diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go index db605ae46e..9067a8c731 100644 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go @@ -85,7 +85,6 @@ var ( additionalDefaultOnPlugins = sets.NewString( "NodeRestriction", "OwnerReferencesPermissionEnforcement", - "PersistentVolumeLabel", "PodNodeSelector", "PodTolerationRestriction", "Priority", diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go index fbde55b952..c63b36016d 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go @@ -31,6 +31,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + utilnet "k8s.io/apimachinery/pkg/util/net" "k8s.io/apimachinery/pkg/util/sets" cloudprovider "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" @@ -783,7 +784,7 @@ func (kl *Kubelet) defaultNodeStatusFuncs() []func(context.Context, *v1.Node) er } var setters []func(ctx context.Context, n *v1.Node) error setters = append(setters, - nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc), + nodestatus.NodeAddress(kl.nodeIPs, kl.nodeIPValidator, kl.hostname, kl.hostnameOverridden, kl.externalCloudProvider, kl.cloud, nodeAddressesFunc, utilnet.ResolveBindAddress), nodestatus.MachineInfo(string(kl.nodeName), kl.maxPods, kl.podsPerCore, kl.GetCachedMachineInfo, kl.containerManager.GetCapacity, kl.containerManager.GetDevicePluginResourceCapacity, kl.containerManager.GetNodeAllocatableReservation, kl.recordEvent, kl.supportLocalStorageCapacityIsolation()), nodestatus.VersionInfo(kl.cadvisor.VersionInfo, kl.containerRuntime.Type, kl.containerRuntime.Version), diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go index 1a93ef7edd..3e56c6a191 100644 --- a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go +++ b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go @@ -31,7 +31,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/errors" - utilnet "k8s.io/apimachinery/pkg/util/net" utilfeature "k8s.io/apiserver/pkg/util/feature" cloudprovider "k8s.io/cloud-provider" cloudproviderapi "k8s.io/cloud-provider/api" @@ -67,6 +66,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs externalCloudProvider bool, // typically Kubelet.externalCloudProvider cloud cloudprovider.Interface, // typically Kubelet.cloud nodeAddressesFunc func() ([]v1.NodeAddress, error), // typically Kubelet.cloudResourceSyncManager.NodeAddresses + resolveAddressFunc func(net.IP) (net.IP, error), // typically k8s.io/apimachinery/pkg/util/net.ResolveBindAddress ) Setter { var nodeIP, secondaryNodeIP net.IP if len(nodeIPs) > 0 { @@ -130,12 +130,18 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs if len(node.Status.Addresses) > 0 { return nil } - // If nodeIPs are not specified wait for the external cloud-provider to set the node addresses. + // If nodeIPs are not set wait for the external cloud-provider to set the node addresses. + // If the nodeIP is the unspecified address 0.0.0.0 or ::, then use the IP of the default gateway of + // the corresponding IP family to bootstrap the node until the out-of-tree provider overrides it later. + // xref: https://github.com/kubernetes/kubernetes/issues/125348 // Otherwise uses them on the assumption that the installer/administrator has the previous knowledge // required to ensure the external cloud provider will use the same addresses to avoid the issues explained // in https://github.com/kubernetes/kubernetes/issues/120720. // We are already hinting the external cloud provider via the annotation AnnotationAlphaProvidedIPAddr. - if !nodeIPSpecified { + if nodeIP == nil { + node.Status.Addresses = []v1.NodeAddress{ + {Type: v1.NodeHostName, Address: hostname}, + } return nil } } @@ -220,7 +226,7 @@ func NodeAddress(nodeIPs []net.IP, // typically Kubelet.nodeIPs } if ipAddr == nil { - ipAddr, err = utilnet.ResolveBindAddress(nodeIP) + ipAddr, err = resolveAddressFunc(nodeIP) } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 609d68f558..3a85f79d25 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -868,7 +868,7 @@ github.com/vishvananda/netns # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.13 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/api/v3 v3.5.14 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -876,7 +876,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.13 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/client/pkg/v3 v3.5.14 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -884,7 +884,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.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# go.etcd.io/etcd/client/v3 v3.5.10 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef ## explicit; go 1.21 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1279,7 +1279,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1338,7 +1338,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1385,7 +1385,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1453,7 +1453,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1625,13 +1625,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-20240606123447-44fc19fb7985 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1978,7 +1978,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2001,14 +2001,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-20240606123447-44fc19fb7985 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2042,7 +2042,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2055,7 +2055,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2072,20 +2072,20 @@ 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-20240606123447-44fc19fb7985 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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-20240606123447-44fc19fb7985 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured/namedresources/cel -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2110,13 +2110,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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2147,7 +2147,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2180,11 +2180,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-20240606123447-44fc19fb7985 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.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-20240606123447-44fc19fb7985 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2219,7 +2219,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-20240606123447-44fc19fb7985 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2241,7 +2241,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.30.1 => github.com/openshift/kubernetes v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3053,11 +3053,11 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/legacy-cloud-providers/gce k8s.io/legacy-cloud-providers/gce/gcpcredential -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3072,10 +3072,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-20240606123447-44fc19fb7985 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3226,38 +3226,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240606123447-44fc19fb7985 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240606123447-44fc19fb7985 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240507115420-bc2fec27ff5b -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240507115420-bc2fec27ff5b +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240621193825-d0324787c86d +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240621193825-d0324787c86d +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240621193825-d0324787c86d +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240621193825-d0324787c86d +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240621193825-d0324787c86d +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240621193825-d0324787c86d +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240621193825-d0324787c86d +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240621193825-d0324787c86d +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240621193825-d0324787c86d +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240621193825-d0324787c86d +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240621193825-d0324787c86d +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240621193825-d0324787c86d +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240621193825-d0324787c86d +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240621193825-d0324787c86d +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240621193825-d0324787c86d +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240621193825-d0324787c86d +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240621193825-d0324787c86d +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240621193825-d0324787c86d +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240621193825-d0324787c86d +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240621193825-d0324787c86d +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240621193825-d0324787c86d +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240621193825-d0324787c86d +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240621193825-d0324787c86d +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240606123447-44fc19fb7985 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240621193825-d0324787c86d