From f04732f8936daebee918c1929c000fff255b8548 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:24:34 +0000 Subject: [PATCH 1/9] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e21e6dcf26..f3bb22b76e 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-01-15-060507" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-15-233735" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.19.0-0.nightly-2025-01-16-064700" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.19.0-0.nightly-arm64-2025-01-17-000530" From 40d1b3287d10460304b901163ce25ea52dc26e4c Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:24:34 +0000 Subject: [PATCH 2/9] update changelog --- scripts/auto-rebase/changelog.txt | 111 +++++++++++++++++++++++++----- scripts/auto-rebase/commits.txt | 12 ++-- 2 files changed, 100 insertions(+), 23 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index d6eeaef249..53ba5abd03 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,23 +1,100 @@ -- api embedded-component 78bd56dba39ba9848f38db2d63fa5f20c6e4707d to c1a063b1614ac3ccb0fc5ab49ba6158dfe8e3d3e - - b701a1fa 2025-01-08T09:43:03+01:00 ipam, virt: graduate persistent ips feature gate to GA +- api embedded-component c1a063b1614ac3ccb0fc5ab49ba6158dfe8e3d3e to 52377f09e5c9293d4694c29375b35fb202bae222 + - 8fd16e29 2025-01-15T14:58:17+00:00 Update lint-fix make target + - 0e9d9411 2025-01-13T14:28:23+00:00 Update golangci-lint to v1.63.4 -- cluster-network-operator embedded-component 9d96bcc4fc4653970e135a87ce380b0fb57f0587 to 2a17ab877fa8e7bef1703be85caed52ada384977 - - 4668f71 2025-01-09T17:53:41-05:00 Disable adding/removing the UDN namespace label +- cluster-network-operator embedded-component 2a17ab877fa8e7bef1703be85caed52ada384977 to 722d631aab15ac726c45ad8d2d148843f3ec165b + - ea1d489 2025-01-09T18:48:50+01:00 Restart IPsec service only when needed + - ece9fbb 2025-01-09T18:48:28+01:00 Revert "Configure narrowing=yes for IPsec connections" + - 864bdc5 2025-01-09T11:30:45+01:00 Cleanup ipsec state only when ipsec is not full mode -- kubernetes embedded-component 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b to 309f240e18f1da87bbe86c18746774d6d302f8ef - - 172a47bcf 2024-12-05T13:30:57+00:00 UPSTREAM: : Updating openshift-enterprise-pod-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/openshift-enterprise-pod.yml +- kubernetes embedded-component 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370 + - f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: : k8s-tests-ext should fully initialize test context + - eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: : ./hack/update-vendor.sh -- machine-config-operator embedded-component b08fa0ed31ec785ce9466a155d8ba3925cefbe2c to 2a5d118838ed91860f4c371f378397670c86f5c2 - - 969f3ffa 2025-01-08T14:23:21-05:00 Update machine-config-daemon-pull.service.yaml and policy-no-sigstoresigned.yaml - - 2b16d22e 2024-12-17T08:33:11-06:00 OCPBUGS-41489: Specify interface type when adding ovs-port - - 38b0447e 2024-12-11T15:20:03+01:00 MGMT-19337: enable injection of custom kubelet labels via env var for master nodes +- operator-framework-olm embedded-component 5423c783cc28cff7a9dc9000478f8b7b8b299762 to 34e05d48c055b317af82867fed6a5ab4448ee5cd + - 4bda73cb 2025-01-15T09:19:28+01:00 Upgrade controller-gen v0.16.1 to v0.17.0 (#392) + - 107e04d0 2025-01-15T09:19:01+01:00 Upgrade indirect dependencies (#391) + - dbc6fe8f 2025-01-15T09:18:56+01:00 bump controller-runtime (#388) + - 159dc837 2025-01-15T09:18:53+01:00 Fix go1.33 bump adding toolchain + - 760bf4a1 2025-01-15T09:18:49+01:00 Revert "Bump to go1.23" + - b03b0015 2025-01-15T09:18:45+01:00 Bump to go1.23 + - a698ede3 2025-01-15T09:18:37+01:00 bump golang.org/x/net to 0.34.0 (#387) + - 65fae060 2025-01-15T09:18:32+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.3 to 0.32.0 (#381) + - 80736c58 2025-01-15T09:18:27+01:00 Bump k8s.io/client-go from 0.31.3 to 0.32.0 (#384) + - 64b9f1a7 2025-01-15T09:18:24+01:00 :seedling: Bump go to v1.23.0 (#358) + - 10b0128f 2025-01-15T09:18:20+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.1 to 0.19.3 (#379) + - cbe0bfce 2025-01-15T09:18:16+01:00 Bump github.com/google/cel-go from 0.22.0 to 0.22.1 (#374) + - 1586216c 2025-01-15T09:18:12+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.2 to 0.31.3 (#376) + - 9716b93c 2025-01-15T09:18:08+01:00 Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#375) + - 81b9a25e 2025-01-15T09:18:04+01:00 Bump codecov/codecov-action from 4 to 5 (#372) + - b99705d7 2025-01-15T09:18:00+01:00 Bump github.com/google/cel-go from 0.20.1 to 0.22.0 (#371) + - e3a734c4 2025-01-15T09:17:56+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.1 to 0.31.2 (#369) + - e20d2cb2 2025-01-15T09:17:52+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#367) + - 0d891bb8 2025-01-15T09:17:48+01:00 Bump k8s.io/api from 0.31.1 to 0.31.2 (#366) + - 245e1575 2025-01-15T09:17:44+01:00 fix: add missing comment tags for Conditions (#365) + - e260fbd4 2025-01-15T09:17:40+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.0 to 0.31.1 (#360) + - 226d7fb7 2025-01-15T09:17:36+01:00 Bump k8s.io/client-go from 0.31.0 to 0.31.1 (#362) + - c8a27748 2025-01-15T09:17:31+01:00 Upgrade github.com/operator-framework/api from v0.27.0 to v0.29 (#1540) + - 71f768a9 2025-01-15T09:17:26+01:00 Upgrade github.com/containers/common v0.60.4 => v0.61.0 (#1534) + - 3cfda62b 2025-01-15T09:17:22+01:00 Bump github.com/onsi/ginkgo/v2 from 2.22.0 to 2.22.2 (#1536) + - 85995168 2025-01-15T09:17:17+01:00 Bump github.com/docker/cli (#1539) + - 5f72279b 2025-01-15T09:17:12+01:00 Bump google.golang.org/protobuf from 1.35.2 to 1.36.2 (#1537) + - 0f977dc8 2025-01-15T09:17:07+01:00 Bump github.com/maxbrunsfeld/counterfeiter/v6 from 6.9.0 to 6.11.2 (#1535) + - c4eb1241 2025-01-15T09:17:03+01:00 Upgrade kind from v0.25.0 to v0.26.0 (#1532) + - 73d08d51 2025-01-15T09:16:58+01:00 k8s deps from v0.31.3 to v0.32.0 (#1529) + - 9b920669 2025-01-15T09:16:53+01:00 Revert go bump and redo (#1531) + - b21e4c52 2025-01-15T09:16:48+01:00 :seedling: Bump Go v1.23.0 (#1431) + - ab924541 2025-01-15T09:16:43+01:00 Upgrade controller-runtimr from v0.19.3 to v0.19.4 (#1530) + - 886153d5 2025-01-15T09:16:38+01:00 Bump github.com/containerd/containerd from 1.7.23 to 1.7.25 (#1528) + - b4a1ab00 2025-01-15T09:16:34+01:00 Upgrade github.com/joelanford/ignore from v0.1.0 to v0.1.1 (#1527) + - 738d5a04 2025-01-15T09:16:29+01:00 Bump github.com/containers/image/v5 from 5.32.2 to 5.33.0 (#1493) + - 5557f98b 2025-01-15T09:16:25+01:00 Bumps go/net to v0.33.0 (#1522) + - c715662b 2025-01-15T09:16:20+01:00 Revert "Bumps go/net to v0.33.0" + - 0fb1a0c9 2025-01-15T09:16:15+01:00 Bumps go/net to v0.33.0 + - 20a412cc 2025-01-15T09:16:10+01:00 provide an optional base image flag for generated dockerfiles from bundle build commands (#1519) + - 5cfd75ae 2025-01-15T09:16:05+01:00 Bump github.com/onsi/gomega from 1.36.0 to 1.36.1 (#1515) + - e9998daf 2025-01-15T09:16:00+01:00 remove reference of kube-rbac-proxy from mocks and tests (#1518) + - c79297c0 2025-01-15T09:15:55+01:00 Bump golang.org/x/sys from 0.27.0 to 0.28.0 (#1508) + - d67d26cc 2025-01-15T09:15:50+01:00 Bump golang.org/x/net from 0.31.0 to 0.32.0 (#1511) + - e5682138 2025-01-15T09:15:46+01:00 Bump google.golang.org/grpc from 1.68.0 to 1.68.1 (#1512) + - 8736c8f0 2025-01-15T09:15:41+01:00 Bump golang.org/x/text from 0.20.0 to 0.21.0 (#1509) + - a626c4f4 2025-01-15T09:15:36+01:00 Bump golang.org/x/sync from 0.9.0 to 0.10.0 (#1510) + - 3cb8460b 2025-01-15T09:15:32+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.2 to 0.19.3 (#1507) + - f83846df 2025-01-15T09:15:27+01:00 Bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (#1506) + - b65a95fe 2025-01-15T09:15:22+01:00 Bump github.com/onsi/gomega from 1.35.1 to 1.36.0 (#1503) + - 06a81cef 2025-01-15T09:15:17+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.2 to 0.31.3 (#1504) + - 1493db57 2025-01-15T09:15:12+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.1 to 0.19.2 (#1501) + - 366f7e46 2025-01-15T09:15:03+01:00 Bump k8s.io/api from 0.31.2 to 0.31.3 (#1500) + - 0f424b86 2025-01-15T09:14:58+01:00 Bump github.com/onsi/ginkgo/v2 from 2.21.0 to 2.22.0 (#1499) + - c7a2ab3c 2025-01-15T09:14:53+01:00 Bump golang.org/x/net from 0.30.0 to 0.31.0 (#1496) + - 639e8158 2025-01-15T09:14:48+01:00 Bump codecov/codecov-action from 4 to 5 (#1497) + - e5bc14af 2025-01-15T09:14:44+01:00 Bump golang.org/x/mod from 0.21.0 to 0.22.0 (#1495) + - 27b6f1e0 2025-01-15T09:14:36+01:00 Bump google.golang.org/protobuf from 1.35.1 to 1.35.2 (#1494) + - 7c0c59b2 2025-01-15T09:14:30+01:00 Bump golang.org/x/sync from 0.8.0 to 0.9.0 (#1486) (#1485) + - 820d8602 2025-01-15T09:14:25+01:00 Bump sigs.k8s.io/kind from 0.24.0 to 0.25.0 (#1492) + - 014f9ed2 2025-01-15T09:14:21+01:00 Bump golang.org/x/net from 0.30.0 to 0.31.0 (#1488) + - 3103ded6 2025-01-15T09:14:17+01:00 Bump golang.org/x/mod from 0.21.0 to 0.22.0 (#1490) + - 15d86519 2025-01-15T09:14:12+01:00 Bump golang.org/x/sync from 0.8.0 to 0.9.0 (#1486) + - cf134e44 2025-01-15T09:14:08+01:00 Bump github.com/distribution/distribution/v3 (#1487) + - 29c120a6 2025-01-15T09:14:03+01:00 Bump golang.org/x/sys from 0.26.0 to 0.27.0 (#1484) + - 44ac184a 2025-01-15T09:13:58+01:00 Bump github.com/onsi/gomega from 1.35.0 to 1.35.1 (#1483) + - 53622033 2025-01-15T09:13:54+01:00 Bump github.com/onsi/ginkgo/v2 from 2.20.2 to 2.21.0 (#1480) + - cfce7dd5 2025-01-15T09:13:49+01:00 Bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#1478) + - 4bc905a4 2025-01-15T09:13:44+01:00 Bump github.com/onsi/gomega from 1.34.2 to 1.35.0 (#1481) + - 98b81176 2025-01-15T09:13:39+01:00 Bump k8s.io/apiextensions-apiserver from 0.31.1 to 0.31.2 (#1474) + - 78d50260 2025-01-15T09:13:34+01:00 bump o-f libs (#3487) + - 9cb0c76c 2025-01-15T09:13:28+01:00 bump k8s libs to v0.32.0 (#3486) + - 0cedd702 2025-01-15T09:13:20+01:00 add bingo-upgrade target (#3489) + - 6d38dcf3 2025-01-15T09:13:15+01:00 add protocols to all ports in olm.yaml quickstart (#3421) + - 5e949143 2025-01-15T09:13:09+01:00 build(deps): bump github.com/maxbrunsfeld/counterfeiter/v6 (#3481) + - c35d31c8 2025-01-15T09:13:04+01:00 Bump go1.23 (#3484) + - 29a78323 2025-01-15T09:12:58+01:00 bump golang.org/x/net to 0.34.0 (#3485) -- oc image-amd64 e3b2070c4526bdcbc36ef734ec9f8bcf53d5e1c5 to e005223acd7c478bac070134c16f5533a258be12 - - 8a9474c5 2025-01-10T04:41:24-05:00 OCPBUGS-38975: monitor should not exit for temp api disconnect +- kubernetes image-amd64 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370 + - f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: : k8s-tests-ext should fully initialize test context + - eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: : ./hack/update-vendor.sh -- kubernetes image-amd64 3c62f738ce74a624d46b4f73f25d6c15b3a80a2b to 309f240e18f1da87bbe86c18746774d6d302f8ef - - 172a47bcf 2024-12-05T13:30:57+00:00 UPSTREAM: : Updating openshift-enterprise-pod-container image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/openshift-enterprise-pod.yml - -- oc image-arm64 e3b2070c4526bdcbc36ef734ec9f8bcf53d5e1c5 to e005223acd7c478bac070134c16f5533a258be12 - - 8a9474c5 2025-01-10T04:41:24-05:00 OCPBUGS-38975: monitor should not exit for temp api disconnect +- kubernetes image-arm64 309f240e18f1da87bbe86c18746774d6d302f8ef to 4b2db1ec33faa3ffc305e5ffa7376908cc955370 + - f2e69f331 2025-01-09T14:03:58-05:00 UPSTREAM: : k8s-tests-ext should fully initialize test context + - eef6379f7 2025-01-09T14:03:48-05:00 UPSTREAM: : ./hack/update-vendor.sh diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 672cd85eaa..dda26c2b88 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,20 +1,20 @@ -https://github.com/openshift/api embedded-component c1a063b1614ac3ccb0fc5ab49ba6158dfe8e3d3e +https://github.com/openshift/api embedded-component 52377f09e5c9293d4694c29375b35fb202bae222 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 9dceffb866318acb2bb77182095a18b6f397416f https://github.com/openshift/cluster-dns-operator embedded-component 0a9deeea4c335e259747b35267811a4a040289fd https://github.com/openshift/cluster-ingress-operator embedded-component 2856e6ddee396b3cb5492ac128c3015956651b51 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 218530fdea4e89b93bc6e136d8b5d8c3beacdd51 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component c8341b6b72ad221f16a5276729138adf9a347abe https://github.com/openshift/cluster-kube-scheduler-operator embedded-component b1cc4471e2f6c5dc81b2b9471f4634f1ecdb88b4 -https://github.com/openshift/cluster-network-operator embedded-component 2a17ab877fa8e7bef1703be85caed52ada384977 +https://github.com/openshift/cluster-network-operator embedded-component 722d631aab15ac726c45ad8d2d148843f3ec165b https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 91369d1d6c1e6196425c2f8742068c03bda1457d https://github.com/openshift/cluster-policy-controller embedded-component 327d3cbd82fd013a9d5d5733eb04cc0dcd97aec5 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 309f240e18f1da87bbe86c18746774d6d302f8ef +https://github.com/openshift/kubernetes embedded-component 4b2db1ec33faa3ffc305e5ffa7376908cc955370 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 4c521b09f4dc55ac69234419e083f3815646f4a9 https://github.com/openshift/machine-config-operator embedded-component 2a5d118838ed91860f4c371f378397670c86f5c2 https://github.com/openshift/openshift-controller-manager embedded-component 29531eafbff8b466bbee6a02c345f43245053482 -https://github.com/openshift/operator-framework-olm embedded-component 5423c783cc28cff7a9dc9000478f8b7b8b299762 +https://github.com/openshift/operator-framework-olm embedded-component 34e05d48c055b317af82867fed6a5ab4448ee5cd 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 e005223acd7c478bac070134c16f5533a258be12 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 1fc6ee158070b3 https://github.com/openshift/router image-amd64 7a688b0eab5a27fe13988a21022c774cdeb964b2 https://github.com/openshift/kube-rbac-proxy image-amd64 23f96a23777c1b5fcdb587602c156903c32fe52c https://github.com/openshift/ovn-kubernetes image-amd64 d8e16ec751e6c754ae1418b4aeb054dcc6d08fb3 -https://github.com/openshift/kubernetes image-amd64 309f240e18f1da87bbe86c18746774d6d302f8ef +https://github.com/openshift/kubernetes image-amd64 4b2db1ec33faa3ffc305e5ffa7376908cc955370 https://github.com/openshift/service-ca-operator image-amd64 1e65678429c82df5ae97da4dde8dbe03d75062e6 https://github.com/openshift/oc image-arm64 e005223acd7c478bac070134c16f5533a258be12 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 7a688b0eab5a27fe13988a21022c774cdeb964b2 https://github.com/openshift/kube-rbac-proxy image-arm64 23f96a23777c1b5fcdb587602c156903c32fe52c https://github.com/openshift/ovn-kubernetes image-arm64 d8e16ec751e6c754ae1418b4aeb054dcc6d08fb3 -https://github.com/openshift/kubernetes image-arm64 309f240e18f1da87bbe86c18746774d6d302f8ef +https://github.com/openshift/kubernetes image-arm64 4b2db1ec33faa3ffc305e5ffa7376908cc955370 https://github.com/openshift/service-ca-operator image-arm64 1e65678429c82df5ae97da4dde8dbe03d75062e6 From e143f0ec58aebee473339c823d15b94f7140bbe3 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:25:53 +0000 Subject: [PATCH 3/9] update microshift/go.mod --- go.mod | 62 +++++++++++++++++----------------- go.sum | 104 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 83 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index 00d3e314e6..f9ce8c6d4c 100644 --- a/go.mod +++ b/go.mod @@ -215,35 +215,35 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250110014345-309f240e18f1 // release kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250110014345-309f240e18f1 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250115192950-4b2db1ec33fa // release kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes ) replace ( @@ -254,6 +254,6 @@ replace ( 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-20250110014345-309f240e18f1 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes diff --git a/go.sum b/go.sum index 52fea247d4..68ddb48fbe 100644 --- a/go.sum +++ b/go.sum @@ -361,60 +361,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20241118170732-914783cae63a h1: 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-20250110014345-309f240e18f1 h1:FzKksGMGRFDkJznKkpkF6Hhn9JclMV6rx7o68R6lXRM= -github.com/openshift/kubernetes v0.0.0-20250110014345-309f240e18f1/go.mod h1:i/tRYbbdCLJCAobxOdsAUjYoYmUVsx16LAVn4mPHZgY= +github.com/openshift/kubernetes v0.0.0-20250115192950-4b2db1ec33fa h1:hM3Q/MF7tmHPbNHSFKNCHdIFovW/RX3vYqE45x61kKY= +github.com/openshift/kubernetes v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:XBs+CjyMMf0Ips7rCdesFnVbPbqiIvUoZ2XqGUxbEpI= 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-20250110014345-309f240e18f1 h1:L29rIcFmXWj9pAPCncg3zpUK/daensS3q5ERHEfKrro= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 h1:w+GkmQqJ/qG9gkC7kdlYKVpySbRpz2TQj/QTvZcA/K8= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1/go.mod h1:Ruk83+juksSdbZnOzlYZ1wivqvm59xcdKk/fqNwDznU= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 h1:z+bT6g7VX8XpBxwROZErWcWm2JHyLdIblDIERr8Chuw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 h1:ggDMbzS38iLNynjNRAJ6EyQtlCm/asbduGfsQcTbCYc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 h1:8I6PmgPblW/0MBdKsrOO4Xxb9hKdxv/ZtJQlON0yeUA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 h1:zfbA4cnmUzKAxIY0Zv/vwL/dvNBC+STMJnDFJO1tKxA= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1 h1:5h3tg+ujHuw3ueLQTgZevJE99XEEUk6TMTILBqUmQ6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1/go.mod h1:nEwZU7cFaFTfdGj+eeN32YEBiltU57p9/KQbku2JMMQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1 h1:st0gR7BsRdosoeaZyQG3vF4XHGZVWdkU6RFM1ggKqYM= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 h1:cjeNtMtojwY660rlvqgZkBQb0qKonvrRXDnDk66wLm4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 h1:xlQmst37EWvdf/mcvCJT3eVXtr1332TJNz8RC+IRfq0= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 h1:IzIvo6jojKSF1GBOzNDwjK4gh9NqNq+xqJzymx7yqR0= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1/go.mod h1:2JzBKPD3iMErlEQIR8VO51am4tEQPcdIlxA/XIq5IZU= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1 h1:nne9hZ9jUyT1/dEq2su2skPHgWR2sh3e7eIeB7ucHdI= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1/go.mod h1:2BwqD0XSL1pZmCLwgq/euzvpZv15BkmMmvYnSauKX/s= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 h1:79A9pYSa+BrNZHMgk2pLa0ChBbrvO3gcDJB2kr/we34= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1/go.mod h1:lp7qelVbS/vBUrZJYrCtuTcWqKh8iZEtJ2crnvNeutU= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1 h1:7Hg1ZU5+TVd0JtWyZxkWA8zvI9F4pI3DsQEMiB2YwyY= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 h1:PDANVluWUCkuku5QPNj/u6MNvxfouicL1VLWaq+LC98= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1/go.mod h1:mxCNug6Cazw294TvMT6XD1xfDQVKDX+TilBFrLCWA2I= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250110014345-309f240e18f1 h1:hh5/bREHyU/fGJ6evlibEWCx0lYWU+44Ql5VpjcORSY= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250110014345-309f240e18f1/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 h1:k3wZhKY5pOkVziiyg7nwys77788SaByRpX6GE6hdiTY= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1/go.mod h1:J+qSAy6to4f2zpJj8XqNEVLGpsMFGGOM76vcIvlSlNw= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 h1:VssPu9EQlgnHd/KkEzIlfypEGXnKvVrAPfL1ZSH+LZ8= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1/go.mod h1:PLkWx8t0apdKUCXIErr4AllJhsY5pcqGLnKSStJb3bI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1 h1:9GbcV3sDPglbuVMmWTQxMOVpg8E2L7m24J2HYkQ4+pE= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1 h1:iupDn547Q6LSyeSmXnCMSiNqvF6Osyrsd/jrFXqELe0= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 h1:QFaStQyo9Z3K+7J+6d2KAk5bZtYRI+j4vnwYfOiOXvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1 h1:5hn5C6D0jawXMuLh8D9R98QzKa062kdLrDx4NjVwn40= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1/go.mod h1:HswUBVS0yvgtBo2w71448AI5zlbPoj6TbNBG8UuApiI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 h1:8mCVpmHCzwdU1V3C6OqjjzTzPtOuTXSdKjqtXR+n2oQ= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1 h1:E2CpzP+7sFd6fpHCmH8KCJ43KVFOdgFykGlZ8ETCsEo= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 h1:U807z+mvvSuS1QewxqX/5J6MdXKHzvo8oyaWc99ByiI= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1/go.mod h1:8dzwMjAspNQcVCgZf0OSd6l0xnQ12tc5YzToLrZKNkg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa h1:lzxuqrkOd4n1xlypR5LiXMsuvkNXy5M6QJgwPOtbphA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa h1:4PjXZYXOE5y0tmTA9b9eZyiaLlfK7gi7zZy5UgQ0/Bo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:Ruk83+juksSdbZnOzlYZ1wivqvm59xcdKk/fqNwDznU= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa h1:AxX003VoRdQ93LwXd4pj4x0aM8ee/jP+HzZ2r8aTUJo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa h1:Ivz1yww+SNI1hkwnpG31KhYigW6aSuP+gRmj5HlmBWU= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa h1:Xr9511q7MmsRn8WlcvSMHfO/RybzaGbgjVryHFNLWpQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa h1:Rq7DE+/HjM9ZMyT6sy0cxj+N8VcIB/GilWf/AcW6efw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa h1:XIZU4JEXoR/sUjWrBepzF4FUsmPEgxl1x8UdmKA9GAo= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:nEwZU7cFaFTfdGj+eeN32YEBiltU57p9/KQbku2JMMQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa h1:1FmIZUfQS3/H8iWzr5eEeg9rxcsMjs6d6AvCoCFolkc= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:2FS5mTet6db56CX8fh1L3nSiRxhve6Bd6PzfWrKS2wY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa h1:fdMi2kLR8ykWE3del3uNcz2HAE2PkJiMGLDSizuwGkM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa h1:y31WMvG59QYNKNyEvObykyH4cDH4cLvU9VhDRyiwdeU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:IbbTVcuT16Q2Lj2vpV149HHSifXntLbpPhfS2olk77k= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa h1:Jebi69taKlbXq8yf6q42wg9nHseDekXJjlYXtT7PG4A= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:2JzBKPD3iMErlEQIR8VO51am4tEQPcdIlxA/XIq5IZU= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa h1:zACXcPrwy3Q4jy6QNqfhB4V0oV7FU2Dzu4duvTAHOu4= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:2BwqD0XSL1pZmCLwgq/euzvpZv15BkmMmvYnSauKX/s= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa h1:xLbJxA65VTRyi7HvpR4W2GhqLNVF39zvP3fncNXZFDQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:lp7qelVbS/vBUrZJYrCtuTcWqKh8iZEtJ2crnvNeutU= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa h1:7Oh8z8cXVI+ST+BET9zb9zwc3MsDEzoPaPErVOZKKjA= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:CE0eNw5xUf4V+w5ZEuXgGNwwWlzcrV3oeh1oN8A7byM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa h1:Nr64UPjUkS7Di7gY+Rk7C0b+UXysLxVkeGlidszhpOQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:mxCNug6Cazw294TvMT6XD1xfDQVKDX+TilBFrLCWA2I= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa h1:GZF+ypewdo7p1b8IBOnb+c+MJVcxG+EUKTAeu9ASuGc= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:px0rSZFc5gdAy43OLtaK/W1n4Y2+KRb99/gw5e5Nfww= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa h1:3/WHYbTr3xl//BZwrOrSeGCuljtG1zlIBKTU/YMFAJU= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:J+qSAy6to4f2zpJj8XqNEVLGpsMFGGOM76vcIvlSlNw= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa h1:jNNWPtEc2QLpPSVFQJ3idTrmY9Mo4TbRP4EPcTF9CEM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:PLkWx8t0apdKUCXIErr4AllJhsY5pcqGLnKSStJb3bI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa h1:cgtPnDvqfZ9fSHKipr213qCwQMAd/Q2qInnnQ5jsaX4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:VkQi50CDzkd4QEa3owKply2MDujz8+HlHI5T9Oan0a4= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa h1:TS69dhRYv63wu/uY5Bi9OsIL/w6GqhDMEpFeuV97ojk= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:8RBMsB1Vyp8wJe4Hu02I7I6assk7uqz6F1j9ejG5pBw= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa h1:7X0ykgD+hmZZeAKqjrN5mSu+11+kYie0Pui6BHHMEow= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa h1:NLIkEcDotBdVUiKSBivhECSmukxka5YRiPKfA0la3A8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:HswUBVS0yvgtBo2w71448AI5zlbPoj6TbNBG8UuApiI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa h1:NsFst6wNr1+sxUKyej6TY5e/2OqEvE3y5K9DcbNo9xo= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:HV9BaMyhMoKhNyiYho+m1DgNCu3Dcb4Y8DjeoJLDqE8= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa h1:YhMA1LbfpUrxzFDTJ63plK8yrdVv0P9QnLvQ8n62E0E= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:+OJMa3w16QOf8hZQu6Cq+pAt5nRnLWjcc1/ZGi+LTCk= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa h1:Zc/UkwrtkbYAGN1E6i/uTgJ+liJSvHRE50EoqmxizeU= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:8dzwMjAspNQcVCgZf0OSd6l0xnQ12tc5YzToLrZKNkg= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= From ed5a991f25f67336c34d23e709b6a5f4ee2f75ba Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:14 +0000 Subject: [PATCH 4/9] update microshift/vendor --- vendor/modules.txt | 114 ++++++++++++++++++++++----------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/vendor/modules.txt b/vendor/modules.txt index 8360a1470c..3548b68b88 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1197,7 +1197,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1257,7 +1257,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 +# k8s.io/apiextensions-apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1304,7 +1304,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1375,7 +1375,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1550,13 +1550,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-20250110014345-309f240e18f1 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1914,7 +1914,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-20250110014345-309f240e18f1 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -1936,14 +1936,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-20250110014345-309f240e18f1 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -1977,7 +1977,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 +# k8s.io/component-helpers v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -1990,7 +1990,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 +# k8s.io/controller-manager v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2007,27 +2007,27 @@ 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-20250110014345-309f240e18f1 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 +# k8s.io/cri-client v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.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-20250110014345-309f240e18f1 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/csi-translation-lib k8s.io/csi-translation-lib/plugins -# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 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-20250110014345-309f240e18f1 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2052,13 +2052,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 +# k8s.io/kms v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 +# k8s.io/kube-aggregator v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2091,7 +2091,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-20250110014345-309f240e18f1 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2124,11 +2124,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-20250110014345-309f240e18f1 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kube-scheduler/config/v1 k8s.io/kube-scheduler/extender/v1 -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2163,7 +2163,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-20250110014345-309f240e18f1 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2184,7 +2184,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.31.1 => github.com/openshift/kubernetes v0.0.0-20250110014345-309f240e18f1 +# k8s.io/kubernetes v1.31.1 => github.com/openshift/kubernetes v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -2994,7 +2994,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3009,10 +3009,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-20250110014345-309f240e18f1 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 +# k8s.io/pod-security-admission v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3164,38 +3164,38 @@ 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.20241008152707-25bf9f14db44 -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250110014345-309f240e18f1 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250110014345-309f240e18f1 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250110014345-309f240e18f1 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250115192950-4b2db1ec33fa # 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 # 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-20250110014345-309f240e18f1 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa From a4fd7d010dd9c8dde6b23f573146642415fc5e9d Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:14 +0000 Subject: [PATCH 5/9] update etcd/go.mod --- etcd/go.mod | 62 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 ++++++++++++------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index f41c321e86..3d0172bf39 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -151,37 +151,37 @@ replace ( 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-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250110014345-309f240e18f1 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250110014345-309f240e18f1 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250110014345-309f240e18f1 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes -replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 // staging kubernetes +replace k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 14f180a092..11b1c5bbb7 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -190,20 +190,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20241118170732-914783cae63a h1:P1hNaY 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-20250110014345-309f240e18f1 h1:L29rIcFmXWj9pAPCncg3zpUK/daensS3q5ERHEfKrro= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 h1:z+bT6g7VX8XpBxwROZErWcWm2JHyLdIblDIERr8Chuw= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 h1:ggDMbzS38iLNynjNRAJ6EyQtlCm/asbduGfsQcTbCYc= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 h1:8I6PmgPblW/0MBdKsrOO4Xxb9hKdxv/ZtJQlON0yeUA= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 h1:zfbA4cnmUzKAxIY0Zv/vwL/dvNBC+STMJnDFJO1tKxA= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 h1:cjeNtMtojwY660rlvqgZkBQb0qKonvrRXDnDk66wLm4= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 h1:QFaStQyo9Z3K+7J+6d2KAk5bZtYRI+j4vnwYfOiOXvQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa h1:lzxuqrkOd4n1xlypR5LiXMsuvkNXy5M6QJgwPOtbphA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:Lx6jvlmXgJVnqVDARguhONKwlnGahRSWUl57wJltaj8= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa h1:AxX003VoRdQ93LwXd4pj4x0aM8ee/jP+HzZ2r8aTUJo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:DESUJPjrTWS0YmETcifsHEKOo08a7J20LkYD8kSuPaI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa h1:Ivz1yww+SNI1hkwnpG31KhYigW6aSuP+gRmj5HlmBWU= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:Pe8Uicw828Quq+iQKnOG2MB0dZs1qFNcvnixRuMD/58= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa h1:Xr9511q7MmsRn8WlcvSMHfO/RybzaGbgjVryHFNLWpQ= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:7mIF0av5qJ4DSYGbNLBdzbf93wTdmRigWWMm3oroVPY= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa h1:Rq7DE+/HjM9ZMyT6sy0cxj+N8VcIB/GilWf/AcW6efw= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:KEnQp4pgQ2zdMSYfbCYTs0YasvrxAVx2iekiuoJYjQM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa h1:fdMi2kLR8ykWE3del3uNcz2HAE2PkJiMGLDSizuwGkM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:B0udSKuoZLeZEw3o8rNmP9ONicaSjCf/RHx2oZ/7laQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa h1:7X0ykgD+hmZZeAKqjrN5mSu+11+kYie0Pui6BHHMEow= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa/go.mod h1:ZZoyj+ofRlbElHajU0pqTd6fEinQQW/B+8RQpMJ7PlM= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060 h1:jiDC7d8d+jmjv2WfiMY0+Uf55q11MGyYkGGqXnfqWTU= github.com/openshift/library-go v0.0.0-20241107160307-0064ad7bd060/go.mod h1:9B1MYPoLtP9tqjWxcbUNVpwxy68zOH/3EIP6c31dAM0= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20241008152707-25bf9f14db44 h1:dKUAGq29JBk2oRn955gnnz3sG/UhlkUKh1ISleLiews= From 7c352717a8111e45f8d82aa20feb8e6cce943929 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:26 +0000 Subject: [PATCH 6/9] update etcd/vendor --- etcd/vendor/modules.txt | 76 ++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 439605d45c..bcd4bd91ea 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -626,7 +626,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250110014345-309f240e18f1 +# k8s.io/api v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -686,7 +686,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 +# k8s.io/apimachinery v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -746,18 +746,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 +# k8s.io/apiserver v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.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-20250110014345-309f240e18f1 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 +# k8s.io/client-go v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -912,7 +912,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.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 +# k8s.io/component-base v0.31.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -949,7 +949,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-20250110014345-309f240e18f1 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1077,34 +1077,34 @@ sigs.k8s.io/yaml/goyaml.v3 # 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-20250110014345-309f240e18f1 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250110014345-309f240e18f1 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250110014345-309f240e18f1 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250110014345-309f240e18f1 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250110014345-309f240e18f1 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250110014345-309f240e18f1 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250110014345-309f240e18f1 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250110014345-309f240e18f1 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250110014345-309f240e18f1 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250110014345-309f240e18f1 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250110014345-309f240e18f1 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250110014345-309f240e18f1 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250110014345-309f240e18f1 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250110014345-309f240e18f1 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250110014345-309f240e18f1 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250110014345-309f240e18f1 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250110014345-309f240e18f1 -# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250110014345-309f240e18f1 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250115192950-4b2db1ec33fa +# k8s.io/cri-client => github.com/openshift/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250115192950-4b2db1ec33fa From b178616344b64733b65c54dd1431caa7960b9206 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:27 +0000 Subject: [PATCH 7/9] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index e564838a61..0418d04a17 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:d2335d17a85a246ff7483cf759659bc58b1808f6310d6fa1d4ebcf27364e426d" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c93e64aba731aff14564a9c01a7f4b8ed0ddd79966dcbc56b887248935958d42" 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 7794a44ce2..6435e15516 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:d0465d53320dc8eecafe79ac642c94cd3c72cf76051cb545936d05f5ac7fc26f" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02b2a194349243c12a551c5281c2c782ae2b4a5be783cd0ca794dd6072968adf" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 5754d30535a740f8a7ea3195cd4fadf24f4e0ee5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:28 +0000 Subject: [PATCH 8/9] update manifests --- .../multus/release-multus-aarch64.json | 2 +- .../multus/release-multus-x86_64.json | 2 +- .../0000_50_olm_00-catalogsources.crd.yaml | 2 +- ..._50_olm_00-clusterserviceversions.crd.yaml | 291 +++++++++++++----- .../0000_50_olm_00-installplans.crd.yaml | 2 +- .../0000_50_olm_00-olmconfigs.crd.yaml | 2 +- ...0000_50_olm_00-operatorconditions.crd.yaml | 2 +- .../0000_50_olm_00-operatorgroups.crd.yaml | 2 +- .../0000_50_olm_00-operators.crd.yaml | 2 +- .../0000_50_olm_00-subscriptions.crd.yaml | 60 +++- .../kustomization.aarch64.yaml | 2 +- .../kustomization.x86_64.yaml | 8 +- .../release-olm-aarch64.json | 4 +- .../release-olm-x86_64.json | 6 +- assets/release/release-aarch64.json | 6 +- assets/release/release-x86_64.json | 4 +- 16 files changed, 281 insertions(+), 116 deletions(-) diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index d9d3f3dd38..130e60b6bb 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-01-15-233735" + "base": "4.19.0-0.nightly-arm64-2025-01-17-000530" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ecfae89c530c3bc40085299a973fea1d8ec7e237212d7a7296f455ba852b478", diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index ee7d5abc31..2367970402 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2025-01-15-060507" + "base": "4.19.0-0.nightly-2025-01-16-064700" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba87d15e49bf4b0ec404e0ad6c2ee4f2c20cfc2bdd5fb725136a157dc2ad2f1", diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml index a08143818d..efc5c34201 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml index 99ba54fd3a..bf72be3a15 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" @@ -1962,7 +1962,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -1977,7 +1977,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -2024,7 +2024,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -2036,8 +2036,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -2068,7 +2068,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -2083,7 +2083,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -2130,7 +2130,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -2142,8 +2142,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -2169,7 +2169,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -2190,7 +2190,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -2208,7 +2208,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -2273,7 +2273,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -2375,7 +2375,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -2396,7 +2396,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -2414,7 +2414,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -2479,7 +2479,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -2818,7 +2818,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -2839,7 +2839,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -2857,7 +2857,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -2922,7 +2922,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -3126,9 +3126,12 @@ spec: type: object properties: name: - description: Required. + description: |- + Name is this DNS resolver option's name. + Required. type: string value: + description: Value is this DNS resolver option's value. type: string x-kubernetes-list-type: atomic searches: @@ -3395,7 +3398,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -3410,7 +3413,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -3457,7 +3460,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -3469,8 +3472,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -3501,7 +3504,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -3516,7 +3519,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -3563,7 +3566,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -3575,8 +3578,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -3598,7 +3601,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -3619,7 +3622,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -3637,7 +3640,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -3702,7 +3705,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -3792,7 +3795,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -3813,7 +3816,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -3831,7 +3834,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -3896,7 +3899,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -4215,7 +4218,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -4236,7 +4239,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -4254,7 +4257,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -4319,7 +4322,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -4832,7 +4835,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -4847,7 +4850,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -4894,7 +4897,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -4906,8 +4909,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -4938,7 +4941,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -4953,7 +4956,7 @@ spec: type: string x-kubernetes-list-type: atomic httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -5000,7 +5003,7 @@ spec: Defaults to HTTP. type: string sleep: - description: Sleep represents the duration that the container should sleep before being terminated. + description: Sleep represents a duration that the container should sleep. type: object required: - seconds @@ -5012,8 +5015,8 @@ spec: tcpSocket: description: |- Deprecated. TCPSocket is NOT supported as a LifecycleHandler and kept - for the backward compatibility. There are no validation of this field and - lifecycle hooks will fail in runtime when tcp handler is specified. + for backward compatibility. There is no validation of this field and + lifecycle hooks will fail at runtime when it is specified. type: object required: - port @@ -5039,7 +5042,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -5060,7 +5063,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -5078,7 +5081,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -5143,7 +5146,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -5245,7 +5248,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -5266,7 +5269,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -5284,7 +5287,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -5349,7 +5352,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -5688,7 +5691,7 @@ spec: type: object properties: exec: - description: Exec specifies the action to take. + description: Exec specifies a command to execute in the container. type: object properties: command: @@ -5709,7 +5712,7 @@ spec: type: integer format: int32 grpc: - description: GRPC specifies an action involving a GRPC port. + description: GRPC specifies a GRPC HealthCheckRequest. type: object required: - port @@ -5727,7 +5730,7 @@ spec: type: string default: "" httpGet: - description: HTTPGet specifies the http request to perform. + description: HTTPGet specifies an HTTP GET request to perform. type: object required: - port @@ -5792,7 +5795,7 @@ spec: type: integer format: int32 tcpSocket: - description: TCPSocket specifies an action involving a TCP port. + description: TCPSocket specifies a connection to a TCP port. type: object required: - port @@ -6144,6 +6147,74 @@ spec: x-kubernetes-list-map-keys: - name x-kubernetes-list-type: map + resources: + description: |- + Resources is the total amount of CPU and Memory resources required by all + containers in the pod. It supports specifying Requests and Limits for + "cpu" and "memory" resource names only. ResourceClaims are not supported. + + This field enables fine-grained control over resource allocation for the + entire pod, allowing resource sharing among containers in a pod. + + This is an alpha field and requires enabling the PodLevelResources feature + gate. + type: object + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + This field is immutable. It can only be set for containers. + type: array + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + type: object + required: + - name + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + additionalProperties: + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true + requests: + description: |- + Requests describes the minimum amount of compute resources required. + If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, + otherwise to an implementation-defined value. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + additionalProperties: + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + anyOf: + - type: integer + - type: string + x-kubernetes-int-or-string: true restartPolicy: description: |- Restart policy for all containers within the pod. @@ -6268,6 +6339,32 @@ spec: Note that this field cannot be set when spec.os.name is windows. type: integer format: int64 + seLinuxChangePolicy: + description: |- + seLinuxChangePolicy defines how the container's SELinux label is applied to all volumes used by the Pod. + It has no effect on nodes that do not support SELinux or to volumes does not support SELinux. + Valid values are "MountOption" and "Recursive". + + "Recursive" means relabeling of all files on all Pod volumes by the container runtime. + This may be slow for large volumes, but allows mixing privileged and unprivileged Pods sharing the same volume on the same node. + + "MountOption" mounts all eligible Pod volumes with `-o context` mount option. + This requires all Pods that share the same volume to use the same SELinux label. + It is not possible to share the same volume among privileged and unprivileged Pods. + Eligible volumes are in-tree FibreChannel and iSCSI volumes, and all CSI volumes + whose CSI driver announces SELinux support by setting spec.seLinuxMount: true in their + CSIDriver instance. Other volumes are always re-labelled recursively. + "MountOption" value is allowed only when SELinuxMount feature gate is enabled. + + If not specified and SELinuxMount feature gate is enabled, "MountOption" is used. + If not specified and SELinuxMount feature gate is disabled, "MountOption" is used for ReadWriteOncePod volumes + and "Recursive" for all other volumes. + + This field affects only Pods that have SELinux label set, either in PodSecurityContext or in SecurityContext of all containers. + + All Pods that use the same volume should use the same seLinuxChangePolicy, otherwise some pods can get stuck in ContainerCreating state. + Note that this field cannot be set when spec.os.name is windows. + type: string seLinuxOptions: description: |- The SELinux context to be applied to all containers. @@ -6667,6 +6764,8 @@ spec: description: |- awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. + Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree + awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore type: object required: @@ -6698,7 +6797,10 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore type: string azureDisk: - description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + description: |- + azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type + are redirected to the disk.csi.azure.com CSI driver. type: object required: - diskName @@ -6730,7 +6832,10 @@ spec: type: boolean default: false azureFile: - description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. + description: |- + azureFile represents an Azure File Service mount on the host and bind mount to the pod. + Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type + are redirected to the file.csi.azure.com CSI driver. type: object required: - secretName @@ -6748,7 +6853,9 @@ spec: description: shareName is the azure share Name type: string cephfs: - description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime + description: |- + cephFS represents a Ceph FS mount on the host that shares a pod's lifetime. + Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported. type: object required: - monitors @@ -6799,6 +6906,8 @@ spec: cinder: description: |- cinder represents a cinder volume attached and mounted on kubelets host machine. + Deprecated: Cinder is deprecated. All operations for the in-tree cinder type + are redirected to the cinder.csi.openstack.org CSI driver. More info: https://examples.k8s.io/mysql-cinder-pd/README.md type: object required: @@ -6905,7 +7014,7 @@ spec: type: boolean x-kubernetes-map-type: atomic csi: - description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature). + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers. type: object required: - driver @@ -7347,6 +7456,7 @@ spec: description: |- flexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. + Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead. type: object required: - driver @@ -7390,7 +7500,9 @@ spec: default: "" x-kubernetes-map-type: atomic flocker: - description: flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running + description: |- + flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running. + Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported. type: object properties: datasetName: @@ -7405,6 +7517,8 @@ spec: description: |- gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and then exposed to the pod. + Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree + gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk type: object required: @@ -7440,7 +7554,7 @@ spec: gitRepo: description: |- gitRepo represents a git repository at a particular revision. - DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an + Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod's container. type: object @@ -7463,6 +7577,7 @@ spec: glusterfs: description: |- glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. + Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported. More info: https://examples.k8s.io/volumes/glusterfs/README.md type: object required: @@ -7669,7 +7784,9 @@ spec: Default false. type: boolean photonPersistentDisk: - description: photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine + description: |- + photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine. + Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported. type: object required: - pdID @@ -7684,7 +7801,11 @@ spec: description: pdID is the ID that identifies Photon Controller persistent disk type: string portworxVolume: - description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine + description: |- + portworxVolume represents a portworx volume attached and mounted on kubelets host machine. + Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type + are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate + is on. type: object required: - volumeID @@ -8019,7 +8140,9 @@ spec: type: string x-kubernetes-list-type: atomic quobyte: - description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime + description: |- + quobyte represents a Quobyte mount on the host that shares a pod's lifetime. + Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported. type: object required: - registry @@ -8057,6 +8180,7 @@ spec: rbd: description: |- rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. + Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported. More info: https://examples.k8s.io/volumes/rbd/README.md type: object required: @@ -8129,7 +8253,9 @@ spec: type: string default: admin scaleIO: - description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. + description: |- + scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. + Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported. type: object required: - gateway @@ -8255,7 +8381,9 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#secret type: string storageos: - description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. + description: |- + storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. + Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported. type: object properties: fsType: @@ -8300,7 +8428,10 @@ spec: Namespaces that do not pre-exist within StorageOS will be created. type: string vsphereVolume: - description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine + description: |- + vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine. + Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type + are redirected to the csi.vsphere.vmware.com CSI driver. type: object required: - volumePath diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml index 2593546c8e..45abbc70ed 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml index b2b4d1ec28..000d18961b 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml index 9bac00bd90..0a07d32631 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml index ca57e20b85..e6100bf0f6 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml index b93e4eca8e..9ebc29f255 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml index 28e6f23efc..65177c2bb7 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.0 include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" capability.openshift.io/name: "OperatorLifecycleManager" @@ -1362,6 +1362,8 @@ spec: description: |- awsElasticBlockStore represents an AWS Disk resource that is attached to a kubelet's host machine and then exposed to the pod. + Deprecated: AWSElasticBlockStore is deprecated. All operations for the in-tree + awsElasticBlockStore type are redirected to the ebs.csi.aws.com CSI driver. More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore type: object required: @@ -1393,7 +1395,10 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#awselasticblockstore type: string azureDisk: - description: azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + description: |- + azureDisk represents an Azure Data Disk mount on the host and bind mount to the pod. + Deprecated: AzureDisk is deprecated. All operations for the in-tree azureDisk type + are redirected to the disk.csi.azure.com CSI driver. type: object required: - diskName @@ -1425,7 +1430,10 @@ spec: type: boolean default: false azureFile: - description: azureFile represents an Azure File Service mount on the host and bind mount to the pod. + description: |- + azureFile represents an Azure File Service mount on the host and bind mount to the pod. + Deprecated: AzureFile is deprecated. All operations for the in-tree azureFile type + are redirected to the file.csi.azure.com CSI driver. type: object required: - secretName @@ -1443,7 +1451,9 @@ spec: description: shareName is the azure share Name type: string cephfs: - description: cephFS represents a Ceph FS mount on the host that shares a pod's lifetime + description: |- + cephFS represents a Ceph FS mount on the host that shares a pod's lifetime. + Deprecated: CephFS is deprecated and the in-tree cephfs type is no longer supported. type: object required: - monitors @@ -1494,6 +1504,8 @@ spec: cinder: description: |- cinder represents a cinder volume attached and mounted on kubelets host machine. + Deprecated: Cinder is deprecated. All operations for the in-tree cinder type + are redirected to the cinder.csi.openstack.org CSI driver. More info: https://examples.k8s.io/mysql-cinder-pd/README.md type: object required: @@ -1600,7 +1612,7 @@ spec: type: boolean x-kubernetes-map-type: atomic csi: - description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers (Beta feature). + description: csi (Container Storage Interface) represents ephemeral storage that is handled by certain external CSI drivers. type: object required: - driver @@ -2042,6 +2054,7 @@ spec: description: |- flexVolume represents a generic volume resource that is provisioned/attached using an exec based plugin. + Deprecated: FlexVolume is deprecated. Consider using a CSIDriver instead. type: object required: - driver @@ -2085,7 +2098,9 @@ spec: default: "" x-kubernetes-map-type: atomic flocker: - description: flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running + description: |- + flocker represents a Flocker volume attached to a kubelet's host machine. This depends on the Flocker control service being running. + Deprecated: Flocker is deprecated and the in-tree flocker type is no longer supported. type: object properties: datasetName: @@ -2100,6 +2115,8 @@ spec: description: |- gcePersistentDisk represents a GCE Disk resource that is attached to a kubelet's host machine and then exposed to the pod. + Deprecated: GCEPersistentDisk is deprecated. All operations for the in-tree + gcePersistentDisk type are redirected to the pd.csi.storage.gke.io CSI driver. More info: https://kubernetes.io/docs/concepts/storage/volumes#gcepersistentdisk type: object required: @@ -2135,7 +2152,7 @@ spec: gitRepo: description: |- gitRepo represents a git repository at a particular revision. - DEPRECATED: GitRepo is deprecated. To provision a container with a git repo, mount an + Deprecated: GitRepo is deprecated. To provision a container with a git repo, mount an EmptyDir into an InitContainer that clones the repo using git, then mount the EmptyDir into the Pod's container. type: object @@ -2158,6 +2175,7 @@ spec: glusterfs: description: |- glusterfs represents a Glusterfs mount on the host that shares a pod's lifetime. + Deprecated: Glusterfs is deprecated and the in-tree glusterfs type is no longer supported. More info: https://examples.k8s.io/volumes/glusterfs/README.md type: object required: @@ -2364,7 +2382,9 @@ spec: Default false. type: boolean photonPersistentDisk: - description: photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine + description: |- + photonPersistentDisk represents a PhotonController persistent disk attached and mounted on kubelets host machine. + Deprecated: PhotonPersistentDisk is deprecated and the in-tree photonPersistentDisk type is no longer supported. type: object required: - pdID @@ -2379,7 +2399,11 @@ spec: description: pdID is the ID that identifies Photon Controller persistent disk type: string portworxVolume: - description: portworxVolume represents a portworx volume attached and mounted on kubelets host machine + description: |- + portworxVolume represents a portworx volume attached and mounted on kubelets host machine. + Deprecated: PortworxVolume is deprecated. All operations for the in-tree portworxVolume type + are redirected to the pxd.portworx.com CSI driver when the CSIMigrationPortworx feature-gate + is on. type: object required: - volumeID @@ -2714,7 +2738,9 @@ spec: type: string x-kubernetes-list-type: atomic quobyte: - description: quobyte represents a Quobyte mount on the host that shares a pod's lifetime + description: |- + quobyte represents a Quobyte mount on the host that shares a pod's lifetime. + Deprecated: Quobyte is deprecated and the in-tree quobyte type is no longer supported. type: object required: - registry @@ -2752,6 +2778,7 @@ spec: rbd: description: |- rbd represents a Rados Block Device mount on the host that shares a pod's lifetime. + Deprecated: RBD is deprecated and the in-tree rbd type is no longer supported. More info: https://examples.k8s.io/volumes/rbd/README.md type: object required: @@ -2824,7 +2851,9 @@ spec: type: string default: admin scaleIO: - description: scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. + description: |- + scaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes. + Deprecated: ScaleIO is deprecated and the in-tree scaleIO type is no longer supported. type: object required: - gateway @@ -2950,7 +2979,9 @@ spec: More info: https://kubernetes.io/docs/concepts/storage/volumes#secret type: string storageos: - description: storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. + description: |- + storageOS represents a StorageOS volume attached and mounted on Kubernetes nodes. + Deprecated: StorageOS is deprecated and the in-tree storageos type is no longer supported. type: object properties: fsType: @@ -2995,7 +3026,10 @@ spec: Namespaces that do not pre-exist within StorageOS will be created. type: string vsphereVolume: - description: vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine + description: |- + vsphereVolume represents a vSphere volume attached and mounted on kubelets host machine. + Deprecated: VsphereVolume is deprecated. All operations for the in-tree vsphereVolume type + are redirected to the csi.vsphere.vmware.com CSI driver. type: object required: - volumePath diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index d0cffab483..8402242501 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -8,7 +8,7 @@ images: digest: sha256:c6d5355654a9b51f38121fa2049fcb641d03c12d4b0163d0099290cb3c0efe31 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94 + digest: sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6 patches: - patch: |- diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index 5d380e20b7..78972c22ba 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd + digest: sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17 + digest: sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da @@ -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:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89 - 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:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742 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 8e9c5e8b9c..5a5e16bb16 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-01-15-233735" + "base": "4.19.0-0.nightly-arm64-2025-01-17-000530" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb8a8b3aea5dbe8483b205f60bf3730c0c525fd2264d1045513c7a15a17508b4", "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6d5355654a9b51f38121fa2049fcb641d03c12d4b0163d0099290cb3c0efe31", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94" + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6" } } 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 f374d405aa..0f69938262 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-01-15-060507" + "base": "4.19.0-0.nightly-2025-01-16-064700" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67cf3b46afd76a6a9ffa2d7ff2d191548d74283c795ee9bb02c1cbdbc55466dd", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e42a41ffe40af3dc007062fdf16f5ed95a60f416050645c1a0706d114c59aa17", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8888fbe2a8d717d3280d6a063cbad519a16dd923434175f9e1e6231880d12742", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:080b78a2bc2e04cd7477ea2ad1f6fb9f4a4eb60d0e4ccbb2db02a17a9ce06d89", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index d6981161dd..8a5501be12 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,14 +1,14 @@ { "release": { - "base": "4.19.0-0.nightly-arm64-2025-01-15-233735" + "base": "4.19.0-0.nightly-arm64-2025-01-17-000530" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79daa4255ae7d52116b206e25d1fd285967da7fce179337ba58026437005339b", "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1944c0f5c02cbba2f9e4ac3e264014b5914d120161da9ae818349fa692c983f", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19d7cdc13db3a53401c8898d92891d35c7465cbffa9ff3d039ab55b0463c2ee8", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab0f86af333b37420a0428c74bfe0834fb9f9f4a01430fd8ac277c42d808cb94", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:290478ee07daaf4795f9925609bcd24e4ddcec635a28d5f9f70da8592c4458c6", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1686f04471a262c825b19e85bc7d2ada024f5bf466dc1c8b56ec99e262788b8", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0465d53320dc8eecafe79ac642c94cd3c72cf76051cb545936d05f5ac7fc26f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02b2a194349243c12a551c5281c2c782ae2b4a5be783cd0ca794dd6072968adf", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd2bd449b91edb7c18bc4ef1aa98e63f11b0320244185057b7125c57c050bdc9", "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:f580783b073c4bb8500c3431cec33004126651e7cbf45a82995267d490803a3c" diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 9ee38da983..0529bc4c28 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.19.0-0.nightly-2025-01-15-060507" + "base": "4.19.0-0.nightly-2025-01-16-064700" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8c0615f0b2dde5d2673cc844ee5e4d05709446073314199a296ed07b2a77942a", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1aa95dad438a475f13c3791cea2dcfdc91c20bc56ef4bed9805d4b38c3485003", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a595fb8d2b6fe666aad183f10059b687e5d1db91f2862e2143d86ebf3987da", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db7a73992e1f2225c590111fb9e65b8a4bf67889f9f1ea9a7593808ba218c81b", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2335d17a85a246ff7483cf759659bc58b1808f6310d6fa1d4ebcf27364e426d", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c93e64aba731aff14564a9c01a7f4b8ed0ddd79966dcbc56b887248935958d42", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2faf3ab096e8782738498c50006c40e70b46b4534b1a924d6a589cc733b2e6b", "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:6a2950189f14f1a54735f613be6700464a4928376f81bf9b80df0bac3d2623ad" From 786445325e3a9af5a63dd2b923d842bbac735bcd Mon Sep 17 00:00:00 2001 From: ci-robot Date: Fri, 17 Jan 2025 04:26:29 +0000 Subject: [PATCH 9/9] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index a9f5f3f440..65348de42f 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=31 KUBE_GIT_VERSION=v1.31.3 -KUBE_GIT_COMMIT=309f240e18f1da87bbe86c18746774d6d302f8ef +KUBE_GIT_COMMIT=4b2db1ec33faa3ffc305e5ffa7376908cc955370 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 6b2844b09a..6ccf066df8 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-15-233735 +OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-17-000530 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 7228ae6f53..d8447b0194 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.19.0-0.nightly-2025-01-15-060507 +OCP_VERSION := 4.19.0-0.nightly-2025-01-16-064700