diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 5b50b32420..25e6a298e5 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=32 KUBE_GIT_VERSION=v1.32.2 -KUBE_GIT_COMMIT=c44e83d45f377c079cebd613a6ad987168462cda +KUBE_GIT_COMMIT=c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 418b0a8616..09ba7a7384 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-02-27-211136 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-02-211136 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index bdd5329339..908847f726 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-02-26-050226 +OCP_VERSION := 4.19.0-0.nightly-2025-02-28-132549 diff --git a/assets/controllers/kube-apiserver/defaultconfig.yaml b/assets/controllers/kube-apiserver/defaultconfig.yaml index b69a1ae3a1..35b3144974 100644 --- a/assets/controllers/kube-apiserver/defaultconfig.yaml +++ b/assets/controllers/kube-apiserver/defaultconfig.yaml @@ -34,11 +34,6 @@ apiServerArguments: - "true" anonymous-auth: - "true" - authorization-mode: - - Scope - - SystemMasters - - RBAC - - Node audit-log-format: - json audit-log-maxbackup: @@ -181,6 +176,11 @@ apiServerArguments: # See issue: golang.org/issue/26162 strict-transport-security-directives: - max-age=31536000,includeSubDomains,preload + authorization-mode: + - Scope + - SystemMasters + - RBAC + - Node authConfig: oauthMetadataFile: "" consolePublicURL: "" diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index e8c479d41d..2809267c3b 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:4832e5d37bcd14d5510025d96f3e1ac1022d4d8b5e69000cdcc06d19ec4b157b + digest: sha256:fbb7dbcb8f21f10d1c87a623271c635cdd6d3229ab671a8dbbd4b79f181a01ca - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:52ee0954fdbcd647a1d83efb048fd8f9bedcbcf53fc5d5512a971edfe386f21b + digest: sha256:79e04a5075395820dea09b42d72c8781f9b5b31f3dd07f415480dc138dd4b953 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 95134463cc..e517f5f4ea 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-02-27-211136" + "base": "4.19.0-0.nightly-arm64-2025-03-02-211136" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17accae06c6875ea8c558b9b68ff0947033f63d0e5c7b45bf2220b14d961fa49", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 0d33f869b6..0542fc4c81 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.19.0-0.nightly-2025-02-26-050226" + "base": "4.19.0-0.nightly-2025-02-28-132549" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4832e5d37bcd14d5510025d96f3e1ac1022d4d8b5e69000cdcc06d19ec4b157b", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52ee0954fdbcd647a1d83efb048fd8f9bedcbcf53fc5d5512a971edfe386f21b" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbb7dbcb8f21f10d1c87a623271c635cdd6d3229ab671a8dbbd4b79f181a01ca", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79e04a5075395820dea09b42d72c8781f9b5b31f3dd07f415480dc138dd4b953" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 3996d28f30..0e39360c3f 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5 + digest: sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc + digest: sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6 @@ -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:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0 - 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:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7 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 c7fcda569c..92a80437b1 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:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd + digest: sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c + digest: sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586 + digest: sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87 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:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee - 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:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9 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 134ba6837f..4dd2224fad 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.19.0-0.nightly-arm64-2025-02-27-211136" + "base": "4.19.0-0.nightly-arm64-2025-03-02-211136" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6" } } 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 7516243f40..3fb7bf2314 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.19.0-0.nightly-2025-02-26-050226" + "base": "4.19.0-0.nightly-2025-02-28-132549" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 8e5f67510e..c35a535fd1 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-02-27-211136" + "base": "4.19.0-0.nightly-arm64-2025-03-02-211136" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c258dc6115d77a23444ee554dc000f5ac0911798960633b849a2a07c519c72a8", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cbcc4a5a74d0bc2044734fcc2696a8a6bdc6fa020e05226e771c815f78ecaf3", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a88e5cff12d4024ced5b3a2047298bafe6d21f43bae9bc193102d26a7a2982", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f330a4d7e61176c25f6e8db53eb268b729f308658287847fc05ac4d0b0baaeef", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91a38df15076858d769d31f6c287bb8722cf5c651d9bedb19f625ee5eb55a5bb", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beefff29b6bdb51adbcc4513623979e87720ba73cd95382024ef5f1f594b8597", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47d02aa98e0aa7e1cd26c4892571e6eedc953d25a77d03292c040adf54257488" diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index b8235d6fb1..b937da67fa 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.19.0-0.nightly-2025-02-26-050226" + "base": "4.19.0-0.nightly-2025-02-28-132549" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7557d9d4b6947c627745e877a78e86d75838ac075fc1bb1118ed747d3e2b4675", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85e75ada48bd1174fb86fbf65bb3e1f3960eca44444d7dd1888dc9af3804ff83", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:446c9e5d80e6cd5da615b4d2d6ce198b0a9f05e1477dfb49939010362ae1787b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:671f739b2a5e1ffabb6479f625c3c5e04b072762ef50e148c402de51da3af2a4", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38579eee0c6105fb7b60b0833389e355c18e0af182f8cdef7643d472d8f3cb7e", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c7757f9dc7df0eea5d235a6670c2edd9ddd2cc80d96ff5f523f3623bca50e82", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6ee3a3dae1c2cfd2cb5b40ec2aaf32e3892a440b169db0b2b02b8fd863d9cb3", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:884d74ad9b58ba18ace986378356651225c0685e57658e93713bbb4002e11459", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8552682e94461d00458c5ec65ec884abbfdb7c10792b17abeb2073fc90f79295", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bfc19f0a062a55a5ce920c6f8823a86e61aac939dadccb0f178c97b0267161c", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5ff365113bc3bfccdcd04070eadeda38046e36d5560dc38f2e099eea1ee3dc5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f29446b2b4d99b8aabd1d067eba73c81e240ed224c69609a77f39629a10697f", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7af909568884422b400bc8f892f80236cc1ced1671a447dcf42c29aa43218041" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59d0cbda982b75259e9acccb856949994d567e00ea82a94a3906df48d3c2c77e" } } diff --git a/etcd/go.mod b/etcd/go.mod index db220eab1e..9bab44e9eb 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -67,7 +67,7 @@ require ( github.com/go-openapi/jsonreference v0.20.4 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v4 v4.5.0 // indirect + github.com/golang-jwt/jwt/v4 v4.5.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -104,12 +104,12 @@ require ( github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.etcd.io/bbolt v1.3.11 // indirect - go.etcd.io/etcd/api/v3 v3.5.17 - go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect - go.etcd.io/etcd/client/v2 v2.305.17 // indirect - go.etcd.io/etcd/client/v3 v3.5.17 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.17 // indirect - go.etcd.io/etcd/raft/v3 v3.5.17 // indirect + go.etcd.io/etcd/api/v3 v3.5.18 + go.etcd.io/etcd/client/pkg/v3 v3.5.18 // indirect + go.etcd.io/etcd/client/v2 v2.305.18 // indirect + go.etcd.io/etcd/client/v3 v3.5.18 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.18 // indirect + go.etcd.io/etcd/raft/v3 v3.5.18 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect go.opentelemetry.io/otel v1.33.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect @@ -144,45 +144,45 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index d02568d909..364e1cb396 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -74,8 +74,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo= +github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -162,32 +162,32 @@ github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f h1:HH+BqfxONWB2kknhC github.com/openshift/api v0.0.0-20250213010142-f5b09d13c01f/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2 h1:Pw/OKhN0r8HZcR4No8qh0QygTvuYsDeZhHsK6T9LC+I= github.com/openshift/build-machinery-go v0.0.0-20250211133638-a00a772ae1a2/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a h1:+zYlT8ikLojupnnbSNt3PJWKrBGroi8gSrBeHpV4t9w= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1:REahb+PGf/XXGcbvc8wLbAX+cdlv5xPof5uOjViMnG4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a h1:Tza8C8nqjPxgPL7ft/tYAMm8/thQ2zA3v9BrYubvbJs= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1:1ZWNv+Rdr2Zlvs1X/eQZcnm3gq/Zdl5VnaRzICRzMb4= -github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:FrztuSuaJG0c7RXCOzT08w+PCugh2kCQXmruNYCpCGA= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a h1:P1hNaYITxt7WJfAjO+LCPZOEjA3cVWJxY8dApIT9soU= -github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:uapEfOMPaJ45CqBYIraLO5+fqyIY2d57nFfxzFwy4D4= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a h1:X7PFfxZQaHmXUDLIo+und9jejO3yFwWIdR+m1nvSnww= -github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:40sqgtGt6ZJNKm8nk8x6LexZakPu+NDl/DCgZTZ69Cc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 h1:xIm9sBfzVUeTg0MA7tRPlb55fH67+AcvojS/mlx/iO4= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 h1:oxZlXpHBYD7HcHLC00zkHreMP7/qi4X4lOhUyDEp+XQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 h1:Tm0i36k2bYHFAKYig+H070tfu0kD6D/ovuQedkks+5w= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 h1:/NAY4dorUJo7AgV0esFRVH3/aey8xKRfOfMexkR55VM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 h1:dC3+dXNqBhTX4NyJimigpDTm0Kj99rHaN0wJnEbwHp0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 h1:YrK63+LvRxHhkyx3MCJlX9afes8kznqyIfOKyzT6yQ8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 h1:Sy6KVDDDmvhyDPRrX7p7P00Nn9gl87+rEWzwjWeX0Tg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:eBxtqfzBf7l+mUHGPbaOYIkQG8SpUTqJLVyclT5JWEQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:b4Ei8dZfabfm97StPm1BTKvmK3DDiUIapjOhQqsUchk= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:/h9Ua1gjVKSOftm8Tc0RQ3uFcEMO2MdfQ1zO/l/S7f4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:4m3dmokRhQY25GKs3DG0hoq3J1EX2xyd6j9ATczk/S0= +github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:gb4CDXuN/OgzUgj+VmUFumLYQ2FUMDC6r/plLIjHPI8= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:FXDSOT7ZYIXLzllHIuGVnKbE/NpIqaoLwO2X2G07aj8= +github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:XBaZHTJt3nLnpS8hMDR55Sxrq76cEC4xWYMBYSY3jcs= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:u69/yR6Cz8Fhvj2+vBoWOCcVy3hOnp5xMPe/P2Jmw0M= +github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:waeL2uw6TdXniXaus105tiK1aSbblIBi21uk8y7D6Ng= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a h1:2AcZuUu2yRCywC2pyxQf5s+GMWPW5ginnlqrDLR07RY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a h1:UDGYhZvFKg8iqwR0Upd4Q+1BT77G9KmywaRm4ugCmOo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a h1:JdeZDKDooqaihVM/LnBSjI8sslIFJ8QVSZ4f4xc0ZWI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a h1:K172eszQsupslwDpAP8Gwfxo0/7W3Ng92SrIWAr1cR8= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a h1:prjcKq33huy69cyomXzpnnvZnecl1RzCvZBKcnf1kko= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a h1:iwwaDHSHOW5SuLC9U+ALZak82BKhmcK4v9m+mISwn0M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a h1:r851QAitdZRzDQC+z/sA/mv5YAZWtcSXzNaaKVOWBk0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= @@ -254,8 +254,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= -go.etcd.io/etcd/client/v2 v2.305.17 h1:ajFukQfI//xY5VuSeuUw4TJ4WnNR2kAFfV/P0pDdPMs= -go.etcd.io/etcd/client/v2 v2.305.17/go.mod h1:EttKgEgvwikmXN+b7pkEWxDZr6sEaYsqCiS3k4fa/Vg= +go.etcd.io/etcd/client/v2 v2.305.18 h1:jT7ANzlD47yu7t6ZGBr1trUDEN6P0RG9Wnyio6XP2Qo= +go.etcd.io/etcd/client/v2 v2.305.18/go.mod h1:JikXfwJymsNv633PzkAb5xnVZmROgNWr4E68YCEz4jo= go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= diff --git a/etcd/vendor/github.com/golang-jwt/jwt/v4/parser.go b/etcd/vendor/github.com/golang-jwt/jwt/v4/parser.go index c0a6f69279..9dd36e5a5a 100644 --- a/etcd/vendor/github.com/golang-jwt/jwt/v4/parser.go +++ b/etcd/vendor/github.com/golang-jwt/jwt/v4/parser.go @@ -36,19 +36,21 @@ func NewParser(options ...ParserOption) *Parser { return p } -// Parse parses, validates, verifies the signature and returns the parsed token. -// keyFunc will receive the parsed token and should return the key for validating. +// Parse parses, validates, verifies the signature and returns the parsed token. keyFunc will +// receive the parsed token and should return the key for validating. func (p *Parser) Parse(tokenString string, keyFunc Keyfunc) (*Token, error) { return p.ParseWithClaims(tokenString, MapClaims{}, keyFunc) } -// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object implementing the Claims -// interface. This provides default values which can be overridden and allows a caller to use their own type, rather -// than the default MapClaims implementation of Claims. +// ParseWithClaims parses, validates, and verifies like Parse, but supplies a default object +// implementing the Claims interface. This provides default values which can be overridden and +// allows a caller to use their own type, rather than the default MapClaims implementation of +// Claims. // -// Note: If you provide a custom claim implementation that embeds one of the standard claims (such as RegisteredClaims), -// make sure that a) you either embed a non-pointer version of the claims or b) if you are using a pointer, allocate the -// proper memory for it before passing in the overall claims, otherwise you might run into a panic. +// Note: If you provide a custom claim implementation that embeds one of the standard claims (such +// as RegisteredClaims), make sure that a) you either embed a non-pointer version of the claims or +// b) if you are using a pointer, allocate the proper memory for it before passing in the overall +// claims, otherwise you might run into a panic. func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyfunc) (*Token, error) { token, parts, err := p.ParseUnverified(tokenString, claims) if err != nil { @@ -85,12 +87,17 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf return token, &ValidationError{Inner: err, Errors: ValidationErrorUnverifiable} } + // Perform validation + token.Signature = parts[2] + if err := token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { + return token, &ValidationError{Inner: err, Errors: ValidationErrorSignatureInvalid} + } + vErr := &ValidationError{} // Validate Claims if !p.SkipClaimsValidation { if err := token.Claims.Valid(); err != nil { - // If the Claims Valid returned an error, check if it is a validation error, // If it was another error type, create a ValidationError with a generic ClaimsInvalid flag set if e, ok := err.(*ValidationError); !ok { @@ -98,22 +105,14 @@ func (p *Parser) ParseWithClaims(tokenString string, claims Claims, keyFunc Keyf } else { vErr = e } + return token, vErr } } - // Perform validation - token.Signature = parts[2] - if err = token.Method.Verify(strings.Join(parts[0:2], "."), token.Signature, key); err != nil { - vErr.Inner = err - vErr.Errors |= ValidationErrorSignatureInvalid - } - - if vErr.valid() { - token.Valid = true - return token, nil - } + // No errors so far, token is valid. + token.Valid = true - return token, vErr + return token, nil } // ParseUnverified parses the token but doesn't validate the signature. diff --git a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go index bfb0328efe..1518226a2a 100644 --- a/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go +++ b/etcd/vendor/github.com/openshift/microshift/pkg/util/net.go @@ -173,7 +173,23 @@ func selectIPFromHostInterface(nodeIP string) (string, error) { if err != nil { return "", err } - + // Sort all interfaces by index. Interfaces are listed in the same ordering as + // in /proc/net/dev. The ordering is not based in interface index, and it is + // not guaranteed to list system interfaces first. Veth interfaces from containers + // could get listed first and retrieve the wrong node IP. + // The index is assigned sequentially depending on the order of kmods loading + // and interface creation. Since the interfaces we are looking for belong to + // NetworkManager and the ones that could get a wrong node IP depend on a systemd + // unit that requires system networking to be ready, we can assume the lower + // indices are safe to use. + slices.SortFunc(ifaces, func(a, b tcpnet.Interface) int { + if a.Index > b.Index { + return 1 + } else if a.Index < b.Index { + return -1 + } + return 0 + }) // get list of interfaces for _, i := range ifaces { if i.Name == "br-ex" { 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 ca6efc5136..15c99a2c28 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.17" + Version = "3.5.18" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/etcd/vendor/go.etcd.io/etcd/client/v3/lease.go b/etcd/vendor/go.etcd.io/etcd/client/v3/lease.go index 4e7d1caf83..4877ee9496 100644 --- a/etcd/vendor/go.etcd.io/etcd/client/v3/lease.go +++ b/etcd/vendor/go.etcd.io/etcd/client/v3/lease.go @@ -263,6 +263,12 @@ func (l *lessor) Leases(ctx context.Context) (*LeaseLeasesResponse, error) { return nil, ContextError(ctx, err) } +// To identify the context passed to `KeepAlive`, a key/value pair is +// attached to the context. The key is a `keepAliveCtxKey` object, and +// the value is the pointer to the context object itself, ensuring +// uniqueness as each context has a unique memory address. +type keepAliveCtxKey struct{} + func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAliveResponse, error) { ch := make(chan *LeaseKeepAliveResponse, LeaseResponseChSize) @@ -277,6 +283,10 @@ func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAl default: } ka, ok := l.keepAlives[id] + + if ctx.Done() != nil { + ctx = context.WithValue(ctx, keepAliveCtxKey{}, &ctx) + } if !ok { // create fresh keep alive ka = &keepAlive{ @@ -347,7 +357,7 @@ func (l *lessor) keepAliveCtxCloser(ctx context.Context, id LeaseID, donec <-cha // close channel and remove context if still associated with keep alive for i, c := range ka.ctxs { - if c == ctx { + if c.Value(keepAliveCtxKey{}) == ctx.Value(keepAliveCtxKey{}) { close(ka.chs[i]) ka.ctxs = append(ka.ctxs[:i], ka.ctxs[i+1:]...) ka.chs = append(ka.chs[:i], ka.chs[i+1:]...) 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 08fe6606d2..30cbff3d22 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 @@ -81,11 +81,23 @@ type Etcd struct { Server *etcdserver.EtcdServer - cfg Config - stopc chan struct{} - errc chan error + cfg Config + // closeOnce is to ensure `stopc` is closed only once, no matter + // how many times the Close() method is called. closeOnce sync.Once + // stopc is used to notify the sub goroutines not to send + // any errors to `errc`. + stopc chan struct{} + // errc is used to receive error from sub goroutines (including + // client handler, peer handler and metrics handler). It's closed + // after all these sub goroutines exit (checked via `wg`). Writers + // should avoid writing after `stopc` is closed by selecting on + // reading from `stopc`. + errc chan error + + // wg is used to track the lifecycle of all sub goroutines created by `StartEtcd`. + wg sync.WaitGroup } type peerListener struct { @@ -111,7 +123,7 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) { if !serving { // errored before starting gRPC server for serveCtx.serversC for _, sctx := range e.sctxs { - close(sctx.serversC) + sctx.close() } } e.Close() @@ -370,6 +382,24 @@ func (e *Etcd) Config() Config { // Close gracefully shuts down all servers/listeners. // Client requests will be terminated with request timeout. // After timeout, enforce remaning requests be closed immediately. +// +// The rough workflow to shut down etcd: +// 1. close the `stopc` channel, so that all error handlers (child +// goroutines) won't send back any errors anymore; +// 2. stop the http and grpc servers gracefully, within request timeout; +// 3. close all client and metrics listeners, so that etcd server +// stops receiving any new connection; +// 4. call the cancel function to close the gateway context, so that +// all gateway connections are closed. +// 5. stop etcd server gracefully, and ensure the main raft loop +// goroutine is stopped; +// 6. stop all peer listeners, so that it stops receiving peer connections +// and messages (wait up to 1-second); +// 7. wait for all child goroutines (i.e. client handlers, peer handlers +// and metrics handlers) to exit; +// 8. close the `errc` channel to release the resource. Note that it's only +// safe to close the `errc` after step 7 above is done, otherwise the +// child goroutines may send errors back to already closed `errc` channel. func (e *Etcd) Close() { fields := []zap.Field{ zap.String("name", e.cfg.Name), @@ -439,6 +469,7 @@ func (e *Etcd) Close() { } } if e.errc != nil { + e.wg.Wait() close(e.errc) } } @@ -598,7 +629,9 @@ func (e *Etcd) servePeers() (err error) { // start peer servers in a goroutine for _, pl := range e.Peers { + e.wg.Add(1) go func(l *peerListener) { + defer e.wg.Done() u := l.Addr().String() e.cfg.logger.Info( "serving peer traffic", @@ -782,7 +815,9 @@ func (e *Etcd) serveClients() (err error) { // start client servers in each goroutine for _, sctx := range e.sctxs { + e.wg.Add(1) go func(s *serveCtx) { + defer e.wg.Done() e.errHandler(s.serve(e.Server, &e.cfg.ClientTLSInfo, h, e.errHandler, e.grpcGatewayDial(splitHttp), splitHttp, gopts...)) }(sctx) } @@ -870,7 +905,9 @@ func (e *Etcd) serveMetrics() (err error) { return err } e.metricsListeners = append(e.metricsListeners, ml) + e.wg.Add(1) go func(u url.URL, ln net.Listener) { + defer e.wg.Done() e.cfg.logger.Info( "serving metrics", zap.String("address", u.String()), diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/serve.go b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/serve.go index 91ec6e9a37..55ffe3743f 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/embed/serve.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/embed/serve.go @@ -16,12 +16,14 @@ package embed import ( "context" + "errors" "fmt" "io/ioutil" defaultLog "log" "net" "net/http" "strings" + "sync" etcdservergw "go.etcd.io/etcd/api/v3/etcdserverpb/gw" "go.etcd.io/etcd/client/pkg/v3/transport" @@ -58,12 +60,23 @@ type serveCtx struct { insecure bool httpOnly bool + // ctx is used to control the grpc gateway. Terminate the grpc gateway + // by calling `cancel` when shutting down the etcd. ctx context.Context cancel context.CancelFunc userHandlers map[string]http.Handler serviceRegister func(*grpc.Server) - serversC chan *servers + + // serversC is used to receive the http and grpc server objects (created + // in `serve`), both of which will be closed when shutting down the etcd. + // Close it when `serve` returns or when etcd fails to bootstrap. + serversC chan *servers + // closeOnce is to ensure `serversC` is closed only once. + closeOnce sync.Once + + // wg is used to track the lifecycle of all sub goroutines created by `serve`. + wg sync.WaitGroup } type servers struct { @@ -98,7 +111,15 @@ func (sctx *serveCtx) serve( splitHttp bool, gopts ...grpc.ServerOption) (err error) { logger := defaultLog.New(ioutil.Discard, "etcdhttp", 0) - <-s.ReadyNotify() + + // Make sure serversC is closed even if we prematurely exit the function. + defer sctx.close() + + select { + case <-s.StoppingNotify(): + return errors.New("server is stopping") + case <-s.ReadyNotify(): + } sctx.lg.Info("ready to serve client requests") @@ -113,8 +134,6 @@ func (sctx *serveCtx) serve( servElection := v3election.NewElectionServer(v3c) servLock := v3lock.NewLockServer(v3c) - // Make sure serversC is closed even if we prematurely exit the function. - defer close(sctx.serversC) var gwmux *gw.ServeMux if s.Cfg.EnableGRPCGateway { // GRPC gateway connects to grpc server via connection provided by grpc dial. @@ -171,13 +190,17 @@ func (sctx *serveCtx) serve( server = m.Serve httpl := m.Match(cmux.HTTP1()) + sctx.wg.Add(1) go func(srvhttp *http.Server, tlsLis net.Listener) { + defer sctx.wg.Done() errHandler(srvhttp.Serve(tlsLis)) }(srv, httpl) if grpcEnabled { grpcl := m.Match(cmux.HTTP2()) + sctx.wg.Add(1) go func(gs *grpc.Server, l net.Listener) { + defer sctx.wg.Done() errHandler(gs.Serve(l)) }(gs, grpcl) } @@ -237,11 +260,13 @@ func (sctx *serveCtx) serve( } else { server = m.Serve - tlsl, err := transport.NewTLSListener(m.Match(cmux.Any()), tlsinfo) - if err != nil { - return err + tlsl, tlsErr := transport.NewTLSListener(m.Match(cmux.Any()), tlsinfo) + if tlsErr != nil { + return tlsErr } + sctx.wg.Add(1) go func(srvhttp *http.Server, tlsl net.Listener) { + defer sctx.wg.Done() errHandler(srvhttp.Serve(tlsl)) }(srv, tlsl) } @@ -254,7 +279,11 @@ func (sctx *serveCtx) serve( ) } - return server() + err = server() + sctx.close() + // ensure all goroutines, which are created by this method, to complete before this method returns. + sctx.wg.Wait() + return err } func configureHttpServer(srv *http.Server, cfg config.ServerConfig) error { @@ -307,7 +336,9 @@ func (sctx *serveCtx) registerGateway(dial func(ctx context.Context) (*grpc.Clie return nil, err } } + sctx.wg.Add(1) go func() { + defer sctx.wg.Done() <-ctx.Done() if cerr := conn.Close(); cerr != nil { sctx.lg.Warn( @@ -497,3 +528,9 @@ func (sctx *serveCtx) registerTrace() { evf := func(w http.ResponseWriter, r *http.Request) { trace.RenderEvents(w, r, true) } sctx.registerUserHandler("/debug/events", http.HandlerFunc(evf)) } + +func (sctx *serveCtx) close() { + sctx.closeOnce.Do(func() { + close(sctx.serversC) + }) +} 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 a87f4266f7..6d8097de9d 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 @@ -632,7 +632,7 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) { srv.kv = mvcc.New(srv.Logger(), srv.be, srv.lessor, mvccStoreConfig) kvindex := ci.ConsistentIndex() - srv.lg.Debug("restore consistentIndex", zap.Uint64("index", kvindex)) + srv.lg.Info("restore consistentIndex", zap.Uint64("index", kvindex)) if beExist { // TODO: remove kvindex != 0 checking when we do not expect users to upgrade @@ -2139,6 +2139,7 @@ func (s *EtcdServer) publish(timeout time.Duration) { Val: string(b), } + // gofail: var beforePublishing struct{} for { ctx, cancel := context.WithTimeout(s.ctx, timeout) _, err := s.Do(ctx, req) diff --git a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/key_index.go b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/key_index.go index d38b0933d9..dfb5dcbee2 100644 --- a/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/key_index.go +++ b/etcd/vendor/go.etcd.io/etcd/server/v3/mvcc/key_index.go @@ -119,6 +119,15 @@ func (ki *keyIndex) restore(lg *zap.Logger, created, modified revision, ver int6 keysGauge.Inc() } +// restoreTombstone is used to restore a tombstone revision, which is the only +// revision so far for a key. We don't know the creating revision (i.e. already +// compacted) of the key, so set it empty. +func (ki *keyIndex) restoreTombstone(lg *zap.Logger, main, sub int64) { + ki.restore(lg, revision{}, revision{main, sub}, 1) + ki.generations = append(ki.generations, generation{}) + keysGauge.Dec() +} + // tombstone puts a revision, pointing to a tombstone, to the keyIndex. // It also creates a new empty generation in the keyIndex. // It returns ErrRevisionNotFound when tombstone on an empty generation. 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 fb81af6ec7..f0450537db 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 @@ -484,8 +484,12 @@ func restoreIntoIndex(lg *zap.Logger, idx index) (chan<- revKeyValue, <-chan int continue } ki.put(lg, rev.main, rev.sub) - } else if !isTombstone(rkv.key) { - ki.restore(lg, revision{rkv.kv.CreateRevision, 0}, rev, rkv.kv.Version) + } else { + if isTombstone(rkv.key) { + ki.restoreTombstone(lg, rev.main, rev.sub) + } else { + ki.restore(lg, revision{rkv.kv.CreateRevision, 0}, rev, rkv.kv.Version) + } idx.Insert(ki) kiCache[rkv.kstr] = ki } diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 51e0fedf42..79f353419c 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -77,7 +77,7 @@ github.com/gogo/protobuf/gogoproto github.com/gogo/protobuf/proto github.com/gogo/protobuf/protoc-gen-gogo/descriptor github.com/gogo/protobuf/sortkeys -# github.com/golang-jwt/jwt/v4 v4.5.0 +# github.com/golang-jwt/jwt/v4 v4.5.1 ## explicit; go 1.16 github.com/golang-jwt/jwt/v4 # github.com/golang/protobuf v1.5.4 @@ -282,7 +282,7 @@ github.com/xlab/treeprint # go.etcd.io/bbolt v1.3.11 ## explicit; go 1.22 go.etcd.io/bbolt -# go.etcd.io/etcd/api/v3 v3.5.17 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -291,7 +291,7 @@ go.etcd.io/etcd/api/v3/membershippb go.etcd.io/etcd/api/v3/mvccpb go.etcd.io/etcd/api/v3/v3rpc/rpctypes go.etcd.io/etcd/api/v3/version -# go.etcd.io/etcd/client/pkg/v3 v3.5.17 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -301,17 +301,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.17 +# go.etcd.io/etcd/client/v2 v2.305.18 ## explicit; go 1.22 go.etcd.io/etcd/client/v2 -# go.etcd.io/etcd/client/v3 v3.5.17 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/client/v3 v3.5.18 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 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.17 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/pkg/v3 v3.5.18 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/pkg/v3/adt go.etcd.io/etcd/pkg/v3/contention @@ -328,14 +328,14 @@ go.etcd.io/etcd/pkg/v3/runtime go.etcd.io/etcd/pkg/v3/schedule go.etcd.io/etcd/pkg/v3/traceutil go.etcd.io/etcd/pkg/v3/wait -# go.etcd.io/etcd/raft/v3 v3.5.17 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/raft/v3 v3.5.18 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/raft/v3 go.etcd.io/etcd/raft/v3/confchange go.etcd.io/etcd/raft/v3/quorum go.etcd.io/etcd/raft/v3/raftpb go.etcd.io/etcd/raft/v3/tracker -# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/server/v3 v3.5.16 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/server/v3/auth go.etcd.io/etcd/server/v3/config @@ -631,7 +631,7 @@ gopkg.in/natefinch/lumberjack.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -692,7 +692,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -754,18 +754,18 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 k8s.io/apiserver/pkg/authentication/user -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -924,7 +924,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -961,7 +961,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1078,41 +1078,41 @@ sigs.k8s.io/yaml/goyaml.v3 # github.com/openshift/microshift/pkg/config => ../pkg/config # github.com/openshift/microshift/pkg/util/cryptomaterial => ../pkg/util/cryptomaterial # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20241118170732-914783cae63a -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a diff --git a/go.mod b/go.mod index 7f4eaab30c..03b074fa71 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.10.0 github.com/vishvananda/netlink v1.3.1-0.20240905180732-b1ce50cfa9be - go.etcd.io/etcd/client/pkg/v3 v3.5.17 + go.etcd.io/etcd/client/pkg/v3 v3.5.18 go.etcd.io/etcd/client/v3 v3.5.16 golang.org/x/sys v0.30.0 gopkg.in/yaml.v3 v3.0.1 @@ -158,7 +158,7 @@ require ( github.com/stoewer/go-strcase v1.3.0 // 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.17 // indirect + go.etcd.io/etcd/api/v3 v3.5.18 // indirect go.opentelemetry.io/auto/sdk v1.1.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.53.0 // indirect @@ -214,47 +214,47 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250225193844-c44e83d45f37 // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250225193844-c44e83d45f37 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250225193844-c44e83d45f37 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250228003140-c3a6a36c352a // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250228003140-c3a6a36c352a // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250228003140-c3a6a36c352a // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes -replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 // staging kubernetes +replace k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a // staging kubernetes diff --git a/go.sum b/go.sum index 2ed7b985eb..2e421bf825 100644 --- a/go.sum +++ b/go.sum @@ -251,68 +251,68 @@ github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a h1:duO3JMrUOqV github.com/openshift/client-go v0.0.0-20250131180035-f7ec47e2d87a/go.mod h1:Qw3ThpzVZ0bfTILpBNYg4LGyjtNxfyCiGh/uDLOOTP8= github.com/openshift/cluster-policy-controller v0.0.0-20250219201634-5cc0d0ecd3cd h1:Zr0lH3/BdzNjGElDqKt9Tn+Fp6VRBXdKr3XC3kpppbI= github.com/openshift/cluster-policy-controller v0.0.0-20250219201634-5cc0d0ecd3cd/go.mod h1:O5k9FNYPPYp5xt+1batZMRgfXihz26l9pGKKUfLoHJA= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a h1:+zYlT8ikLojupnnbSNt3PJWKrBGroi8gSrBeHpV4t9w= -github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1:REahb+PGf/XXGcbvc8wLbAX+cdlv5xPof5uOjViMnG4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a h1:Tza8C8nqjPxgPL7ft/tYAMm8/thQ2zA3v9BrYubvbJs= -github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo= -github.com/openshift/kubernetes v0.0.0-20250225193844-c44e83d45f37 h1:8Q/ViRqvFB7rp1eDxrvjmlaLvHe7nhh7bgNISUcuhks= -github.com/openshift/kubernetes v0.0.0-20250225193844-c44e83d45f37/go.mod h1:FictuFSETHMUkYEGrGmXTQaMlN2kkepEKa5WEHoLG7E= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:eBxtqfzBf7l+mUHGPbaOYIkQG8SpUTqJLVyclT5JWEQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:b4Ei8dZfabfm97StPm1BTKvmK3DDiUIapjOhQqsUchk= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa h1:/h9Ua1gjVKSOftm8Tc0RQ3uFcEMO2MdfQ1zO/l/S7f4= +github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= +github.com/openshift/kubernetes v0.0.0-20250228003140-c3a6a36c352a h1:Qcyg523KEgIgYBNhsTLdlvgY5lce9g59jrQHMh5KRlY= +github.com/openshift/kubernetes v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:ETEEqbxaz6PnlwjSXtesdzwfm8mt/7jsGcr6wQz6K0Q= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc h1:CWT77Ik9sZKya4ZMBtRLB3b/05Yq5M5BI2RqddZD02c= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc/go.mod h1:mVJrzaBTOQrLN5fh90Lr9bxlnln151d6lk4G+DEmLeI= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 h1:xIm9sBfzVUeTg0MA7tRPlb55fH67+AcvojS/mlx/iO4= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 h1:z3SF8S16+PyR5VEbhnZwdkpHvZ5dJKvaLpMjvDtX9nM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 h1:oxZlXpHBYD7HcHLC00zkHreMP7/qi4X4lOhUyDEp+XQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 h1:Tm0i36k2bYHFAKYig+H070tfu0kD6D/ovuQedkks+5w= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 h1:/NAY4dorUJo7AgV0esFRVH3/aey8xKRfOfMexkR55VM= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 h1:dC3+dXNqBhTX4NyJimigpDTm0Kj99rHaN0wJnEbwHp0= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 h1:35OQV7EY+p/gsM9XEwty+5pyJgXB2dvQS0RWk63cghI= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37 h1:3Qim+bqjwP3qWivd+EZGTuIMhAZn3sCZVp9covs6Dn4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 h1:YrK63+LvRxHhkyx3MCJlX9afes8kznqyIfOKyzT6yQ8= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 h1:lL9rM4ozwlQITl2EKAS2NIlAG2g1JmaiZJrfhuNwNy0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 h1:Dh0x2LflanpoAqegZZNHWONZ1oqZa7U5sNLnmXpMVXI= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 h1:kxBfH0WKCNAKtthOLHigflL9c131jtCgf8kFJs6YcZE= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 h1:YLzH3VqTrrMyzTD97nG2hNecHPS2oENaWO2OsHFNHro= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 h1:2uYjSLZno5Y/Jv+qtOMBEJxsIjbbwBTEmGKuOFMXFRw= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 h1:T6pDMyKbbzYyghvfBQfz2KUeZ/DQ/MHdZVjJ9eEhQpc= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 h1:c+6CXUAJt6ngLXUVeQeywEKU4aBwFekwPzeIj2lRiqQ= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 h1:CY4VQzacXvs4m/K2Pdk2wGpfnIXzPe7onqX5LIXzb/A= -github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 h1:MARL4KQ03DgAq5+Czxnv9m+pPFe1BPshrQVpF4XfsSw= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 h1:eMjtkzF13SigU7GKLO5/eXkPQuUr35vZHz+rHgW7QJM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 h1:r/7cj5Uoh3BtQlV34+JrlI0DI9uA2Fosb2hwGDpETLI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37 h1:QbEl0veoz5dWOQ8wL9U7r+YSeuS/9e3LyqgsKRv/bws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 h1:Sy6KVDDDmvhyDPRrX7p7P00Nn9gl87+rEWzwjWeX0Tg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37 h1:B/hzSD3YU7Eks4rJvsGvQ0lpvSGgmDqegGypdn0gnf4= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 h1:24AFxE/mtxw5OwDzOdkffQO22e8taHPdUVOk9Kqkdzo= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37 h1:YG30eDvmUrNEZuXRkt9IbzUuB+WjeXhyIarNb1UyBQg= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 h1:F8aGABMNpdXctpjgXyF9lm9OgX2NCfKMzawnDAp2SCg= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a h1:2AcZuUu2yRCywC2pyxQf5s+GMWPW5ginnlqrDLR07RY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:PXATPrizf40XG7caGH9r9qdYgUAJBqDa/s6i2hDU1Us= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a h1:N6HSwQheGyiKMAJKnOrJrOIORqXgcdltA/8mqJfydcA= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:y79okk+2JwH3UYZXNtHla4F5wRvwM0a10bXWeOWqHXQ= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a h1:UDGYhZvFKg8iqwR0Upd4Q+1BT77G9KmywaRm4ugCmOo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:D9TPIbbk/g9FXxVr7G9GQBxEEgSf2Zb4ISLuwJKaoOg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a h1:JdeZDKDooqaihVM/LnBSjI8sslIFJ8QVSZ4f4xc0ZWI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:pK4RgwS+SKk1OrkSFsmPPgtWCURPeqOpQ/DmWZ6kKss= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a h1:K172eszQsupslwDpAP8Gwfxo0/7W3Ng92SrIWAr1cR8= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:62aNvJLPzLZy7i3OFOCZEi7jZq/Qgu20g9o1gFrHOeo= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a h1:prjcKq33huy69cyomXzpnnvZnecl1RzCvZBKcnf1kko= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:osLkL6Y05PrvsnN8Y4VvF7WhT8Rhltj8n3si6gsfa8I= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a h1:r6JHgnAu75Ck0FjgYG9vu31mq9oieyrcNRm7Denjoto= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:1Y0C45cj5HUz6T2zCd/rbsFKVVUtxBWB1WJc3ksgino= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a h1:cQkShYpIEcuVtghWXDBXOr/557LoLLTU+r5ROYfkQX8= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:ZC4TOTM6y6/3o5l0X0UAj/xYI4FhhW2X1kf4H7aym+4= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a h1:iwwaDHSHOW5SuLC9U+ALZak82BKhmcK4v9m+mISwn0M= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:CeSMAQiDPBLz3tybbU3C4F6UWmNE+MmaTLas/4vd5IE= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a h1:JQxIpVEFR/5OLpBnwtJsyszua4Osci7m/Q+Lw5u2iSY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:BqZv1ycl+iUCtUH94v2/bw29nXFoA9ZxU5HiCld5UuM= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a h1:IYQR32/zeKoHA3bNXF1qBtSWMlATdExOH7v5IsUGSf4= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:G2ofVSclHMBjE4px9vYy5N1b8103cQrKpIAwkHIQu4g= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a h1:BBU2fINis1TOcQMHHp/IIe2XgR3ppp/dik12QT0Zaw4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:g5RiEG3qLdo0/6ULdxWcfVjtDlJlxfmEvk8HnvVKgI8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a h1:00zzYD7+shsKzZ0THFG0a0MzSR0oshziaD8ew+0vJh8= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:oQJlDoAmJUdRvVPlROBdBIfceFKY2TRjK0ah+6I8jAI= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a h1:7uBjGk/DvlRfxUwv+WhUvUfmVL3KS6hPlIFmosIe9Cg= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:oGwCVeWGOp5ydzljG3HwHeYSTg0AkU8AVVI6WA7p/NQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a h1:LQBU1BcHQeSaLcTw3h8+tAoWvk1NBof6MEmiebPBaHY= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:lHc2r9QqTP5jQ/qzHRjEjvq+P2pMIJxH3pW2OIeKGm4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a h1:tY60//T+VidmyIwFPFDuT5e3TnIcb3O1/njZeudOEi4= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:nSx2vdLD5OQVnuLVXCifKu3zFm6P3PznHfop+52MxKc= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a h1:b/puJup8DtBxMoDnieeBGXY/SlqOIaP5jMh3oKELwiY= +github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:cYoh1BjUit+0mmm1QFiHHIvFRp5NuJ/PtXFjqU6lG2I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a h1:BVODBaC3s+3bcCMeLbn9yf+82+XnY/rD7W6nMQCzZE4= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:WwxOP90Kv6tPghVc5qa01Rt3aX5eU5SQMUJ8duaa6tE= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a h1:jS3iowD4JzG22115F/LJDUq9NsW58DKtFesL040kUog= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:0G+pIl5ZSz2OJTbaNrYgYDas3AAuLuyb6f7yp67vUc0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a h1:qV2yvR8FBVYWxK8JGgSoCdm0BQFQYS+qy0CXZW9YVLY= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:EWY/Tjbx2eTaH5kShdlrf++Xp5t4USpp1OFJYMldlL4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a h1:58JMAGowWZFCAWc0fT7FqcqirRm6W4JRBFZQUwkOX00= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:g8ueMAVzUqNpdqLNTOC39CTx0uw8xOA8Rr6YYN9Csmc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a h1:r851QAitdZRzDQC+z/sA/mv5YAZWtcSXzNaaKVOWBk0= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:eUOhccfuBuDXD7CuDtMfg3phiyI+FMtOQV60/SOPw1k= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a h1:EpDvmXasJUKsc/i8cwrTP4YOeFpaq6iPyXwVXV8/j7U= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:KDLFmWxF6aaZOjAfLBQa6WKAgolILaDhFOHAVXhtPkI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a h1:M596q1fWK+q+jz+llHaq0HLOG4TSwisk/EhD5xqw6DI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:dCu3XCh/k8g/v427mYZHLo67K6rOwLBAFEWvu0anj88= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a h1:0OSgbUvx8E483mt6s56CQraemQlf12E9Q6NPpoLQk1k= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a h1:8AMV/wr9X713FEKM/N4K3o+y79UNzqlopV5fi3DZPq4= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a/go.mod h1:mwfS00zLOJUpOmV4dAXY/mstuDnRfVI+094R5F41K00= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2 h1:y6VYcutLuJEXDeE/EUMYMcJWyhlxuSg8DbLBajMBJy8= github.com/openshift/library-go v0.0.0-20250217144305-c917e6d528b2/go.mod h1:GHwvopE5KXXCz4ULHp871sTPLLW+FB+hu/RIzlNwxx8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 h1:AKx/w1qpS8We43bsRgf8Nll3CGlDHpr/WAXvuedTNZI= diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index afed26be37..01d046a41f 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:38579eee0c6105fb7b60b0833389e355c18e0af182f8cdef7643d472d8f3cb7e" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5ff365113bc3bfccdcd04070eadeda38046e36d5560dc38f2e099eea1ee3dc5" 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 7798d43845..ee060e08a1 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:f330a4d7e61176c25f6e8db53eb268b729f308658287847fc05ac4d0b0baaeef" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91a38df15076858d769d31f6c287bb8722cf5c651d9bedb19f625ee5eb55a5bb" 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 6209b1e18c..324940c54c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +1,123 @@ -- oc image-arm64 b2f8216d285c2ec38acc7aa8c41a5689062b61c8 to 514a4581b8a6b8b0aef5832e50adf1037ffd9566 +- api embedded-component 544b3ca4e8f59633ced91c3f93fa4b67a87dd102 to 1ee1ef83110046a60c1b083b09ee1f1506913793 + - 6b76c18e 2025-02-26T10:37:18-05:00 operators/v1: reject new node statuses with current or target revision set + - 275cd402 2025-02-26T10:00:29-05:00 Fix FeatureGateNewOLMCatalogdAPIV1Metas spelling error + - 347c75c7 2025-02-25T10:22:57-05:00 Add PKI field with SigstoreImageVerificationPKI fg to (cluster)imagepolicy + +- cluster-kube-apiserver-operator embedded-component f743f844173d77dbd2a0c80d1f0158c700767400 to 34af639409ff04da7e89f214c804145587e9334e + - 613134b 2025-02-27T13:11:27+01:00 MON-4129: slos: accomodate for Prometheus v3 "le" normalization + - a730266 2025-02-26T10:04:58+01:00 MON-4129: revert https://github.com/openshift/cluster-kube-apiserver-operator/pull/1784 + - 0e78d80 2025-02-03T15:14:28-05:00 targetconfigcontroller: inject authorization-mode just in case observer doesn't run + - 386c3c6 2025-02-03T15:14:28-05:00 observeAuthMode: drop authorization-mode from default config and specify strictly with observer + - e4c99d6 2024-12-19T09:50:08-05:00 add MinimumKubeletVersion authorization-mode if feature is on + - 607e4fb 2024-12-19T09:50:08-05:00 configobserver: add minimumkubeletversion + +- cluster-kube-controller-manager-operator embedded-component 9a7a572080a663bda581c0567e3921a99acd993e to 6a932ac83494daf0cf6eecd83068ce7a2c665238 + - 01cdb57 2025-02-21T09:23:01+08:00 readme: describe mapping between logLevel and log level + +- cluster-network-operator embedded-component ff96ab47006095ad40478fa72d586ae5f33148e1 to d09028dfda8c632e4c4730319b9f07f0ac92d82a + - ac08fa2 2025-02-25T13:27:57-08:00 Add "centos" to supported OS id's + +- etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb to d36de75cb3fa96e25893d7b824b01c177490a261 + - 00cfb7b5 2025-02-01T21:44:55+01:00 DOWNSTREAM: : add tls min/max version to grpc proxy + - 2d9b4619 2025-02-01T21:44:20+01:00 DOWNSTREAM: : ETCD-696: Add rev bumping to force-new-cluster + - 33c01d92 2025-02-01T21:44:09+01:00 Migrate Dockerfile.art for Konflux + - a4926df5 2025-02-01T21:43:57+01:00 Add support for cachi2 based deps Konflux is replacing RH's internal build system OSBS. OSBS supported a build-time dependency injection system called "cachito". Konflux replaces this with "cachi2" which works differently. REMOTE_SOURCES no longer need to be copied into place and there is no need to source cachito's environment information (Konflux automatically rewrites the Dockerfile to source cachi2/cachi2.env before running the original RUN commands). Additionally, cachito appears to have provided go.sum dependencies whereas cachi2 requires all build-time dependencies in go.mod. Missing dependencies are added to go.mod as // indirect in this change. + - 08044e8f 2025-02-01T21:42:58+01:00 DOWNSTREAM : resolve merge conflicts + - 52b53a8e 2025-02-01T21:42:45+01:00 NO-JIRA: use golang 1.22 image + - 049c0809 2025-02-01T21:42:31+01:00 DOWNSTREAM: : ETCD-656: Automate datadir move after quorum-restore + - 5bca08ec 2025-01-25T08:14:51+13:00 version: bump up to 3.5.18 + - 0c8e7b19 2025-01-22T15:10:06+00:00 Ensure all goroutines created by StartEtcd to exit before closing the errc + - c6fcd270 2025-01-21T16:43:03-05:00 mvcc: restore tombstone index if it's first revision + - 3ff20e6f 2025-01-16T15:27:00-08:00 Bump go toolchain to 1.22.11 + - 80b0a73e 2025-01-11T07:17:00+00:00 Avoid deadlock in etcd.Close when stopping during bootstrapping + - e5b7e089 2025-01-10T16:16:10+00:00 etcdutl/etcdutl: use datadir package to build wal/snapdir + - 9b241941 2025-01-10T06:37:53+00:00 Remove duplicated <-s.ReadyNotify() + - b9a7aed9 2025-01-10T06:32:12+00:00 Do not wait for ready notify if the server is stopping + - 8943d8fc 2025-01-09T16:26:23-08:00 Update release_notes.tpl.txt + - f627f57e 2025-01-09T15:06:20-08:00 bump golang.org/x/net from 0.25.0 to 0.34.0 + - c5d14b46 2025-01-09T12:27:17-08:00 bump golang.org/x/crypto from 0.21.0 to 0.32.0 + - c1ab521a 2025-01-08T10:18:35+00:00 Fix mixVersion test case: ensure a snapshot to be sent out + - 5d284fda 2024-12-30T20:26:54+00:00 *: support custom content check offline in v2store + - 727c9b65 2024-12-04T14:13:14+05:30 Bump go toolchain to 1.22.9 + - 28a19f76 2024-12-03T18:29:39+00:00 Print warning message for deprecated flags if set + - 83045bca 2024-11-22T22:37:49+08:00 fix runtime error: comparing uncomparable type + - c84e84c5 2024-11-18T09:14:01+01:00 add tls min/max version to grpc proxy + - e61b4958 2024-11-15T13:24:38+01:00 Bump golang-jwt/jwt to 4.5.1 to address GO-2024-3250 + +- kubernetes embedded-component c44e83d45f377c079cebd613a6ad987168462cda to c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 + - 33d7ffce5 2025-02-26T09:21:03-05:00 UPSTREAM: : admission: validate minimumKubeletVersion + - 91780bc84 2025-02-26T09:21:03-05:00 UPSTREAM: : crdvalidation: move latency profile file to be agnostic of field + - 613b73f22 2025-02-26T15:10:50+01:00 UPSTREAM: : Disable VolumeGroupSnapshot tests + - eda230da1 2025-02-26T14:58:23+01:00 UPSTREAM: 128972: Add crd from external snapshotter + - a0c862244 2025-02-25T14:13:59-05:00 UPSTREAM: : ./hack/update-vendor.sh for openshift-tests-extension + - edf2ddc6d 2025-02-25T09:05:40-03:00 UPSTREAM: : make update + - d169e64c9 2025-02-25T08:52:20-03:00 UPSTREAM: : unskip RecoverVolumeExpansionFailure tests + +- machine-config-operator embedded-component b8ba7c1fba65dfa360f6b2f115d48b69cbc46513 to 2320deabaac93c8bae12d4d8c35842965720bac8 + - f2f99a26 2025-02-24T16:38:36-06:00 OCPBUGS-41489: configure-ovs workaround for ovs-if-br-ex bug + - 9970e04c 2025-02-07T16:21:17-05:00 handle MachineConfigPool changes while the OSBuildController is shut down + - dd1dabaa 2025-02-06T17:52:14-05:00 ensure that build jobs are always reconciled + +- operator-framework-olm embedded-component bf218bbc5469e1494fc9bbbe969b696a5a8cf371 to 6dd1017cdc814695820aeeb95be6cc28d6c411b5 + - cdf5b57e 2025-02-27T15:25:42+00:00 Bump github.com/google/go-cmp from 0.6.0 to 0.7.0 (#1590) + - dd828cff 2025-02-27T15:24:49+00:00 Bump github.com/docker/cli (#1589) + - a4a93578 2025-02-27T15:24:36+00:00 Bump github.com/spf13/cobra from 1.8.1 to 1.9.1 (#1586) + - 71f6fb35 2025-02-27T15:24:22+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.1 to 0.20.2 (#1585) + - d2bbe2de 2025-02-27T15:24:09+00:00 Bump k8s.io/apiextensions-apiserver from 0.32.1 to 0.32.2 (#1584) + - 9bd2159b 2025-02-27T15:23:56+00:00 🌱 synch dockerfiles with grpc-health-probe version in go.mod (#1577) + - ecc12518 2025-02-27T15:23:42+00:00 Bump github.com/distribution/distribution/v3 (#1580) + - 207cddf6 2025-02-27T15:23:29+00:00 exponential retry on name resolution to registries (#1576) + - a797d7bc 2025-02-27T15:23:16+00:00 Bump golang.org/x/net from 0.34.0 to 0.35.0 (#1578) + - 0d366d68 2025-02-27T15:23:02+00:00 Bump github.com/containerd/errdefs from 0.3.0 to 1.0.0 (#1579) + - 4030659a 2025-02-27T15:22:49+00:00 enable linting and bingo management of the lint tool (#1524) + - d86fa57c 2025-02-27T15:22:36+00:00 Bump google.golang.org/protobuf from 1.36.4 to 1.36.5 (#1574) + - 68be8ebd 2025-02-27T15:22:22+00:00 Bump golang.org/x/text from 0.21.0 to 0.22.0 (#1571) + - e8767be0 2025-02-27T15:22:09+00:00 Bump golang.org/x/sync from 0.10.0 to 0.11.0 (#1568) + - 8274c848 2025-02-27T15:21:56+00:00 Bump go.etcd.io/bbolt from 1.3.11 to 1.4.0 (#1573) + - f33adfdc 2025-02-27T15:21:42+00:00 Bump golang.org/x/mod from 0.22.0 to 0.23.0 (#1570) + - bff6ac54 2025-02-27T15:21:29+00:00 Bump golang.org/x/sys from 0.29.0 to 0.30.0 (#1569) + - 22f32534 2025-02-27T15:21:16+00:00 Bump github.com/containers/common from 0.61.1 to 0.62.0 (#1566) + - 40bf7f66 2025-02-27T15:21:03+00:00 Bump github.com/containers/image/v5 from 5.33.1 to 5.34.0 (#1567) + - 72f91458 2025-02-27T15:20:49+00:00 Bump github.com/spf13/pflag from 1.0.5 to 1.0.6 (#1565) + - c333ec75 2025-02-27T15:20:36+00:00 Bump github.com/golang-migrate/migrate/v4 from 4.18.1 to 4.18.2 (#1563) + - 6dc4ebfd 2025-02-27T15:20:23+00:00 Bump google.golang.org/protobuf from 1.36.3 to 1.36.4 (#1562) + - bacc24af 2025-02-27T15:20:09+00:00 Bump google.golang.org/grpc from 1.69.4 to 1.70.0 (#1560) + - 6b3b0145 2025-02-27T15:19:55+00:00 Bump sigs.k8s.io/controller-runtime from 0.20.0 to 0.20.1 (#1559) + - fa464448 2025-02-27T15:19:41+00:00 Bump github.com/docker/cli (#1558) + - 90f761fa 2025-02-27T15:19:28+00:00 Bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.20.0 (#1556) + - 5b240192 2025-02-27T15:19:15+00:00 Bump k8s.io/apiextensions-apiserver from 0.32.0 to 0.32.1 (#1554) + - bdec4db8 2025-02-27T15:18:59+00:00 Bump k8s.io/apimachinery from 0.32.0 to 0.32.1 (#1555) + - 738d4cb8 2025-02-27T15:18:46+00:00 Bump github.com/containers/common from 0.61.0 to 0.61.1 (#1553) + - 33947afe 2025-02-27T15:18:32+00:00 Bump k8s.io/api from 0.32.0 to 0.32.1 (#1552) + - f385375b 2025-02-27T15:18:18+00:00 Bump github.com/distribution/distribution/v3 (#1542) + - 2a8f2c46 2025-02-27T15:18:03+00:00 Bump github.com/containers/image/v5 from 5.33.0 to 5.33.1 (#1549) + - 18cdb562 2025-02-27T15:17:50+00:00 Bump google.golang.org/protobuf from 1.36.2 to 1.36.3 (#1550) + - 0d4c170f 2025-02-27T15:17:36+00:00 Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.36 to 0.4.37 (#1551) + - cfc6f25f 2025-02-27T15:17:22+00:00 Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.34 to 0.4.36 (#1548) + - d71ec99c 2025-02-27T15:17:09+00:00 Bump github.com/docker/cli (#1543) + - 0a73e52a 2025-02-27T15:16:55+00:00 fix bingo-upgrade target (#1547) + - 5e964ae8 2025-02-27T15:16:42+00:00 Bump github.com/grpc-ecosystem/go-grpc-middleware/v2 from 2.1.0 to 2.2.0 (#1544) + - 4ff33210 2025-02-27T15:16:28+00:00 Bump google.golang.org/grpc from 1.68.1 to 1.69.4 (#1546) + - 34d0b430 2025-02-27T15:16:13+00:00 Bump github.com/otiai10/copy from 1.14.0 to 1.14.1 (#1545) + - 26702565 2025-02-27T15:15:53+00:00 Update operator-registry to v1.51.0 (#3525) + - 2a56d091 2025-02-27T15:15:26+00:00 :seedling: Bump github.com/google/go-cmp from 0.6.0 to 0.7.0 (#3523) + - 1e742e24 2025-02-26T00:03:28+00:00 add missing pod disruption reasons to isPodDead (#3519) + +- oc image-amd64 b2f8216d285c2ec38acc7aa8c41a5689062b61c8 to 514a4581b8a6b8b0aef5832e50adf1037ffd9566 - cbecb375 2025-02-25T15:41:27-08:00 pkg/cli/admin/upgrade/recommend: Configureable version for test fixtures - f7378ff1 2025-02-25T15:41:27-08:00 pkg/cli/admin/upgrade/recommend/examples/README: Catch up with --show-outdated-releases - 04ddd208 2025-02-25T10:45:16+03:00 Bump indirect dependency go-jose to 4.0.5 version -- kubernetes image-arm64 efd4d776fd6178a96e55e12bc035d4425febfe24 to 0d5e1846a2163960301184f0582fcfb3e805bee1 +- kubernetes image-amd64 c44e83d45f377c079cebd613a6ad987168462cda to c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 - 33d7ffce5 2025-02-26T09:21:03-05:00 UPSTREAM: : admission: validate minimumKubeletVersion - 91780bc84 2025-02-26T09:21:03-05:00 UPSTREAM: : crdvalidation: move latency profile file to be agnostic of field + - 613b73f22 2025-02-26T15:10:50+01:00 UPSTREAM: : Disable VolumeGroupSnapshot tests + - eda230da1 2025-02-26T14:58:23+01:00 UPSTREAM: 128972: Add crd from external snapshotter + - a0c862244 2025-02-25T14:13:59-05:00 UPSTREAM: : ./hack/update-vendor.sh for openshift-tests-extension + - edf2ddc6d 2025-02-25T09:05:40-03:00 UPSTREAM: : make update + - d169e64c9 2025-02-25T08:52:20-03:00 UPSTREAM: : unskip RecoverVolumeExpansionFailure tests + +- kubernetes image-arm64 0d5e1846a2163960301184f0582fcfb3e805bee1 to c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 + - 613b73f22 2025-02-26T15:10:50+01:00 UPSTREAM: : Disable VolumeGroupSnapshot tests + - eda230da1 2025-02-26T14:58:23+01:00 UPSTREAM: 128972: Add crd from external snapshotter diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 09cde2243d..8f77959ce9 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,29 +1,29 @@ -https://github.com/openshift/api embedded-component 544b3ca4e8f59633ced91c3f93fa4b67a87dd102 +https://github.com/openshift/api embedded-component 1ee1ef83110046a60c1b083b09ee1f1506913793 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component a68ffe82329d198f79508daeb6c63c6bc2a4e19a https://github.com/openshift/cluster-dns-operator embedded-component 0a9deeea4c335e259747b35267811a4a040289fd https://github.com/openshift/cluster-ingress-operator embedded-component 26f8b0f9c9fa30ff84f08f7e1f9da87aef431891 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f743f844173d77dbd2a0c80d1f0158c700767400 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 9a7a572080a663bda581c0567e3921a99acd993e +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 34af639409ff04da7e89f214c804145587e9334e +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 6a932ac83494daf0cf6eecd83068ce7a2c665238 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 4210c04aec1c7fde8f4c294421e090ebf9248285 -https://github.com/openshift/cluster-network-operator embedded-component ff96ab47006095ad40478fa72d586ae5f33148e1 +https://github.com/openshift/cluster-network-operator embedded-component d09028dfda8c632e4c4730319b9f07f0ac92d82a https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 0ab30996207ada63ef2e2fd4f47aac03b0872c9a https://github.com/openshift/cluster-policy-controller embedded-component 5cc0d0ecd3cdfe8e2fbb55bb62de7fb047b2a127 https://github.com/openshift/csi-external-snapshotter embedded-component 1fc6ee158070b34f84a94489b33accb333714727 -https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb -https://github.com/openshift/kubernetes embedded-component c44e83d45f377c079cebd613a6ad987168462cda +https://github.com/openshift/etcd embedded-component d36de75cb3fa96e25893d7b824b01c177490a261 +https://github.com/openshift/kubernetes embedded-component c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 -https://github.com/openshift/machine-config-operator embedded-component b8ba7c1fba65dfa360f6b2f115d48b69cbc46513 +https://github.com/openshift/machine-config-operator embedded-component 2320deabaac93c8bae12d4d8c35842965720bac8 https://github.com/openshift/openshift-controller-manager embedded-component 29531eafbff8b466bbee6a02c345f43245053482 -https://github.com/openshift/operator-framework-olm embedded-component bf218bbc5469e1494fc9bbbe969b696a5a8cf371 +https://github.com/openshift/operator-framework-olm embedded-component 6dd1017cdc814695820aeeb95be6cc28d6c411b5 https://github.com/openshift/route-controller-manager embedded-component bc97534a12a7a6bac096e4ed488b29535c8d4f33 https://github.com/openshift/service-ca-operator embedded-component 1e65678429c82df5ae97da4dde8dbe03d75062e6 -https://github.com/openshift/oc image-amd64 b2f8216d285c2ec38acc7aa8c41a5689062b61c8 +https://github.com/openshift/oc image-amd64 514a4581b8a6b8b0aef5832e50adf1037ffd9566 https://github.com/openshift/coredns image-amd64 7a1451db77a68161d58af9b6ca2c9388d578310a https://github.com/openshift/csi-external-snapshotter image-amd64 1fc6ee158070b34f84a94489b33accb333714727 https://github.com/openshift/router image-amd64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-amd64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-amd64 2e689e10bffbd7a2833be5e75a48b5311586a83d -https://github.com/openshift/kubernetes image-amd64 c44e83d45f377c079cebd613a6ad987168462cda +https://github.com/openshift/kubernetes image-amd64 c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 https://github.com/openshift/service-ca-operator image-amd64 1e65678429c82df5ae97da4dde8dbe03d75062e6 https://github.com/openshift/oc image-arm64 514a4581b8a6b8b0aef5832e50adf1037ffd9566 https://github.com/openshift/coredns image-arm64 7a1451db77a68161d58af9b6ca2c9388d578310a @@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 1fc6ee158070b3 https://github.com/openshift/router image-arm64 b41f9d05467fb7b3f6c2dafa6ac4b5e25164c0b6 https://github.com/openshift/kube-rbac-proxy image-arm64 591277560f328601273f88f2881e09ccccd90a97 https://github.com/openshift/ovn-kubernetes image-arm64 2e689e10bffbd7a2833be5e75a48b5311586a83d -https://github.com/openshift/kubernetes image-arm64 0d5e1846a2163960301184f0582fcfb3e805bee1 +https://github.com/openshift/kubernetes image-arm64 c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21 https://github.com/openshift/service-ca-operator image-arm64 1e65678429c82df5ae97da4dde8dbe03d75062e6 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 4a40521210..b0743d35dc 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-02-26-050226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-02-27-211136" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-02-28-132549" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-03-02-211136" diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 36beaa66e4..a1fd3fc7ae 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -646,6 +646,7 @@ EOF yq -i 'del(.extendedArguments.pv-recycler-pod-template-filepath-nfs)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i 'del(.extendedArguments.flex-volume-plugin-dir)' "${REPOROOT}"/assets/controllers/kube-controller-manager/defaultconfig.yaml yq -i '.spec.names.shortNames = ["scc"]' "${REPOROOT}"/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml + yq -i '.apiServerArguments.authorization-mode = ["Scope","SystemMasters","RBAC","Node"]' "${REPOROOT}"/assets/controllers/kube-apiserver/defaultconfig.yaml #-- openshift-dns ------------------------------------- # Render operand manifest templates like the operator would 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 ca6efc5136..15c99a2c28 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.17" + Version = "3.5.18" APIVersion = "unknown" // Git SHA Value will be set during build diff --git a/vendor/go.etcd.io/etcd/client/v3/lease.go b/vendor/go.etcd.io/etcd/client/v3/lease.go index 4e7d1caf83..4877ee9496 100644 --- a/vendor/go.etcd.io/etcd/client/v3/lease.go +++ b/vendor/go.etcd.io/etcd/client/v3/lease.go @@ -263,6 +263,12 @@ func (l *lessor) Leases(ctx context.Context) (*LeaseLeasesResponse, error) { return nil, ContextError(ctx, err) } +// To identify the context passed to `KeepAlive`, a key/value pair is +// attached to the context. The key is a `keepAliveCtxKey` object, and +// the value is the pointer to the context object itself, ensuring +// uniqueness as each context has a unique memory address. +type keepAliveCtxKey struct{} + func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAliveResponse, error) { ch := make(chan *LeaseKeepAliveResponse, LeaseResponseChSize) @@ -277,6 +283,10 @@ func (l *lessor) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAl default: } ka, ok := l.keepAlives[id] + + if ctx.Done() != nil { + ctx = context.WithValue(ctx, keepAliveCtxKey{}, &ctx) + } if !ok { // create fresh keep alive ka = &keepAlive{ @@ -347,7 +357,7 @@ func (l *lessor) keepAliveCtxCloser(ctx context.Context, id LeaseID, donec <-cha // close channel and remove context if still associated with keep alive for i, c := range ka.ctxs { - if c == ctx { + if c.Value(keepAliveCtxKey{}) == ctx.Value(keepAliveCtxKey{}) { close(ka.chs[i]) ka.ctxs = append(ka.ctxs[:i], ka.ctxs[i+1:]...) ka.chs = append(ka.chs[:i], ka.chs[i+1:]...) diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/restrict_extreme_worker_latency_profile.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/restrict_extreme_worker_latency_profile.go deleted file mode 100644 index b4b63914f8..0000000000 --- a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/restrict_extreme_worker_latency_profile.go +++ /dev/null @@ -1,124 +0,0 @@ -package node - -import ( - "context" - "fmt" - "io" - - "k8s.io/apimachinery/pkg/api/validation" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/schema" - "k8s.io/apimachinery/pkg/util/validation/field" - "k8s.io/apiserver/pkg/admission" - - configv1 "github.com/openshift/api/config/v1" - "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation" -) - -var rejectionScenarios = []struct { - fromProfile configv1.WorkerLatencyProfileType - toProfile configv1.WorkerLatencyProfileType -}{ - {fromProfile: "", toProfile: configv1.LowUpdateSlowReaction}, - {fromProfile: configv1.LowUpdateSlowReaction, toProfile: ""}, - {fromProfile: configv1.DefaultUpdateDefaultReaction, toProfile: configv1.LowUpdateSlowReaction}, - {fromProfile: configv1.LowUpdateSlowReaction, toProfile: configv1.DefaultUpdateDefaultReaction}, -} - -const PluginName = "config.openshift.io/RestrictExtremeWorkerLatencyProfile" - -// Register registers a plugin -func Register(plugins *admission.Plugins) { - plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { - return customresourcevalidation.NewValidator( - map[schema.GroupResource]bool{ - configv1.Resource("nodes"): true, - }, - map[schema.GroupVersionKind]customresourcevalidation.ObjectValidator{ - configv1.GroupVersion.WithKind("Node"): configNodeV1{}, - }) - }) -} - -func toConfigNodeV1(uncastObj runtime.Object) (*configv1.Node, field.ErrorList) { - if uncastObj == nil { - return nil, nil - } - - allErrs := field.ErrorList{} - - obj, ok := uncastObj.(*configv1.Node) - if !ok { - return nil, append(allErrs, - field.NotSupported(field.NewPath("kind"), fmt.Sprintf("%T", uncastObj), []string{"Node"}), - field.NotSupported(field.NewPath("apiVersion"), fmt.Sprintf("%T", uncastObj), []string{"config.openshift.io/v1"})) - } - - return obj, nil -} - -type configNodeV1 struct{} - -func validateConfigNodeForExtremeLatencyProfile(obj, oldObj *configv1.Node) *field.Error { - fromProfile := oldObj.Spec.WorkerLatencyProfile - toProfile := obj.Spec.WorkerLatencyProfile - - for _, rejectionScenario := range rejectionScenarios { - if fromProfile == rejectionScenario.fromProfile && toProfile == rejectionScenario.toProfile { - return field.Invalid(field.NewPath("spec", "workerLatencyProfile"), obj.Spec.WorkerLatencyProfile, - fmt.Sprintf( - "cannot update worker latency profile from %q to %q as extreme profile transition is unsupported, please select any other profile with supported transition such as %q", - oldObj.Spec.WorkerLatencyProfile, - obj.Spec.WorkerLatencyProfile, - configv1.MediumUpdateAverageReaction, - ), - ) - } - } - return nil -} - -func (configNodeV1) ValidateCreate(_ context.Context, uncastObj runtime.Object) field.ErrorList { - obj, allErrs := toConfigNodeV1(uncastObj) - if len(allErrs) > 0 { - return allErrs - } - - allErrs = append(allErrs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, customresourcevalidation.RequireNameCluster, field.NewPath("metadata"))...) - - return allErrs -} - -func (configNodeV1) ValidateUpdate(_ context.Context, uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { - obj, allErrs := toConfigNodeV1(uncastObj) - if len(allErrs) > 0 { - return allErrs - } - oldObj, allErrs := toConfigNodeV1(uncastOldObj) - if len(allErrs) > 0 { - return allErrs - } - - allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) - if err := validateConfigNodeForExtremeLatencyProfile(obj, oldObj); err != nil { - allErrs = append(allErrs, err) - } - - return allErrs -} - -func (configNodeV1) ValidateStatusUpdate(_ context.Context, uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { - obj, errs := toConfigNodeV1(uncastObj) - if len(errs) > 0 { - return errs - } - oldObj, errs := toConfigNodeV1(uncastOldObj) - if len(errs) > 0 { - return errs - } - - // TODO validate the obj. remember that status validation should *never* fail on spec validation errors. - errs = append(errs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) - - return errs -} diff --git a/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/validate_node_config.go b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/validate_node_config.go new file mode 100644 index 0000000000..355317a362 --- /dev/null +++ b/vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/node/validate_node_config.go @@ -0,0 +1,218 @@ +package node + +import ( + "context" + "errors" + "fmt" + "io" + + configv1 "github.com/openshift/api/config/v1" + nodelib "github.com/openshift/library-go/pkg/apiserver/node" + + openshiftfeatures "github.com/openshift/api/features" + "k8s.io/apimachinery/pkg/api/validation" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/util/validation/field" + "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/admission/initializer" + "k8s.io/apiserver/pkg/util/feature" + "k8s.io/client-go/informers" + corev1listers "k8s.io/client-go/listers/core/v1" + "k8s.io/component-base/featuregate" + "k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation" +) + +var rejectionScenarios = []struct { + fromProfile configv1.WorkerLatencyProfileType + toProfile configv1.WorkerLatencyProfileType +}{ + {fromProfile: "", toProfile: configv1.LowUpdateSlowReaction}, + {fromProfile: configv1.LowUpdateSlowReaction, toProfile: ""}, + {fromProfile: configv1.DefaultUpdateDefaultReaction, toProfile: configv1.LowUpdateSlowReaction}, + {fromProfile: configv1.LowUpdateSlowReaction, toProfile: configv1.DefaultUpdateDefaultReaction}, +} + +const PluginName = "config.openshift.io/ValidateConfigNodeV1" + +// Register registers a plugin +func Register(plugins *admission.Plugins) { + plugins.Register(PluginName, func(config io.Reader) (admission.Interface, error) { + ret := &configNodeV1Wrapper{} + delegate, err := customresourcevalidation.NewValidator( + map[schema.GroupResource]bool{ + configv1.Resource("nodes"): true, + }, + map[schema.GroupVersionKind]customresourcevalidation.ObjectValidator{ + configv1.GroupVersion.WithKind("Node"): &configNodeV1{ + nodeListerFn: ret.getNodeLister, + waitForNodeInformerSyncedFn: ret.waitForNodeInformerSyncedFn, + minimumKubeletVersionEnabled: feature.DefaultFeatureGate.Enabled(featuregate.Feature(openshiftfeatures.FeatureGateMinimumKubeletVersion)), + }, + }) + if err != nil { + return nil, err + } + ret.delegate = delegate + return ret, nil + }) +} + +func toConfigNodeV1(uncastObj runtime.Object) (*configv1.Node, field.ErrorList) { + if uncastObj == nil { + return nil, nil + } + + allErrs := field.ErrorList{} + + obj, ok := uncastObj.(*configv1.Node) + if !ok { + return nil, append(allErrs, + field.NotSupported(field.NewPath("kind"), fmt.Sprintf("%T", uncastObj), []string{"Node"}), + field.NotSupported(field.NewPath("apiVersion"), fmt.Sprintf("%T", uncastObj), []string{"config.openshift.io/v1"})) + } + + return obj, nil +} + +type configNodeV1 struct { + nodeListerFn func() corev1listers.NodeLister + waitForNodeInformerSyncedFn func() bool + minimumKubeletVersionEnabled bool +} + +func validateConfigNodeForExtremeLatencyProfile(obj, oldObj *configv1.Node) *field.Error { + fromProfile := oldObj.Spec.WorkerLatencyProfile + toProfile := obj.Spec.WorkerLatencyProfile + + for _, rejectionScenario := range rejectionScenarios { + if fromProfile == rejectionScenario.fromProfile && toProfile == rejectionScenario.toProfile { + return field.Invalid(field.NewPath("spec", "workerLatencyProfile"), obj.Spec.WorkerLatencyProfile, + fmt.Sprintf( + "cannot update worker latency profile from %q to %q as extreme profile transition is unsupported, please select any other profile with supported transition such as %q", + oldObj.Spec.WorkerLatencyProfile, + obj.Spec.WorkerLatencyProfile, + configv1.MediumUpdateAverageReaction, + ), + ) + } + } + return nil +} + +func (c *configNodeV1) ValidateCreate(_ context.Context, uncastObj runtime.Object) field.ErrorList { + obj, allErrs := toConfigNodeV1(uncastObj) + if len(allErrs) > 0 { + return allErrs + } + + allErrs = append(allErrs, validation.ValidateObjectMeta(&obj.ObjectMeta, false, customresourcevalidation.RequireNameCluster, field.NewPath("metadata"))...) + if err := c.validateMinimumKubeletVersion(obj); err != nil { + allErrs = append(allErrs, err) + } + + return allErrs +} + +func (c *configNodeV1) ValidateUpdate(_ context.Context, uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { + obj, allErrs := toConfigNodeV1(uncastObj) + if len(allErrs) > 0 { + return allErrs + } + oldObj, allErrs := toConfigNodeV1(uncastOldObj) + if len(allErrs) > 0 { + return allErrs + } + + allErrs = append(allErrs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) + if err := validateConfigNodeForExtremeLatencyProfile(obj, oldObj); err != nil { + allErrs = append(allErrs, err) + } + if err := c.validateMinimumKubeletVersion(obj); err != nil { + allErrs = append(allErrs, err) + } + + return allErrs +} +func (c *configNodeV1) validateMinimumKubeletVersion(obj *configv1.Node) *field.Error { + if !c.minimumKubeletVersionEnabled { + return nil + } + fieldPath := field.NewPath("spec", "minimumKubeletVersion") + if !c.waitForNodeInformerSyncedFn() { + return field.InternalError(fieldPath, fmt.Errorf("caches not synchronized, cannot validate minimumKubeletVersion")) + } + + nodes, err := c.nodeListerFn().List(labels.Everything()) + if err != nil { + return field.NotFound(fieldPath, fmt.Sprintf("Getting nodes to compare minimum version %v", err.Error())) + } + + if err := nodelib.ValidateMinimumKubeletVersion(nodes, obj.Spec.MinimumKubeletVersion); err != nil { + if errors.Is(err, nodelib.ErrKubeletOutdated) { + return field.Forbidden(fieldPath, err.Error()) + } + return field.Invalid(fieldPath, obj.Spec.MinimumKubeletVersion, err.Error()) + } + return nil +} + +func (*configNodeV1) ValidateStatusUpdate(_ context.Context, uncastObj runtime.Object, uncastOldObj runtime.Object) field.ErrorList { + obj, errs := toConfigNodeV1(uncastObj) + if len(errs) > 0 { + return errs + } + oldObj, errs := toConfigNodeV1(uncastOldObj) + if len(errs) > 0 { + return errs + } + + // TODO validate the obj. remember that status validation should *never* fail on spec validation errors. + errs = append(errs, validation.ValidateObjectMetaUpdate(&obj.ObjectMeta, &oldObj.ObjectMeta, field.NewPath("metadata"))...) + + return errs +} + +type configNodeV1Wrapper struct { + // handler is only used to know if the plugin is ready to process requests. + handler admission.Handler + + nodeLister corev1listers.NodeLister + delegate admission.ValidationInterface +} + +var ( + _ = initializer.WantsExternalKubeInformerFactory(&configNodeV1Wrapper{}) + _ = admission.ValidationInterface(&configNodeV1Wrapper{}) +) + +func (c *configNodeV1Wrapper) SetExternalKubeInformerFactory(kubeInformers informers.SharedInformerFactory) { + nodeInformer := kubeInformers.Core().V1().Nodes() + c.nodeLister = nodeInformer.Lister() + c.handler.SetReadyFunc(nodeInformer.Informer().HasSynced) +} + +func (c *configNodeV1Wrapper) ValidateInitialization() error { + if c.nodeLister == nil { + return fmt.Errorf("%s needs a nodes lister", PluginName) + } + + return nil +} + +func (c *configNodeV1Wrapper) getNodeLister() corev1listers.NodeLister { + return c.nodeLister +} + +func (c *configNodeV1Wrapper) waitForNodeInformerSyncedFn() bool { + return c.handler.WaitForReady() +} + +func (c *configNodeV1Wrapper) Validate(ctx context.Context, a admission.Attributes, o admission.ObjectInterfaces) (err error) { + return c.delegate.Validate(ctx, a, o) +} + +func (c *configNodeV1Wrapper) Handles(operation admission.Operation) bool { + return c.delegate.Handles(operation) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index e3e44cd9af..5d543f8f45 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -794,7 +794,7 @@ github.com/x448/float16 # github.com/xlab/treeprint v1.2.0 ## explicit; go 1.13 github.com/xlab/treeprint -# go.etcd.io/etcd/api/v3 v3.5.17 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/api/v3 v3.5.18 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/api/v3/authpb go.etcd.io/etcd/api/v3/etcdserverpb @@ -802,7 +802,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.17 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/client/pkg/v3 v3.5.18 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/client/pkg/v3/fileutil go.etcd.io/etcd/client/pkg/v3/logutil @@ -810,7 +810,7 @@ go.etcd.io/etcd/client/pkg/v3/systemd go.etcd.io/etcd/client/pkg/v3/tlsutil go.etcd.io/etcd/client/pkg/v3/transport go.etcd.io/etcd/client/pkg/v3/types -# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a +# go.etcd.io/etcd/client/v3 v3.5.16 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa ## explicit; go 1.22 go.etcd.io/etcd/client/v3 go.etcd.io/etcd/client/v3/credentials @@ -1156,7 +1156,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/api v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1217,7 +1217,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/apiextensions-apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1264,7 +1264,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/apimachinery v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1336,7 +1336,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/apiserver v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1517,13 +1517,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-20250225193844-c44e83d45f37 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/client-go v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1887,7 +1887,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1906,14 +1906,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-20250225193844-c44e83d45f37 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/component-base v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1950,7 +1950,7 @@ k8s.io/component-base/version/verflag k8s.io/component-base/zpages/features k8s.io/component-base/zpages/flagz k8s.io/component-base/zpages/statusz -# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/component-helpers v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1964,7 +1964,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/controller-manager v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -1981,35 +1981,35 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/cri-client/pkg k8s.io/cri-client/pkg/internal k8s.io/cri-client/pkg/logs k8s.io/cri-client/pkg/util -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/dynamic-resource-allocation/api k8s.io/dynamic-resource-allocation/cel k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/endpointslice k8s.io/endpointslice/metrics k8s.io/endpointslice/topologycache k8s.io/endpointslice/trafficdist k8s.io/endpointslice/util -# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/externaljwt v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/externaljwt/apis/v1alpha1 # k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 @@ -2030,13 +2030,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kms v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kube-aggregator v0.32.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2069,7 +2069,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f @@ -2102,11 +2102,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-20250225193844-c44e83d45f37 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2141,7 +2141,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-20250225193844-c44e83d45f37 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2163,7 +2163,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/kubernetes v1.32.2 => github.com/openshift/kubernetes v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2984,7 +2984,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse k8s.io/kubernetes/third_party/forked/libcontainer/apparmor k8s.io/kubernetes/third_party/forked/libcontainer/utils -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -2999,10 +2999,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-20250225193844-c44e83d45f37 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/pod-security-admission v0.32.2 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a ## explicit; go 1.23.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3149,39 +3149,39 @@ sigs.k8s.io/yaml sigs.k8s.io/yaml/goyaml.v2 sigs.k8s.io/yaml/goyaml.v3 # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241205171354-8006f302fd12 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250225193844-c44e83d45f37 -# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a -# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20241118170732-914783cae63a +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250228003140-c3a6a36c352a +# go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250226141325-d36de75cb3fa +# go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20250226141325-d36de75cb3fa # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20250108152203-4c521b09f4dc -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250225193844-c44e83d45f37 -# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250225193844-c44e83d45f37 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250228003140-c3a6a36c352a +# k8s.io/externaljwt => github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250228003140-c3a6a36c352a