From ca9853bdd45bf70b794fd80242218c79d9611a80 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:26:23 +0000 Subject: [PATCH 1/8] 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 d58d6dd1c1..64c8dcce9d 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-08-09-031511" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-12-210753" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-08-27-181947" From 23d122d4b7b1d8ac279ec022613512220977e3e6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:26:23 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 349 ++++++++++++++++++++++++++++-- scripts/auto-rebase/commits.txt | 36 +-- 2 files changed, 347 insertions(+), 38 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3d1069081c..825aee3a22 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,32 +1,341 @@ -- api embedded-component 3cab566552bbc5c8ce7d11991cbc2bd1f21e1e1b to cbdcd0df43e80e4b31d1804e471828ed16fe06dc - - 24092e9 2024-08-08T04:24:09-07:00 Power VS: Move Power VS to CAPI by default - - 942fac4 2024-08-07T09:57:35-03:00 make update - - 0b113a5 2024-08-07T09:57:34-03:00 Add API for enabling EFS volume metrics - - 8f11151 2024-08-06T13:46:24-04:00 Promote Azure CAPI as the default Install method +- api embedded-component cbdcd0df43e80e4b31d1804e471828ed16fe06dc to 2b42490270d8559f3e668d1574aacc73329c8116 + - b3cbbee 2024-08-22T11:39:33-04:00 Allow 1-week window for lookback for feature gate testing + - 8a4c0e1 2024-08-22T09:57:52-04:00 SCC: update x-kubernetes-list-type + - dc6c8d5 2024-08-22T09:57:51-04:00 SCC: add UserNamespaceLevel field + - 4c3a2fe 2024-08-19T15:12:52-04:00 feature gates: add ProcMountType to tech preview + - c4cbea5 2024-08-19T15:12:51-04:00 add UserNamespacesSupport to TechPreview feature gates + - 57b5c82 2024-08-16T10:54:30-04:00 Add network stack to table header + - 4e4c676 2024-08-16T10:04:01-04:00 featuregate analyzer: fix platform name for metal + - 165518d 2024-08-16T14:49:07+05:30 use atomic listType for RouteIngress + - 51ecfb8 2024-08-15T16:06:01+01:00 Update envtest publishing to create index file + - 3d07adc 2024-08-15T09:33:44-04:00 featuregates: add metal jobs for test analyzer + - 227592a 2024-08-15T13:31:08+01:00 Remove CloudProviderExternal feature gates + - 4b66025 2024-08-14T10:04:25-04:00 featuregate analyzer: use correct platform name + - fa3fbfe 2024-08-13T09:04:11-07:00 set x-kubernetes-list-type for image crd list fields + - 6eeb192 2024-08-13T08:40:25-07:00 Introduce ImageStreamImportMode field in the image config + - 755708d 2024-08-13T07:29:45-04:00 Revert "Merge pull request #1988 from tssurya/graduate-udn-to-ga" + - 69eb65f 2024-08-12T09:35:40+02:00 example integration test for set of strings + - 2f5d76a 2024-08-09T20:31:19+05:30 Add the field "CapacityReservationID" to "AwsMachineProviderConfig" + - 64e5a15 2024-08-09T08:44:10-04:00 update generated files + - 4c9a161 2024-08-09T08:38:07-04:00 Deprecate openshift-sdn + - 2703f42 2024-08-09T08:38:07-04:00 Deprecate network type migration. + - 5cd96ef 2024-08-08T22:53:07+02:00 Graduate UserDefinedNetworks to GA + - 6fbc08e 2024-08-06T14:48:19+02:00 MULTIARCH-4776: /MULTIARCH-4770: installer: promote MultiArchInstall FGs + - 748eeb7 2024-08-05T16:25:28+05:30 CFE-921: Enable GCPLabelsTags featureGate by default for GA + - d2dd5b7 2024-07-12T17:01:40+05:30 fix ListsMustHaveSSATags failures + - 3981780 2024-07-11T19:59:07+05:30 OCPBUGS-36479: remove duplicate featuregate 'ExternalRouteCertificate' -- cluster-ingress-operator embedded-component 338435581ef8ffeaa793d5acdbebf3dbad3c6f48 to 7cf86c7c749fa62b9cffd9a62275e33a4083985e - - 2639954 2024-08-07T12:41:52-04:00 Bump controller-runtime to v0.18.4 +- cluster-dns-operator embedded-component 54eea5bb02911cdf0c7fb6dbb80366eb5a923ea7 to 3a727094ce02cc90e73ca0876eaecaf46f05fbd9 + - dee78ad 2024-08-09T18:29:22-04:00 Bump to k8s.io v0.30.3, controller-runtime v0.18.4 -- cluster-network-operator embedded-component 007124e56caf6a40af5d946884efb832889443c4 to d0ca3151c265f8c23fecdd82b9fc634e4a2c3756 - - 61e73d2 2024-08-07T20:30:18+03:00 bindata, ovn-k: Add UserDefinedNetwork CRD and RBAC - - fd67779 2024-08-07T11:48:40-04:00 Add Azure MSI Env Var for ARO HCP +- cluster-ingress-operator embedded-component 7cf86c7c749fa62b9cffd9a62275e33a4083985e to 26f0181b04b2639a0d467a3548f96d60471375d9 + - 7fef446 2024-08-16T11:14:03-04:00 OCPBUGS-38217: Clear LB Status Parameters on LB Type Change + - 82ff778 2024-08-14T10:25:21-04:00 OCPBUGS-38441: Resolve DNS Resolution CI Flakes in Subnets and EIP E2E + - 1e1bce5 2024-08-14T10:18:23-04:00 OCPBUGS-38441: Add missing error logging in verifyExternalIngressController + - 85df7e5 2024-08-14T08:51:01-04:00 Allow router pods to use the "restricted" SCC -- machine-config-operator embedded-component 217f60789684c1e696c8ac9e1f974bec631ebf5e to 9c7a000be04738e98e4bae1709dad0b83af93113 - - 3bb751ae 2024-08-07T11:44:50-06:00 Enabled boot image updates for AWS +- cluster-kube-apiserver-operator embedded-component 0ecdda58434784dc1973a6f0d17a02cbbe2340d3 to 37df1b1f80d3be6036b9e31975ac42fcb21b6447 + - 68bf3c2 2024-08-16T11:35:43+02:00 certrotation: remove UseSecretUpdateOnly + - edfebaa 2024-08-16T11:35:40+02:00 Bump library-go -- operator-framework-olm embedded-component 1fb6193e2a029c7134894acf788db94cbc7eebad to 38181182174edf751226e1f5b988afd6baa373e4 - - 58aad503 2024-08-08T00:04:38+00:00 (fix) Resolver: list CatSrc using client, instead of referring to registry-server cache (#3349) - - 2911931a 2024-08-08T00:03:10+00:00 build(deps): bump golang.org/x/sync from 0.7.0 to 0.8.0 (#3358) - - 68efec67 2024-08-08T00:02:41+00:00 build(deps): bump golang.org/x/time from 0.5.0 to 0.6.0 (#3357) +- cluster-network-operator embedded-component d0ca3151c265f8c23fecdd82b9fc634e4a2c3756 to c21e13f626cfcb21fdbd42076b57d00cebb064ca + - 7eaf7b7 2024-08-21T11:51:28+03:00 Deploy networking-console-plugin by CNO + - 67c0d7a 2024-08-20T12:36:28+02:00 bindata: set required-scc for openshift workloads + - dd97b15 2024-08-12T14:47:28+03:00 bindata, ovn-k, udn CRD: Add UDN finalizers RBAC + - 891e89c 2024-08-11T11:50:12+03:00 Add networking-console-plugin image to release payload + - 6611fc6 2024-08-09T14:14:49+02:00 Run codegen + - 7a11e5d 2024-08-09T14:14:20+02:00 Add a way to verify the codegen changes to the Makefile + - 62320d3 2024-08-09T14:14:18+02:00 Simplify hack/update-codegen.sh + - 07d31bf 2024-08-09T13:50:43+02:00 Add controller-gen as a dependency + - 4e8a81d 2024-08-08T17:11:39+02:00 multus: Add openshift-cnv to globalNamespace + - 64ce003 2024-08-08T16:40:55+02:00 Change the masquerade subnet default value for new clusters + - 37c6518 2024-08-08T13:57:11+00:00 Deploy FRR-K8s + - df350de 2024-08-08T09:14:42+00:00 Bump github.com/openshift/api + - a94505a 2024-08-05T09:58:34-04:00 Reorder the steps in iptables-alerter + - b08a78b 2024-08-05T09:58:34-04:00 Simplify the iptables-alerter crictl-reading code -- oc image-amd64 c2b6a626630692cead9c1fd0021e0b205ea033e6 to 535bf8e3ba0965d64070bd6109bb5de332f670b3 - - 896d147f 2024-08-06T14:48:59-04:00 upgrade-status: add test coverage for a compact cluster and a single-node cluster +- kubernetes embedded-component 43740e9179f50acbf24f0c597f78fa9abd121c96 to a092ee7d2b3514278dbbcbd47d87fde356c9b0ec + - 8563e55e8 2024-08-19T11:13:27-04:00 UPSTREAM: 126641: e1e/storage: update block device test to always specify a valid path + - 80bf6abf1 2024-08-13T14:35:36+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs + - c2055a8d1 2024-08-08T10:36:13-04:00 UPSTREAM: 126470: Move APIServingWithRoutine to alpha and disabled by default. -- oc image-arm64 535bf8e3ba0965d64070bd6109bb5de332f670b3 to 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf +- machine-config-operator embedded-component 9c7a000be04738e98e4bae1709dad0b83af93113 to 005ee68664fa12db7ec159deb984b30421331950 + - 6ac31a21 2024-08-22T13:18:50+01:00 Updates message verbs to use %q where appropriate + - ca69a473 2024-08-21T15:53:20-04:00 use MachineSet API instead of shelling out to oc + - 6a73d8cb 2024-08-21T11:05:14-04:00 docs: add link to NodeDisruptionPolicy + - abf897e7 2024-08-13T11:51:52-04:00 *: ensure listers created after callback + - f8db91e1 2024-08-13T19:06:10+09:00 OCPNODE-1784: Enable CRI-O internal repair feature as the default + - 19389d07 2024-08-10T17:39:16-04:00 Revert "OCPNODE-2357: templates/master/cri-o: make crun as the default container runtime" + - 0a5e6b61 2024-08-08T09:45:31-05:00 OCPBUGS-37984: Give keepalived-monitor necessary capabilities + - 1301f839 2024-08-07T14:07:54-04:00 kubeutils: Prevent empty patch calls to API server + - 13d84827 2024-08-07T10:57:38-04:00 crio: set min memory for crun + - 6ea4f0b3 2024-08-07T09:57:01-04:00 Revert "MCD-pull: run after network-online.target in Azure" + - 5f0a4be2 2024-08-06T08:56:58-04:00 add unit tests for kubeletConfig TLS profiles + - 8b0f3716 2024-08-06T08:56:58-04:00 make kubelet-config-controller react to APIServer + - 3b979e1d 2024-08-06T08:56:51-04:00 render kubelet config TLS config from APIServer + - a1e9af17 2024-07-31T13:54:55+01:00 manifests: set required-scc for openshift workloads + - 9b501d90 2024-07-30T14:07:15-04:00 refactors e2e tests to allow multiple namespaces + - 4437bd4b 2024-07-30T11:06:43-04:00 digestfile configmap should be labeled + - 781f7af2 2024-07-30T11:05:27-04:00 clean up label constants and use label selectors + - 588f6224 2024-07-30T11:05:27-04:00 cleans up and removes unneeded e2e tests + - 43bbce71 2024-07-30T11:05:26-04:00 lifecycle buildah with the MCO + - ff5fadce 2024-07-30T11:05:26-04:00 centralizes image configmap parsing + - fd81685c 2024-07-11T14:31:29-04:00 templates/*: make crun as the default container runtime + +- operator-framework-olm embedded-component 38181182174edf751226e1f5b988afd6baa373e4 to 7915649deba09c031b0273c58e47f21eb6975aef + - 7915649d 2024-08-15T06:11:41+00:00 OCPBUGS-30333: Move Helm to bingo dep and update it (#837) + - 58f6be9f 2024-08-14T00:04:30+00:00 Retract v.3.11.0 (#3355) + - 73a7debb 2024-08-14T00:03:05+00:00 build(deps): bump github.com/onsi/ginkgo/v2 from 2.19.1 to 2.20.0 (#3363) + - 415f2e3a 2024-08-14T00:02:49+00:00 build(deps): bump github.com/docker/docker (#3365) + - ec746bca 2024-08-14T00:02:34+00:00 build(deps): bump sigs.k8s.io/controller-runtime from 0.18.4 to 0.18.5 (#3364) + - 2f9bfb9c 2024-08-14T00:02:18+00:00 build(deps): bump golang.org/x/net from 0.27.0 to 0.28.0 (#3362) + - 7ba383f7 2024-08-09T00:03:14+00:00 Update owners (#3361) + +- oc image-amd64 535bf8e3ba0965d64070bd6109bb5de332f670b3 to 0fa02c5404aad99be857221d85c1f9446fc6388f + - b2c293e3 2024-08-21T21:48:37-04:00 OTA-1292: upgrade-status: handle the OS image annotation better + - 1490d1bb 2024-08-20T09:23:13-04:00 OTA-1292: upgrade-status: handle unschedulable nodes better + - 7b42b4d6 2024-08-19T15:53:11-04:00 upgrade-status: handle expected MCD state better + - ec354d49 2024-08-15T16:23:12-04:00 OTA-1212: Hide or condense control plane sections once successfully updated + - a69937e9 2024-08-15T18:54:04+02:00 `upgrade status`: improve tests for missing annotations + - ffd62d3a 2024-08-15T09:08:46-04:00 Adding examples for add-cluster-role-to-* and remove-cluster-role-from-* so they show in the CLI docs + - da9ac5f9 2024-08-09T09:41:46-04:00 upgrade-status: bubble up the reason for unavailable nodes - 20b82440 2024-08-07T22:53:29-04:00 Make MacAddress mandatory until installer validations are updated - 2f7dc5fd 2024-08-07T22:45:52-04:00 Make MacAddress flag optional, add test for createConfigFileFromFlags - 28c2836f 2024-07-31T05:54:29-04:00 added flags to support simper single node interface -- router image-arm64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 to a33f2b6ad04f8c39b95c1839340f0e38b5c0662a +- coredns image-amd64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1 to a656fdfff7685829962410a157c4a42a51775978 + - 3c2271d 2024-08-16T15:47:26+01:00 Rename Dockerfile.openshift.rhel7 to Dockerfile.ocp + +- router image-amd64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 to 47b8420185ec2eb4c7861483921d31c65b912625 + - 3c40489 2024-08-16T15:43:54+01:00 Rename Dockerfiles - 1c32ae6 2024-08-07T10:01:37-04:00 Bump k8s.io/* packages to v0.30.3 +- ovn-kubernetes image-amd64 190304949659af8efca11d173682a373dac97792 to 4b17dc2301488a37286221b87f2b95da3f9091af + - 9ecc3202 2024-08-20T13:43:26+02:00 UDN: Add routes manager + - 17ccab17 2024-08-19T13:07:34-07:00 enable interconnect in helm chart + - 9b4ae967 2024-08-19T16:16:44+02:00 E2E: Add EgressService with Network reply traffic tests + - 210a1808 2024-08-19T16:16:44+02:00 EgressService: Fix ETP=Local ingress reply for LGW + - 567f17a0 2024-08-19T14:23:48+02:00 Network Segmentation E2E: Use current pod state when checking readiness + - 0da90dfe 2024-08-19T10:45:32+02:00 Fixes deleting CNI DEL with UDN + - 82192051 2024-08-16T14:23:13-07:00 avoid calling oc.deleteStaleNodeChassis for every node update event + - a1e88dcd 2024-08-16T15:59:13-04:00 Fixes deleting CNI DEL with UDN + - 2bd058cd 2024-08-16T14:55:00+02:00 dist/images: Use OVS main branch. + - 71f97fbb 2024-08-16T07:34:40+02:00 Skip egress test on LGW + - 1770664e 2024-08-16T07:34:40+02:00 Add fixme comments for L2 support + - 28ff968b 2024-08-16T07:34:40+02:00 udn, layer3: only run openflowmgmr for layer UDNs + - baccd04b 2024-08-16T07:34:40+02:00 Skip L2 pod2egress e2e test + - 59a50795 2024-08-16T07:34:38+02:00 udn, egress, e2e: assert a pod can reach an entity outside the cluster + - fcc835c2 2024-08-15T22:28:03+02:00 unit-test: add L2 tests for UDN openflows + - c0f59dcb 2024-08-15T22:28:03+02:00 unit-test: delete UDN openflows for L3 network + - 1c903a27 2024-08-15T22:27:15+02:00 unit-test: add UDN openflows L3 UT + - c92ae2cd 2024-08-15T21:27:15+02:00 UDN UT: use correct network name value for ext switch port + - e42eb35f 2024-08-15T21:27:15+02:00 Add mark based UDN flows on br-ex + - bfb1ad56 2024-08-15T21:27:15+02:00 Fix existing flows on br-ex to be network aware + - 5dd20f18 2024-08-15T21:27:10+02:00 Invoke Gateway in UserDefinedNetworkGateway + - e1673381 2024-08-15T21:23:46+02:00 startup-waiter: Make waiter timeout configurable. + - bbd3711f 2024-08-15T19:33:56+02:00 Export gateway as public interface in DNNC + - 52ee8d11 2024-08-15T19:33:52+02:00 Add add/del Network utils to openflowmanager + - cf4e8694 2024-08-15T19:33:46+02:00 Add bridgeUDNConfiguration for UDN + - eed9710e 2024-08-15T19:33:41+02:00 Add masqCTMark to UDNGateway + - c5285ab6 2024-08-14T23:10:19+02:00 Don't use zone0 for UDN Networks + - a9aa95e6 2024-08-14T12:56:03-04:00 Consistently reorder test/e2e imports + - a3c5087b 2024-08-14T12:45:50-04:00 Dead code, gofmt, typos, and other trivial fixes + - 0e05804c 2024-08-14T08:28:11+02:00 EndpointSlice mirror controller: handle tombstone deletion + - 9030c8ac 2024-08-13T16:41:23+02:00 UT egress firewall: stop node controller in AfterEach. + - 1186695a 2024-08-13T16:41:06+02:00 networkClusterController: Remove log in case of an error + - 12c52172 2024-08-13T16:41:06+02:00 Add missing return error in case of Pod delete + - ba071046 2024-08-13T16:41:06+02:00 Fix retry handling in case IP pool is empty + - 4bbc56f4 2024-08-13T10:13:35+02:00 UT flake: fix race condition for nad controller tests + - a01f5012 2024-08-12T09:30:09+02:00 EndpointSlice mirror controller: ensure enqueued objects are endpoint slices + - a7817a1e 2024-08-09T13:35:01+01:00 EIP e2e: skip e2e if VRF kernel module isn't loaded on target node + - 52317f15 2024-08-09T16:05:19+05:30 Delete EgressIP LRP stale nexthops when node is not found + - da326fa7 2024-08-08T12:59:12-04:00 E2E testing for UDN with overlapping IPs + - 296c5f9f 2024-08-08T16:54:00+02:00 Use 169.254.0.0/17 as the default masquerade subnet + - 6dd66323 2024-08-08T09:51:59-04:00 Use more exact name match when deleting static routes to HO nodes. + - 44d236cf 2024-08-08T08:22:46-04:00 Missed updating go version in makefile to 1.22.0 + - 90be9dbb 2024-08-08T13:24:15+02:00 udn, cni: Add unconfigure iface unit tests + - 5204b4e0 2024-08-08T13:09:17+02:00 cni: Extract interface configuration interface + - 2dc6a619 2024-08-08T11:52:35+02:00 default net bootstrap: ignore localnet patch ports + - 37882b37 2024-08-08T10:54:30+02:00 node: When bootstrapping OVS flows check for the default net patch port. + - ea0d3f98 2024-08-08T10:15:12+02:00 udn, cni: Unconfigure interface + - d3dafade 2024-08-07T14:46:21-04:00 VRF manager fixup and address comments + - ea7ae5d8 2024-08-07T14:46:21-04:00 GH actions: load VRF kernel module + - 3e9f84e3 2024-08-07T14:46:21-04:00 UDN: Add vrfmanager unit tests + - 570f2166 2024-08-07T14:46:21-04:00 UDN: Add vrfmanager + - bef4a75b 2024-08-07T16:53:10+03:00 e2e, networksegmentation: Add connectivity and isolation coverage + - 336fb445 2024-08-07T16:53:10+03:00 e2e, networksegmentation: Test UDN management using CRD + - 18804bdc 2024-08-07T16:53:10+03:00 userdefinednetwork: Block net-attach-def deletion when being used + - 39dca369 2024-08-07T16:53:10+03:00 userdefinednetwork: Implement finalizers + - d0d89b07 2024-08-07T16:53:10+03:00 userdefinednetwork: Validate no primary network exist + - 5deadf38 2024-08-07T16:53:10+03:00 userdefinednetwork, template: Impl net-attach-def template + - ed71b9d2 2024-08-07T16:53:10+03:00 util, cni: Extract validation logic from parsing NAD code + - 86003f51 2024-08-07T16:53:10+03:00 userdefinednetwork: Implement UserDefinedNetwork controller + - f591a44e 2024-08-07T16:53:10+03:00 clustermanager: UserDefinedNetwork controller scaffolds + - a4c6917a 2024-08-07T16:53:07+03:00 informers, factory: Setup UserDefinedNetwork informer + - 436937fe 2024-08-07T16:51:08+03:00 utils, clientsets: Add UserDefinedNetwork clientset + - cc619963 2024-08-07T16:51:08+03:00 kind: Install UserDefinedNetwork CRD + - 57c154f3 2024-08-07T16:51:08+03:00 crds: Introduce UserDefinedNetwork CRD + - 9352c84c 2024-08-07T13:24:38+02:00 WIP: proper cleanup for non-IC deployments + - 96c0b4cd 2024-08-07T13:24:37+02:00 udn, tests: add IC GW setup tests + - 0bfdec57 2024-08-07T13:23:49+02:00 udn, tests: rename getExpectedDataPodsAndSwitches helper + - 64edf3f3 2024-08-07T13:23:48+02:00 udn, layer3, tests: assert the OVN NB entities are set up as expected + - 332dff94 2024-08-07T13:22:58+02:00 udn, layer3, tests: assert the ovn-k annotations are correctly set + - 9b9b8a73 2024-08-06T21:55:08+02:00 udn, tests: allow default cluster annotation to not have the gateway + - 434b0590 2024-08-06T21:55:08+02:00 tests: allow ovn pkg unit tests to pre-provision NAD objects + - 1ff42ee1 2024-08-06T21:55:08+02:00 tests: allow multi-homing tests to define the subnet mask + - 0e2ff030 2024-08-06T21:55:08+02:00 udn, tests: allow addNetwork to be reused for primary UDNs + - e1a15057 2024-08-06T21:55:08+02:00 udn, layer3: cleanup GR when NADs or nodes are removed + - 3a32fe88 2024-08-06T21:55:08+02:00 Policy based routes: add unit tests + - 9cab80bc 2024-08-06T21:55:08+02:00 Policy based routes: include additional input validation + - 774d0781 2024-08-06T21:55:08+02:00 udn, egress: use correct ext switch localnet port network name + - c7f49348 2024-08-06T21:55:08+02:00 udn, egress: introduce gateway topology manager + - 2275260b 2024-08-06T18:29:09+02:00 udn, controlplane, layer3: build GW router config + - 2f98bdb3 2024-08-06T18:29:09+02:00 node: Add BridgeID to the L3GatewayConfig annotation. + - a028472f 2024-08-06T18:29:09+02:00 udn, netInfo: Add wrapper for getting the external and patch port names. + - 8a53a983 2024-08-06T18:29:09+02:00 udn, egress: sync gateway for layer3 primary UDNs + - fd43ed88 2024-08-06T18:29:09+02:00 udn, layer3: add COPP for secondary layer3 controllers + - 0aafa2bd 2024-08-06T18:29:09+02:00 udn, egress: generalize GW sync function + - 47cdbdbf 2024-08-06T18:29:09+02:00 udn, gateway router: generalize gw router cleanup + - 4b07516a 2024-08-06T18:29:09+02:00 udn, gateway router: generalize gw router creation + - 796e26b6 2024-08-06T18:29:09+02:00 udn, layer3: export policy based routing to a pkg + - 620b121e 2024-08-06T18:29:09+02:00 udn, ovn: Add join switch to L3 user defined primary nets. + - df2da156 2024-08-06T22:15:46+07:00 Link manager: fix panic when link is removed for a managed addr + - 2f0d03b8 2024-08-06T22:15:46+07:00 Route manager: remove managed routes for deleted links + - 86ab9264 2024-08-06T22:15:46+07:00 GH actions: load VRF kernel module + - fb0d5ca4 2024-08-06T22:15:46+07:00 Route manager: fix panic when managed route link is deleted + - 39c23467 2024-08-06T22:15:46+07:00 EIP hosted by secondary host inf: add vrf support + - 0b8b66a3 2024-08-06T08:46:37-04:00 fix: link to kind usage docs in contrib README.md + - 84629315 2024-08-05T10:11:37-04:00 Delete stale masquerade subnet resources if subnet gets changed at day 2 + - 41e08279 2024-08-05T01:36:12+03:00 hack/lint.sh: Mount local golangci-lint cache + - 6e3bf49f 2024-08-04T17:41:25-04:00 Fixes HO test when HO node switched to OVN node + - 11f0b8c0 2024-08-01T17:20:27+00:00 build(deps): bump github.com/docker/docker in /test/e2e + - 206d90b8 2024-08-01T18:59:34+05:30 Add e2e test for DNSNameResolver + - b92049bb 2024-08-01T18:58:02+05:30 Add support for DNSNameResolver in KIND cluster + +- kubernetes image-amd64 43740e9179f50acbf24f0c597f78fa9abd121c96 to a092ee7d2b3514278dbbcbd47d87fde356c9b0ec + - 8563e55e8 2024-08-19T11:13:27-04:00 UPSTREAM: 126641: e1e/storage: update block device test to always specify a valid path + - 80bf6abf1 2024-08-13T14:35:36+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs + - c2055a8d1 2024-08-08T10:36:13-04:00 UPSTREAM: 126470: Move APIServingWithRoutine to alpha and disabled by default. + +- oc image-arm64 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf to 0fa02c5404aad99be857221d85c1f9446fc6388f + - b2c293e3 2024-08-21T21:48:37-04:00 OTA-1292: upgrade-status: handle the OS image annotation better + - 1490d1bb 2024-08-20T09:23:13-04:00 OTA-1292: upgrade-status: handle unschedulable nodes better + - 7b42b4d6 2024-08-19T15:53:11-04:00 upgrade-status: handle expected MCD state better + - ec354d49 2024-08-15T16:23:12-04:00 OTA-1212: Hide or condense control plane sections once successfully updated + - a69937e9 2024-08-15T18:54:04+02:00 `upgrade status`: improve tests for missing annotations + - ffd62d3a 2024-08-15T09:08:46-04:00 Adding examples for add-cluster-role-to-* and remove-cluster-role-from-* so they show in the CLI docs + - da9ac5f9 2024-08-09T09:41:46-04:00 upgrade-status: bubble up the reason for unavailable nodes + +- coredns image-arm64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1 to a656fdfff7685829962410a157c4a42a51775978 + - 3c2271d 2024-08-16T15:47:26+01:00 Rename Dockerfile.openshift.rhel7 to Dockerfile.ocp + +- router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a to 47b8420185ec2eb4c7861483921d31c65b912625 + - 3c40489 2024-08-16T15:43:54+01:00 Rename Dockerfiles + +- ovn-kubernetes image-arm64 190304949659af8efca11d173682a373dac97792 to 4b17dc2301488a37286221b87f2b95da3f9091af + - 9ecc3202 2024-08-20T13:43:26+02:00 UDN: Add routes manager + - 17ccab17 2024-08-19T13:07:34-07:00 enable interconnect in helm chart + - 9b4ae967 2024-08-19T16:16:44+02:00 E2E: Add EgressService with Network reply traffic tests + - 210a1808 2024-08-19T16:16:44+02:00 EgressService: Fix ETP=Local ingress reply for LGW + - 567f17a0 2024-08-19T14:23:48+02:00 Network Segmentation E2E: Use current pod state when checking readiness + - 0da90dfe 2024-08-19T10:45:32+02:00 Fixes deleting CNI DEL with UDN + - 82192051 2024-08-16T14:23:13-07:00 avoid calling oc.deleteStaleNodeChassis for every node update event + - a1e88dcd 2024-08-16T15:59:13-04:00 Fixes deleting CNI DEL with UDN + - 2bd058cd 2024-08-16T14:55:00+02:00 dist/images: Use OVS main branch. + - 71f97fbb 2024-08-16T07:34:40+02:00 Skip egress test on LGW + - 1770664e 2024-08-16T07:34:40+02:00 Add fixme comments for L2 support + - 28ff968b 2024-08-16T07:34:40+02:00 udn, layer3: only run openflowmgmr for layer UDNs + - baccd04b 2024-08-16T07:34:40+02:00 Skip L2 pod2egress e2e test + - 59a50795 2024-08-16T07:34:38+02:00 udn, egress, e2e: assert a pod can reach an entity outside the cluster + - fcc835c2 2024-08-15T22:28:03+02:00 unit-test: add L2 tests for UDN openflows + - c0f59dcb 2024-08-15T22:28:03+02:00 unit-test: delete UDN openflows for L3 network + - 1c903a27 2024-08-15T22:27:15+02:00 unit-test: add UDN openflows L3 UT + - c92ae2cd 2024-08-15T21:27:15+02:00 UDN UT: use correct network name value for ext switch port + - e42eb35f 2024-08-15T21:27:15+02:00 Add mark based UDN flows on br-ex + - bfb1ad56 2024-08-15T21:27:15+02:00 Fix existing flows on br-ex to be network aware + - 5dd20f18 2024-08-15T21:27:10+02:00 Invoke Gateway in UserDefinedNetworkGateway + - e1673381 2024-08-15T21:23:46+02:00 startup-waiter: Make waiter timeout configurable. + - bbd3711f 2024-08-15T19:33:56+02:00 Export gateway as public interface in DNNC + - 52ee8d11 2024-08-15T19:33:52+02:00 Add add/del Network utils to openflowmanager + - cf4e8694 2024-08-15T19:33:46+02:00 Add bridgeUDNConfiguration for UDN + - eed9710e 2024-08-15T19:33:41+02:00 Add masqCTMark to UDNGateway + - c5285ab6 2024-08-14T23:10:19+02:00 Don't use zone0 for UDN Networks + - a9aa95e6 2024-08-14T12:56:03-04:00 Consistently reorder test/e2e imports + - a3c5087b 2024-08-14T12:45:50-04:00 Dead code, gofmt, typos, and other trivial fixes + - 0e05804c 2024-08-14T08:28:11+02:00 EndpointSlice mirror controller: handle tombstone deletion + - 9030c8ac 2024-08-13T16:41:23+02:00 UT egress firewall: stop node controller in AfterEach. + - 1186695a 2024-08-13T16:41:06+02:00 networkClusterController: Remove log in case of an error + - 12c52172 2024-08-13T16:41:06+02:00 Add missing return error in case of Pod delete + - ba071046 2024-08-13T16:41:06+02:00 Fix retry handling in case IP pool is empty + - 4bbc56f4 2024-08-13T10:13:35+02:00 UT flake: fix race condition for nad controller tests + - a01f5012 2024-08-12T09:30:09+02:00 EndpointSlice mirror controller: ensure enqueued objects are endpoint slices + - a7817a1e 2024-08-09T13:35:01+01:00 EIP e2e: skip e2e if VRF kernel module isn't loaded on target node + - 52317f15 2024-08-09T16:05:19+05:30 Delete EgressIP LRP stale nexthops when node is not found + - da326fa7 2024-08-08T12:59:12-04:00 E2E testing for UDN with overlapping IPs + - 296c5f9f 2024-08-08T16:54:00+02:00 Use 169.254.0.0/17 as the default masquerade subnet + - 6dd66323 2024-08-08T09:51:59-04:00 Use more exact name match when deleting static routes to HO nodes. + - 44d236cf 2024-08-08T08:22:46-04:00 Missed updating go version in makefile to 1.22.0 + - 90be9dbb 2024-08-08T13:24:15+02:00 udn, cni: Add unconfigure iface unit tests + - 5204b4e0 2024-08-08T13:09:17+02:00 cni: Extract interface configuration interface + - 2dc6a619 2024-08-08T11:52:35+02:00 default net bootstrap: ignore localnet patch ports + - 37882b37 2024-08-08T10:54:30+02:00 node: When bootstrapping OVS flows check for the default net patch port. + - ea0d3f98 2024-08-08T10:15:12+02:00 udn, cni: Unconfigure interface + - d3dafade 2024-08-07T14:46:21-04:00 VRF manager fixup and address comments + - ea7ae5d8 2024-08-07T14:46:21-04:00 GH actions: load VRF kernel module + - 3e9f84e3 2024-08-07T14:46:21-04:00 UDN: Add vrfmanager unit tests + - 570f2166 2024-08-07T14:46:21-04:00 UDN: Add vrfmanager + - bef4a75b 2024-08-07T16:53:10+03:00 e2e, networksegmentation: Add connectivity and isolation coverage + - 336fb445 2024-08-07T16:53:10+03:00 e2e, networksegmentation: Test UDN management using CRD + - 18804bdc 2024-08-07T16:53:10+03:00 userdefinednetwork: Block net-attach-def deletion when being used + - 39dca369 2024-08-07T16:53:10+03:00 userdefinednetwork: Implement finalizers + - d0d89b07 2024-08-07T16:53:10+03:00 userdefinednetwork: Validate no primary network exist + - 5deadf38 2024-08-07T16:53:10+03:00 userdefinednetwork, template: Impl net-attach-def template + - ed71b9d2 2024-08-07T16:53:10+03:00 util, cni: Extract validation logic from parsing NAD code + - 86003f51 2024-08-07T16:53:10+03:00 userdefinednetwork: Implement UserDefinedNetwork controller + - f591a44e 2024-08-07T16:53:10+03:00 clustermanager: UserDefinedNetwork controller scaffolds + - a4c6917a 2024-08-07T16:53:07+03:00 informers, factory: Setup UserDefinedNetwork informer + - 436937fe 2024-08-07T16:51:08+03:00 utils, clientsets: Add UserDefinedNetwork clientset + - cc619963 2024-08-07T16:51:08+03:00 kind: Install UserDefinedNetwork CRD + - 57c154f3 2024-08-07T16:51:08+03:00 crds: Introduce UserDefinedNetwork CRD + - 9352c84c 2024-08-07T13:24:38+02:00 WIP: proper cleanup for non-IC deployments + - 96c0b4cd 2024-08-07T13:24:37+02:00 udn, tests: add IC GW setup tests + - 0bfdec57 2024-08-07T13:23:49+02:00 udn, tests: rename getExpectedDataPodsAndSwitches helper + - 64edf3f3 2024-08-07T13:23:48+02:00 udn, layer3, tests: assert the OVN NB entities are set up as expected + - 332dff94 2024-08-07T13:22:58+02:00 udn, layer3, tests: assert the ovn-k annotations are correctly set + - 9b9b8a73 2024-08-06T21:55:08+02:00 udn, tests: allow default cluster annotation to not have the gateway + - 434b0590 2024-08-06T21:55:08+02:00 tests: allow ovn pkg unit tests to pre-provision NAD objects + - 1ff42ee1 2024-08-06T21:55:08+02:00 tests: allow multi-homing tests to define the subnet mask + - 0e2ff030 2024-08-06T21:55:08+02:00 udn, tests: allow addNetwork to be reused for primary UDNs + - e1a15057 2024-08-06T21:55:08+02:00 udn, layer3: cleanup GR when NADs or nodes are removed + - 3a32fe88 2024-08-06T21:55:08+02:00 Policy based routes: add unit tests + - 9cab80bc 2024-08-06T21:55:08+02:00 Policy based routes: include additional input validation + - 774d0781 2024-08-06T21:55:08+02:00 udn, egress: use correct ext switch localnet port network name + - c7f49348 2024-08-06T21:55:08+02:00 udn, egress: introduce gateway topology manager + - 2275260b 2024-08-06T18:29:09+02:00 udn, controlplane, layer3: build GW router config + - 2f98bdb3 2024-08-06T18:29:09+02:00 node: Add BridgeID to the L3GatewayConfig annotation. + - a028472f 2024-08-06T18:29:09+02:00 udn, netInfo: Add wrapper for getting the external and patch port names. + - 8a53a983 2024-08-06T18:29:09+02:00 udn, egress: sync gateway for layer3 primary UDNs + - fd43ed88 2024-08-06T18:29:09+02:00 udn, layer3: add COPP for secondary layer3 controllers + - 0aafa2bd 2024-08-06T18:29:09+02:00 udn, egress: generalize GW sync function + - 47cdbdbf 2024-08-06T18:29:09+02:00 udn, gateway router: generalize gw router cleanup + - 4b07516a 2024-08-06T18:29:09+02:00 udn, gateway router: generalize gw router creation + - 796e26b6 2024-08-06T18:29:09+02:00 udn, layer3: export policy based routing to a pkg + - 620b121e 2024-08-06T18:29:09+02:00 udn, ovn: Add join switch to L3 user defined primary nets. + - df2da156 2024-08-06T22:15:46+07:00 Link manager: fix panic when link is removed for a managed addr + - 2f0d03b8 2024-08-06T22:15:46+07:00 Route manager: remove managed routes for deleted links + - 86ab9264 2024-08-06T22:15:46+07:00 GH actions: load VRF kernel module + - fb0d5ca4 2024-08-06T22:15:46+07:00 Route manager: fix panic when managed route link is deleted + - 39c23467 2024-08-06T22:15:46+07:00 EIP hosted by secondary host inf: add vrf support + - 0b8b66a3 2024-08-06T08:46:37-04:00 fix: link to kind usage docs in contrib README.md + - 84629315 2024-08-05T10:11:37-04:00 Delete stale masquerade subnet resources if subnet gets changed at day 2 + - 41e08279 2024-08-05T01:36:12+03:00 hack/lint.sh: Mount local golangci-lint cache + - 6e3bf49f 2024-08-04T17:41:25-04:00 Fixes HO test when HO node switched to OVN node + - 11f0b8c0 2024-08-01T17:20:27+00:00 build(deps): bump github.com/docker/docker in /test/e2e + - 206d90b8 2024-08-01T18:59:34+05:30 Add e2e test for DNSNameResolver + - b92049bb 2024-08-01T18:58:02+05:30 Add support for DNSNameResolver in KIND cluster + +- kubernetes image-arm64 43740e9179f50acbf24f0c597f78fa9abd121c96 to a092ee7d2b3514278dbbcbd47d87fde356c9b0ec + - 8563e55e8 2024-08-19T11:13:27-04:00 UPSTREAM: 126641: e1e/storage: update block device test to always specify a valid path + - 80bf6abf1 2024-08-13T14:35:36+02:00 UPSTREAM: : Add OpenShift tooling, images, configs and docs + - c2055a8d1 2024-08-08T10:36:13-04:00 UPSTREAM: 126470: Move APIServingWithRoutine to alpha and disabled by default. + diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index eb6dee4be6..4bfbf60e28 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,37 +1,37 @@ -https://github.com/openshift/api embedded-component cbdcd0df43e80e4b31d1804e471828ed16fe06dc +https://github.com/openshift/api embedded-component 2b42490270d8559f3e668d1574aacc73329c8116 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component ffba005bf839897b173cb76d0bb561dcf9c7215c -https://github.com/openshift/cluster-dns-operator embedded-component 54eea5bb02911cdf0c7fb6dbb80366eb5a923ea7 -https://github.com/openshift/cluster-ingress-operator embedded-component 7cf86c7c749fa62b9cffd9a62275e33a4083985e -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 0ecdda58434784dc1973a6f0d17a02cbbe2340d3 +https://github.com/openshift/cluster-dns-operator embedded-component 3a727094ce02cc90e73ca0876eaecaf46f05fbd9 +https://github.com/openshift/cluster-ingress-operator embedded-component 26f0181b04b2639a0d467a3548f96d60471375d9 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 37df1b1f80d3be6036b9e31975ac42fcb21b6447 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0a9ed573e35751455bfb24842fd2de0b05379ed0 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 98ca953ba6955401023e219f37e0af49879355d2 -https://github.com/openshift/cluster-network-operator embedded-component d0ca3151c265f8c23fecdd82b9fc634e4a2c3756 +https://github.com/openshift/cluster-network-operator embedded-component c21e13f626cfcb21fdbd42076b57d00cebb064ca https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2b962c71d5b3ac179898dc1ece6a98de0b33cd70 https://github.com/openshift/cluster-policy-controller embedded-component c502ece1b8bdccdbc58a327520685d9a1d2f59cf https://github.com/openshift/csi-external-snapshotter embedded-component aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786 -https://github.com/openshift/kubernetes embedded-component 43740e9179f50acbf24f0c597f78fa9abd121c96 +https://github.com/openshift/kubernetes embedded-component a092ee7d2b3514278dbbcbd47d87fde356c9b0ec https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2 -https://github.com/openshift/machine-config-operator embedded-component 9c7a000be04738e98e4bae1709dad0b83af93113 +https://github.com/openshift/machine-config-operator embedded-component 005ee68664fa12db7ec159deb984b30421331950 https://github.com/openshift/openshift-controller-manager embedded-component aabcbc2cf5d944f64e6ebdbc4e0ce7f1b95bd127 -https://github.com/openshift/operator-framework-olm embedded-component 38181182174edf751226e1f5b988afd6baa373e4 +https://github.com/openshift/operator-framework-olm embedded-component 7915649deba09c031b0273c58e47f21eb6975aef https://github.com/openshift/route-controller-manager embedded-component a47f6be3676d3eabb864ca339584fe857e1076c5 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-amd64 535bf8e3ba0965d64070bd6109bb5de332f670b3 -https://github.com/openshift/coredns image-amd64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1 +https://github.com/openshift/oc image-amd64 0fa02c5404aad99be857221d85c1f9446fc6388f +https://github.com/openshift/coredns image-amd64 a656fdfff7685829962410a157c4a42a51775978 https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec -https://github.com/openshift/router image-amd64 a7313722c6e0541fcc00e92c459dd5d32a4a1534 +https://github.com/openshift/router image-amd64 47b8420185ec2eb4c7861483921d31c65b912625 https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-amd64 190304949659af8efca11d173682a373dac97792 -https://github.com/openshift/kubernetes image-amd64 43740e9179f50acbf24f0c597f78fa9abd121c96 +https://github.com/openshift/ovn-kubernetes image-amd64 4b17dc2301488a37286221b87f2b95da3f9091af +https://github.com/openshift/kubernetes image-amd64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755 -https://github.com/openshift/oc image-arm64 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf -https://github.com/openshift/coredns image-arm64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1 +https://github.com/openshift/oc image-arm64 0fa02c5404aad99be857221d85c1f9446fc6388f +https://github.com/openshift/coredns image-arm64 a656fdfff7685829962410a157c4a42a51775978 https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc55238e1909119f94eaf33872a76dec https://github.com/openshift/csi-external-snapshotter image-arm64 aa558ca4bc55238e1909119f94eaf33872a76dec -https://github.com/openshift/router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a +https://github.com/openshift/router image-arm64 47b8420185ec2eb4c7861483921d31c65b912625 https://github.com/openshift/kube-rbac-proxy image-arm64 8ea2c994df4296ec161023d8ff85f9ea0e383216 -https://github.com/openshift/ovn-kubernetes image-arm64 190304949659af8efca11d173682a373dac97792 -https://github.com/openshift/kubernetes image-arm64 43740e9179f50acbf24f0c597f78fa9abd121c96 +https://github.com/openshift/ovn-kubernetes image-arm64 4b17dc2301488a37286221b87f2b95da3f9091af +https://github.com/openshift/kubernetes image-arm64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 54adc3e890476a23b5d27a213323a39788bb6de1 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:26:58 +0000 Subject: [PATCH 3/8] 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 cf30847da6..34544e5c69 100644 --- a/go.mod +++ b/go.mod @@ -219,36 +219,36 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240805184523-43740e9179f5 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes ) replace ( @@ -259,4 +259,4 @@ replace ( replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes diff --git a/go.sum b/go.sum index 12abacbeda..c9067224de 100644 --- a/go.sum +++ b/go.sum @@ -467,60 +467,60 @@ github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef h1: github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:dth3HGSUg52NBfrClZuu584PNgACrrDWtTBeUhFyU+A= github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:xg21tfZi7/93zTYlkgEFKljGhx9rMhud32ya+IK0CIk= -github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5 h1:lS5Z38rSPCCTdC9AlUvXeqaEHTmUlIux/qihWGb9fbI= -github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5/go.mod h1:5+ZIvJdjGVvha4ffSLcd9WCTdB2Asw4q7BqML8sSfF4= +github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 h1:pjvJ+WnA3y9fNzakmarRXPl8ZJXsBwHnWythNYwjoBo= +github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:5+ZIvJdjGVvha4ffSLcd9WCTdB2Asw4q7BqML8sSfF4= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 h1:Eq3Ql8dFdv5hvkxKGTxxLb22xcin771AvZj+24HlCI0= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2/go.mod h1:9YVOqIQLlM6x6xS8I4B1Wo2X57lnOJvbYD96VGJ0q8Q= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 h1:gYaE6OIgjf3ltHytd4OAcUWycuLQ4bHBuJruHHbd2HY= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 h1:7/bJp3/ENbRz2GwZVGf9h+Xj23+3FIoBukea0TnW/vQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5/go.mod h1:4v6tMwmD7H5J+kWPzhDcfGMWQhsy6cFiPg2j9C/y3Qo= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 h1:9IxbBVEKe/iUHeyVEpN6Mlj9hX0NQTB0IqRIA6s6RP0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 h1:z+KIhDWwiVhufVngtYh7IZyjNjwmwgodZrkiDp/JLyQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 h1:b8exahhjIEZU+BmtiZTyxLFXmJh2XYtpYQKSjYR11gQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 h1:ULVYb51NwM/gLnBT1vGNDBxdLyzx6Zq9chtRg0RuxdU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 h1:AwTTWG/uoJl/IUTRkcfVSzryHZ/nPHuMn31xhLNa/D0= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 h1:0P3/7SY36wU4wqX70/hTs3Oj83wnFGQZK4khjcaEOpU= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 h1:LOZisL2BfFfCSmVLt4CNQMU2+hPiTkDBaycfWtXFcQI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 h1:eblAL7Nlj/aaDypcE5CRYrtNZAcYaF60VXWXQ2dt8wc= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5/go.mod h1:vqsZ/rUbTSef+QbiWaQ9c1IDYi4hArhT3ItePOIAVSA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 h1:Iar+ZiLZKtxXNeyy/pEixPLEAaHRamYFQdAIiVmvq2w= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 h1:U/T8CTr20eUr7PtmvZKMzSHZ7oCitHQFEtIWGoWY9vc= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 h1:xAlE81B15qoOJu174q+fe68YW1S/bbygOOmoozwDkck= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 h1:r/6oitukLY7p2ABkDo5ndyJMFj1eXasZBb1PUfwcR2k= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 h1:CoWyWCPJb++ITnWy8xfPGTwn1ddZw+14n7nH2WkxdyM= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 h1:JIaq8e3W3hEhWBt7RHejzVZAfR0E29323R7dlS4NpO8= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 h1:99IGux2ZpvTAc3uSBTM0inET9DwLyNUSeWgoU79O36o= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5/go.mod h1:7hfZ7cyZVEhjx05sfgirc1Cyn7Zs13I/Ez+wf8ebC6k= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 h1:bgDyN0CBqfY4yxGN/sfrQqjtWXOsxp++Y1qs228Yc4Y= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 h1:pbTHlloDdStfqVWx5brL60rzCvo8unlXdhSnas99EHM= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 h1:ocitXiENCJXCCxfvs7ip5bWzXdJ/7eMwa3yr+kFdaoQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 h1:4VvLXrO1IeJE6ShULx5WDsY3HQp/99JP9+E9cVimfYM= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 h1:grzh2FJlPl+OlmZO3Cr8qVco/60IPXOEGScUrGgdp/k= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 h1:omjyZDAgnEP+HO/d45SUVeu/f4NhoLGOr0w4ls+IUS0= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 h1:vJJHlARAUPvPBC9OFQxJ1RLUNx8Km9DKTfd1Hf+ntIU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 h1:nubYSVYuLhJQ51XbViud0rF85bQ1IquaU3lvaR/POJE= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 h1:gAmVIECtmH044BtHEVDxFHPxjWn9E/lvAgW/jV8rrAg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:i+56fNykmer/KzLpF2PtcbNth4xxoL1AqSSZT9XX7VY= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:4v6tMwmD7H5J+kWPzhDcfGMWQhsy6cFiPg2j9C/y3Qo= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 h1:XeJIYG2szV1bAfvnaxf5Wq2km96kzF8APaM4n6SL1Q0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:EaFMTpB/CHKAE2bnVprUT9MWuJX9v/pziesm/ilBQcI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 h1:wo7FiRi7/P07z5mtqpmyFjoSdqIbVXiRvJfrUJIMyRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 h1:i1A8y8HPoSaSttMRDCFM7KcKj0LoYtHsbrQN6H6BJtI= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 h1:LqRU+t0OdkJCls5QqVa8KiAxyqCMVImVqALuuiGAcGM= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:uDKkaCyNfEZR63HhLLMB5DxShzg/sc4CT9nZcLw34/M= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 h1:oPrM3AuIPuGXcVzzDUmjQDyHX8SANB/OpIES6ScC1wA= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:R3A7NxutYV6qRcFKMfzQZrzq8aaDipg3oPCshuMv0Wk= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 h1:PygFpFaGQnP4xfIgb1fx+95fcBNUWR1J1JxXkd7Fs2o= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 h1:h8m3VDpcLYNN9CfOaltM/OelQhJasBAzjgpJQvtmgSA= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:vqsZ/rUbTSef+QbiWaQ9c1IDYi4hArhT3ItePOIAVSA= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 h1:U9IoAJNChorT/fwLbx+Ck7oskNy5jhqPO6x3O5ttcG8= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:a+tHWi3OVIMSC+jILpzky8HAmgkqfivNXYPNTYyNS6E= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 h1:A5GJFJyTnXiKHcuoYYP+qwU5ebRanM6GGU3oEfpi7wo= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:/fkfIpAg9LQ3JKsBg3Zqxq1kpwX7uK8K66o573HlRZc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 h1:6U/l7jZXig/PPAm3YK78Hcq6dR3xTDICAWckT+wDof0= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:sQvc0rIZUYPdHbbsmBOb72fKHGXBhLs2JBL6Sjr9rkQ= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 h1:R5CZxVmeqkdsFEXkm3rtayMMlyVxfkILQq48FcKNyyE= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:yvRLhVsdMfgNvWYz4rem98PJ9fo3WWd9HsbfKPxKhCo= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 h1:bFuN30GGHp5umDhGJDQJzPOi+L4PO69lesOFdkZn8TI= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:X6o4ZrgyRLOxhQKeAXar9ZKwwRohNeH8VjZrIXeTxfM= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 h1:jEGlCF0T3Ev9RhYp/OSAqAiN9drcLWAjiAkG8wWJxJE= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:tig/CdAZHSLnfo7HOBGtZEUcX2ym3ksoloM6gnm3/ws= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 h1:7byexPDB/FvvjbaRs5gfOZdMJ/47al6wEpCNzuUGNVU= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:7hfZ7cyZVEhjx05sfgirc1Cyn7Zs13I/Ez+wf8ebC6k= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 h1:c1UpdQT/nv4h6sxkAmEKWz5ePcx8QP4ByG3emR5QLkk= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:sOQf55lTjnl8UyAMNEIwME8TXtXUJ3tCElXZLSrHCzM= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 h1:PV3TuF7BPo6GnbEO/HuxsH4VQCOjtvMNW1M3DocwV+Q= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:u+0ulmh57JxGYWB21c/ASuwO5RC17918a0JVIiR7pCo= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 h1:Gi/29SgAOs9fAfzG2lMOoAsA/8R5UXGiFcceH6rJMB8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 h1:e54sc8AETxEWUoVB14uw1H0z1a9EqWBrD8ChkXEZ8Pc= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OsHnKOZ4Zptu9pN2OQQ11EYkYSuH0NZnl2AEoX61olA= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 h1:g6bgOH3FLbDhbm0E9I5saCb79KhbI3rkCW8pU8kO0xQ= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:exH43//cgdeBZfetRcsUSRRnLljtAl5AYbDVt/Dm7TE= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 h1:ssYrmg5oVmZZSNjg9BG0MnmSppDR8vp9gV9CM9Scv0E= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:9urr7n6L1eYTJxKDjJDFHuya4x6JRdI0pA9o6oj6dZc= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 h1:EBKqoXd93xXzPkfWIBvPX7z6A9Ii1Svi/SJ4k5QZO0Q= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:4xH05OdueH2hpDdvzFGddYb+1GoCt/1GzcYN7ci1S14= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 h1:xtHhh1IQ805gF9q/Vo4q8Z9vowSXD2QNnjXrXTwDbG0= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:jF2UfCrVeEWQ1IS0JOCvmMtEIJSQDOd2rgwbK7OOHBA= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 76cfa6a7ed7db0dc2778af7b8ec8bbd13b8d2d4a Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:27:21 +0000 Subject: [PATCH 4/8] update microshift/vendor --- .../apiserver/pkg/features/kube_features.go | 2 +- .../kubernetes/pkg/features/kube_features.go | 2 +- vendor/modules.txt | 114 +++++++++--------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/vendor/k8s.io/apiserver/pkg/features/kube_features.go b/vendor/k8s.io/apiserver/pkg/features/kube_features.go index bae04d9545..31c4d90218 100644 --- a/vendor/k8s.io/apiserver/pkg/features/kube_features.go +++ b/vendor/k8s.io/apiserver/pkg/features/kube_features.go @@ -335,7 +335,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS APIServerTracing: {Default: true, PreRelease: featuregate.Beta}, - APIServingWithRoutine: {Default: true, PreRelease: featuregate.Beta}, + APIServingWithRoutine: {Default: false, PreRelease: featuregate.Alpha}, ValidatingAdmissionPolicy: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.32 diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go index 6b0dda7bce..fefb5cb6d8 100644 --- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go +++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go @@ -1268,7 +1268,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS genericfeatures.APIServerTracing: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.APIServingWithRoutine: {Default: true, PreRelease: featuregate.Beta}, + genericfeatures.APIServingWithRoutine: {Default: false, PreRelease: featuregate.Alpha}, genericfeatures.ConsistentListFromCache: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/vendor/modules.txt b/vendor/modules.txt index d8e1f3c2b6..741b978055 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1279,7 +1279,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -1338,7 +1338,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 +# k8s.io/apiextensions-apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/apiextensions-apiserver/pkg/apihelpers k8s.io/apiextensions-apiserver/pkg/apis/apiextensions @@ -1385,7 +1385,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi k8s.io/apiextensions-apiserver/pkg/registry/customresource k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -1453,7 +1453,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/admission k8s.io/apiserver/pkg/admission/configuration @@ -1625,13 +1625,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc k8s.io/apiserver/plugin/pkg/authenticator/token/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -1978,7 +1978,7 @@ k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue -# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 +# k8s.io/cloud-provider v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/cloud-provider k8s.io/cloud-provider/api @@ -2001,14 +2001,14 @@ k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers -# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 +# k8s.io/cluster-bootstrap v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/cluster-bootstrap/token/api k8s.io/cluster-bootstrap/token/jws k8s.io/cluster-bootstrap/token/util k8s.io/cluster-bootstrap/util/secrets k8s.io/cluster-bootstrap/util/tokens -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -2042,7 +2042,7 @@ k8s.io/component-base/tracing k8s.io/component-base/tracing/api/v1 k8s.io/component-base/version k8s.io/component-base/version/verflag -# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 +# k8s.io/component-helpers v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/component-helpers/apimachinery/lease k8s.io/component-helpers/apps/poddisruptionbudget @@ -2055,7 +2055,7 @@ k8s.io/component-helpers/scheduling/corev1 k8s.io/component-helpers/scheduling/corev1/nodeaffinity k8s.io/component-helpers/storage/ephemeral k8s.io/component-helpers/storage/volume -# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 +# k8s.io/controller-manager v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/controller-manager/app k8s.io/controller-manager/config @@ -2072,20 +2072,20 @@ k8s.io/controller-manager/pkg/informerfactory k8s.io/controller-manager/pkg/leadermigration k8s.io/controller-manager/pkg/leadermigration/config k8s.io/controller-manager/pkg/leadermigration/options -# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 +# k8s.io/cri-api v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/cri-api/pkg/apis k8s.io/cri-api/pkg/apis/runtime/v1 k8s.io/cri-api/pkg/errors -# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 +# k8s.io/csi-translation-lib v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 ## 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-20240805184523-43740e9179f5 +# k8s.io/dynamic-resource-allocation v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/dynamic-resource-allocation/resourceclaim k8s.io/dynamic-resource-allocation/structured/namedresources/cel -# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 +# k8s.io/endpointslice v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/endpointslice k8s.io/endpointslice/metrics @@ -2110,13 +2110,13 @@ k8s.io/klog/v2/internal/severity k8s.io/klog/v2/internal/sloghandler k8s.io/klog/v2/internal/verbosity k8s.io/klog/v2/textlogger -# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kms v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kms/apis/v1beta1 k8s.io/kms/apis/v2 k8s.io/kms/pkg/service k8s.io/kms/pkg/util -# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kube-aggregator v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kube-aggregator/pkg/apis/apiregistration k8s.io/kube-aggregator/pkg/apis/apiregistration/install @@ -2147,7 +2147,7 @@ k8s.io/kube-aggregator/pkg/controllers/status k8s.io/kube-aggregator/pkg/registry/apiservice k8s.io/kube-aggregator/pkg/registry/apiservice/etcd k8s.io/kube-aggregator/pkg/registry/apiservice/rest -# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kube-controller-manager v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kube-controller-manager/config/v1alpha1 # k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 @@ -2180,11 +2180,11 @@ k8s.io/kube-openapi/pkg/validation/spec k8s.io/kube-openapi/pkg/validation/strfmt k8s.io/kube-openapi/pkg/validation/strfmt/bson k8s.io/kube-openapi/pkg/validation/validate -# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kube-scheduler v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 ## 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-20240805184523-43740e9179f5 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/apps k8s.io/kubectl/pkg/cmd/apiresources @@ -2219,7 +2219,7 @@ k8s.io/kubectl/pkg/util/storage k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation -# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kubelet v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kubelet/config/v1 k8s.io/kubelet/config/v1alpha1 @@ -2241,7 +2241,7 @@ k8s.io/kubelet/pkg/cri/streaming k8s.io/kubelet/pkg/cri/streaming/portforward k8s.io/kubelet/pkg/cri/streaming/remotecommand k8s.io/kubelet/pkg/types -# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kubernetes v1.30.1 => github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kubernetes/cmd/kube-apiserver/app k8s.io/kubernetes/cmd/kube-apiserver/app/options @@ -3053,11 +3053,11 @@ k8s.io/kubernetes/third_party/forked/gonum/graph k8s.io/kubernetes/third_party/forked/gonum/graph/internal/linear k8s.io/kubernetes/third_party/forked/gonum/graph/simple k8s.io/kubernetes/third_party/forked/gonum/graph/traverse -# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 +# k8s.io/legacy-cloud-providers v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/legacy-cloud-providers/gce k8s.io/legacy-cloud-providers/gce/gcpcredential -# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 +# k8s.io/metrics v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/metrics/pkg/apis/custom_metrics k8s.io/metrics/pkg/apis/custom_metrics/v1beta1 @@ -3072,10 +3072,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1 k8s.io/metrics/pkg/client/custom_metrics k8s.io/metrics/pkg/client/custom_metrics/scheme k8s.io/metrics/pkg/client/external_metrics -# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 +# k8s.io/mount-utils v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/mount-utils -# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 +# k8s.io/pod-security-admission v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/pod-security-admission/admission k8s.io/pod-security-admission/admission/api @@ -3226,38 +3226,38 @@ sigs.k8s.io/structured-merge-diff/v4/value ## explicit; go 1.12 sigs.k8s.io/yaml # github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240805184523-43740e9179f5 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240805184523-43740e9179f5 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 # go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef # sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 From 33a38b487f882862224e217dce36188d238314de Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:27:21 +0000 Subject: [PATCH 5/8] update etcd/go.mod --- etcd/go.mod | 60 ++++++++++++++++++++++++++--------------------------- etcd/go.sum | 28 ++++++++++++------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/etcd/go.mod b/etcd/go.mod index 351ac71581..c473326b22 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -150,35 +150,35 @@ replace ( go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef // from etcd - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240805184523-43740e9179f5 // staging kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240805184523-43740e9179f5 // staging kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes ) -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 // staging kubernetes diff --git a/etcd/go.sum b/etcd/go.sum index 94389a54b6..ef49e43f68 100644 --- a/etcd/go.sum +++ b/etcd/go.sum @@ -200,20 +200,20 @@ github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:i9O8+g github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:hlets2VEeYF+XgTh3LjKq3xe574wlGuGwb+oYZDSjog= github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef h1:gAL0Hw/h7vE2UMP69wEFI2Ze5aHppyOYoHofHdYXVic= github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef/go.mod h1:3DLfi/OCqBQNsMY+5u5a3sw5OGvD+eiZf0Fxbv4qZrc= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 h1:gYaE6OIgjf3ltHytd4OAcUWycuLQ4bHBuJruHHbd2HY= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 h1:9IxbBVEKe/iUHeyVEpN6Mlj9hX0NQTB0IqRIA6s6RP0= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 h1:z+KIhDWwiVhufVngtYh7IZyjNjwmwgodZrkiDp/JLyQ= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 h1:b8exahhjIEZU+BmtiZTyxLFXmJh2XYtpYQKSjYR11gQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 h1:ULVYb51NwM/gLnBT1vGNDBxdLyzx6Zq9chtRg0RuxdU= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 h1:LOZisL2BfFfCSmVLt4CNQMU2+hPiTkDBaycfWtXFcQI= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 h1:ocitXiENCJXCCxfvs7ip5bWzXdJ/7eMwa3yr+kFdaoQ= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 h1:gAmVIECtmH044BtHEVDxFHPxjWn9E/lvAgW/jV8rrAg= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:OtpBgWlPMu+LFExx+Y4bZ0ABtWuAFZOsl7zghYR2gKs= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 h1:XeJIYG2szV1bAfvnaxf5Wq2km96kzF8APaM4n6SL1Q0= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:2YeOqiALpKSAxO0DpeDw8rvpwfc/TWeluLxX4Uo+d5E= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 h1:EaFMTpB/CHKAE2bnVprUT9MWuJX9v/pziesm/ilBQcI= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Iq+2JxY1CvM4EV+yZiJIkT2WLTgIl40euGk5qP3WTjk= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 h1:wo7FiRi7/P07z5mtqpmyFjoSdqIbVXiRvJfrUJIMyRo= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:Yp9oaQw9PaBJ2Eo44OJBDBAUmVIWIktNuXAQY6x5efM= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 h1:i1A8y8HPoSaSttMRDCFM7KcKj0LoYtHsbrQN6H6BJtI= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:UAQY4MnAO2dm49/o1uwAdh7MATtIw16tYLZ2UB/1FpM= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 h1:PygFpFaGQnP4xfIgb1fx+95fcBNUWR1J1JxXkd7Fs2o= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:gpC/KgMvGoApTN+nanf+1A3RiHzQZ23W2dmkmu5v2ZU= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 h1:Gi/29SgAOs9fAfzG2lMOoAsA/8R5UXGiFcceH6rJMB8= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35/go.mod h1:hRwIOcm798K6FXiwmRHaB48AI6G4+zfe4PgSjVx+T1M= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be h1:a59nZ27dqyuuUSIR0i8g7NEEIOaFxfkMLql8Kc0h5Eg= github.com/openshift/library-go v0.0.0-20240528110646-354b673304be/go.mod h1:PdASVamWinll2BPxiUpXajTwZxV8A1pQbWEsCN1od7I= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d h1:GDn4rF5hmB+d0tnFcPQhPy1YTooJH6U+HeYYdyjktmI= From 7f55e0e04c739b7356f6c9bae590884d32c12ad0 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:27:27 +0000 Subject: [PATCH 6/8] update etcd/vendor --- etcd/vendor/modules.txt | 74 ++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt index 4990d101c5..ca4aae8b81 100644 --- a/etcd/vendor/modules.txt +++ b/etcd/vendor/modules.txt @@ -618,7 +618,7 @@ gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 +# k8s.io/api v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 @@ -677,7 +677,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 +# k8s.io/apimachinery v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -733,17 +733,17 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 +# k8s.io/apiserver v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/apiserver/pkg/apis/audit k8s.io/apiserver/pkg/apis/audit/v1 -# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 +# k8s.io/cli-runtime v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/genericiooptions k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource -# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 +# k8s.io/client-go v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -892,7 +892,7 @@ k8s.io/client-go/util/homedir k8s.io/client-go/util/jsonpath k8s.io/client-go/util/keyutil k8s.io/client-go/util/workqueue -# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 +# k8s.io/component-base v0.30.1 => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/component-base/cli k8s.io/component-base/cli/flag @@ -929,7 +929,7 @@ k8s.io/kube-openapi/pkg/spec3 k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation k8s.io/kube-openapi/pkg/validation/spec -# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 +# k8s.io/kubectl v0.0.0 => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 ## explicit; go 1.22.0 k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/scheme @@ -1056,33 +1056,33 @@ sigs.k8s.io/yaml # go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef # go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef -# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 -# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 -# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 -# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240805184523-43740e9179f5 -# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 -# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 -# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 -# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 -# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 -# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 -# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 -# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 -# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 -# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 -# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240805184523-43740e9179f5 -# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240805184523-43740e9179f5 -# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 +# k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240819213058-a092ee7d2b35 +# k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 From 9f93bb83143f201ad75bd8ed731b228c7d02c491 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:27:27 +0000 Subject: [PATCH 7/8] 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 34192397ea..b14653fb34 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:13e890f8679773305aa8e09af3e0c2f56f51a350e43fc8825720e65b09a3dc69" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8d9a3bedd4fd3e7becb7a814d0b9fcc487c57355712897bd337528cce05da80" 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 4f2bef942d..fa6ad4040a 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:e99ccba70c29daca7823898b14c87373b55be8f7ac168025beaa9a2c3c57a540" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a6c6ceec0ccc594c8066a3251faef15461fe2dbb0f989481a1cecd0476d9e6" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 864c8b79885c41001e696fbcba37f705470ac6b5 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Wed, 28 Aug 2024 04:27:30 +0000 Subject: [PATCH 8/8] rebase.sh failure artifacts --- .../05_operand_rbac.yaml | 17 +- .../csi_controller_deployment.yaml | 40 +- .../serviceaccount.yaml | 2 +- .../webhook_config.yaml | 6 +- .../webhook_deployment.yaml | 82 +- .../webhook_service.yaml | 8 +- .../webhook_serviceaccount.yaml | 2 +- .../openshift-dns/dns/daemonset.yaml | 159 ++-- .../components/openshift-dns/dns/service.yaml | 35 +- .../node-resolver/daemonset.yaml | 140 --- .../openshift-router/cluster-role.yaml | 1 + .../openshift-router/deployment.yaml | 126 +-- .../openshift-router/service-cloud.yaml | 21 +- .../openshift-router/service-internal.yaml | 33 +- assets/components/service-ca/deployment.yaml | 73 +- assets/components/service-ca/ns.yaml | 2 + .../kube-apiserver/defaultconfig.yaml | 30 +- .../defaultconfig.yaml | 46 +- assets/core/kubelet.yaml | 72 +- ...tor_01_securitycontextconstraints.crd.yaml | 282 ------ ...nfig-operator_02_rangeallocations.crd.yaml | 52 -- assets/crd/route.crd.yaml | 666 -------------- assets/crd/storage_version_migration.crd.yaml | 100 -- assets/release/release-aarch64.json | 20 +- assets/release/release-x86_64.json | 20 +- rebase_sh.log | 855 ++++++++++++++++++ 26 files changed, 1211 insertions(+), 1679 deletions(-) delete mode 100644 assets/components/openshift-dns/node-resolver/daemonset.yaml delete mode 100644 assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml delete mode 100644 assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml delete mode 100644 assets/crd/route.crd.yaml delete mode 100644 assets/crd/storage_version_migration.crd.yaml create mode 100644 rebase_sh.log diff --git a/assets/components/csi-snapshot-controller/05_operand_rbac.yaml b/assets/components/csi-snapshot-controller/05_operand_rbac.yaml index 8dc7de8c1f..b3fe5665bc 100644 --- a/assets/components/csi-snapshot-controller/05_operand_rbac.yaml +++ b/assets/components/csi-snapshot-controller/05_operand_rbac.yaml @@ -51,6 +51,7 @@ rules: - apiGroups: ["groupsnapshot.storage.k8s.io"] resources: ["volumegroupsnapshots/status"] verbs: ["update", "patch"] + --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 @@ -65,16 +66,17 @@ metadata: subjects: - kind: ServiceAccount name: csi-snapshot-controller - namespace: kube-system + namespace: openshift-cluster-storage-operator roleRef: kind: ClusterRole name: openshift-csi-snapshot-controller-runner apiGroup: rbac.authorization.k8s.io + --- kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: - namespace: kube-system + namespace: openshift-cluster-storage-operator name: csi-snapshot-controller-leaderelection annotations: include.release.openshift.io/hypershift: "true" @@ -83,15 +85,16 @@ metadata: include.release.openshift.io/single-node-developer: "true" capability.openshift.io/name: CSISnapshot rules: - - apiGroups: ["coordination.k8s.io"] - resources: ["leases"] - verbs: ["get", "watch", "list", "delete", "update", "create"] +- apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "watch", "list", "delete", "update", "create"] + --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: csi-snapshot-controller-leaderelection - namespace: kube-system + namespace: openshift-cluster-storage-operator annotations: include.release.openshift.io/hypershift: "true" include.release.openshift.io/ibm-cloud-managed: "true" @@ -101,7 +104,7 @@ metadata: subjects: - kind: ServiceAccount name: csi-snapshot-controller - namespace: kube-system + namespace: openshift-cluster-storage-operator roleRef: kind: Role name: csi-snapshot-controller-leaderelection diff --git a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml index 6455c44360..565b758456 100644 --- a/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml +++ b/assets/components/csi-snapshot-controller/csi_controller_deployment.yaml @@ -2,7 +2,7 @@ kind: Deployment apiVersion: apps/v1 metadata: name: csi-snapshot-controller - namespace: kube-system + namespace: ${CONTROLPLANE_NAMESPACE} spec: serviceName: "csi-snapshot-controller" # Replicas for HyperShift. On standalone OCP it will be adjusted according to nr. of master nodes. @@ -36,11 +36,18 @@ spec: capabilities: drop: - ALL - runAsUser: 65534 - image: '{{ .ReleaseImage.csi_snapshot_controller }}' + image: ${OPERAND_IMAGE} args: - - --v=2 - - --leader-election=false + - "--v=${LOG_LEVEL}" + - "--leader-election=true" + # Leader election values are from + # https://github.com/openshift/library-go/blob/master/pkg/config/leaderelection/leaderelection.go + - "--leader-election-lease-duration=137s" + - "--leader-election-renew-deadline=107s" + - "--leader-election-retry-period=26s" + # Force the namespace name for HyperShift + - "--leader-election-namespace=openshift-cluster-storage-operator" + # guest --kubeconfig= will be injected by the operator when running on HyperShift imagePullPolicy: IfNotPresent resources: requests: @@ -58,18 +65,19 @@ spec: matchLabels: app: csi-snapshot-controller topologyKey: kubernetes.io/hostname + priorityClassName: ${PRIORITY_CLASS} nodeSelector: node-role.kubernetes.io/master: "" tolerations: - - key: "node.kubernetes.io/unreachable" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - - key: "node.kubernetes.io/not-ready" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - - key: node-role.kubernetes.io/master - operator: Exists - effect: "NoSchedule" + - key: "node.kubernetes.io/unreachable" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 + - key: "node.kubernetes.io/not-ready" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 + - key: node-role.kubernetes.io/master + operator: Exists + effect: "NoSchedule" # volume with guest Kubeconfig will be added by the operator diff --git a/assets/components/csi-snapshot-controller/serviceaccount.yaml b/assets/components/csi-snapshot-controller/serviceaccount.yaml index 6de8066162..aaa64ce0ce 100644 --- a/assets/components/csi-snapshot-controller/serviceaccount.yaml +++ b/assets/components/csi-snapshot-controller/serviceaccount.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: csi-snapshot-controller - namespace: kube-system + namespace: ${CONTROLPLANE_NAMESPACE} diff --git a/assets/components/csi-snapshot-controller/webhook_config.yaml b/assets/components/csi-snapshot-controller/webhook_config.yaml index 6c4f539985..21493981ee 100644 --- a/assets/components/csi-snapshot-controller/webhook_config.yaml +++ b/assets/components/csi-snapshot-controller/webhook_config.yaml @@ -13,10 +13,10 @@ webhooks: clientConfig: service: name: csi-snapshot-webhook - namespace: kube-system + namespace: openshift-cluster-storage-operator path: /volumesnapshot rules: - - operations: ["CREATE", "UPDATE"] + - operations: [ "CREATE", "UPDATE" ] apiGroups: ["snapshot.storage.k8s.io"] apiVersions: ["v1beta1", "v1"] resources: ["volumesnapshotclasses"] @@ -32,7 +32,7 @@ webhooks: namespace: openshift-cluster-storage-operator path: /volumegroupsnapshot rules: - - operations: ["CREATE", "UPDATE"] + - operations: [ "CREATE", "UPDATE" ] apiGroups: ["groupsnapshot.storage.k8s.io"] apiVersions: ["v1alpha1"] resources: ["volumegroupsnapshotclasses"] diff --git a/assets/components/csi-snapshot-controller/webhook_deployment.yaml b/assets/components/csi-snapshot-controller/webhook_deployment.yaml index 1ac61c9022..022e0bb7a5 100644 --- a/assets/components/csi-snapshot-controller/webhook_deployment.yaml +++ b/assets/components/csi-snapshot-controller/webhook_deployment.yaml @@ -2,7 +2,7 @@ kind: Deployment apiVersion: apps/v1 metadata: name: csi-snapshot-webhook - namespace: kube-system + namespace: ${CONTROLPLANE_NAMESPACE} spec: serviceName: "csi-snapshot-webhook" selector: @@ -23,32 +23,31 @@ spec: spec: serviceAccount: csi-snapshot-webhook containers: - - name: webhook - image: '{{ .ReleaseImage.csi_snapshot_validation_webhook }}' - args: - - --tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt - - --tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key - - "--v=2" - - --port=8443 - ports: - - containerPort: 8443 - volumeMounts: - - name: certs - mountPath: /etc/snapshot-validation-webhook/certs - readOnly: true - optional: true - imagePullPolicy: IfNotPresent - resources: - requests: - cpu: 10m - memory: 20Mi - securityContext: - allowPrivilegeEscalation: false - capabilities: - drop: - - ALL - runAsUser: 65534 - terminationMessagePolicy: FallbackToLogsOnError + - name: webhook + image: ${OPERAND_IMAGE} + args: + - --tls-cert-file=/etc/snapshot-validation-webhook/certs/tls.crt + - --tls-private-key-file=/etc/snapshot-validation-webhook/certs/tls.key + - "--v=${LOG_LEVEL}" + - --port=8443 + ports: + - containerPort: 8443 + volumeMounts: + - name: certs + mountPath: /etc/snapshot-validation-webhook/certs + readOnly: true + optional: true + imagePullPolicy: IfNotPresent + resources: + requests: + cpu: 10m + memory: 20Mi + securityContext: + allowPrivilegeEscalation: false + capabilities: + drop: + - ALL + terminationMessagePolicy: FallbackToLogsOnError affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -58,6 +57,7 @@ spec: matchLabels: app: csi-snapshot-webhook topologyKey: kubernetes.io/hostname + priorityClassName: ${PRIORITY_CLASS} restartPolicy: Always securityContext: runAsNonRoot: true @@ -66,18 +66,18 @@ spec: nodeSelector: node-role.kubernetes.io/master: "" volumes: - - name: certs - secret: - secretName: csi-snapshot-webhook-secret + - name: certs + secret: + secretName: csi-snapshot-webhook-secret tolerations: - - key: "node.kubernetes.io/unreachable" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - - key: "node.kubernetes.io/not-ready" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - - key: node-role.kubernetes.io/master - operator: Exists - effect: "NoSchedule" + - key: "node.kubernetes.io/unreachable" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 + - key: "node.kubernetes.io/not-ready" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 + - key: node-role.kubernetes.io/master + operator: Exists + effect: "NoSchedule" diff --git a/assets/components/csi-snapshot-controller/webhook_service.yaml b/assets/components/csi-snapshot-controller/webhook_service.yaml index ddd576182d..57b0d2f82f 100644 --- a/assets/components/csi-snapshot-controller/webhook_service.yaml +++ b/assets/components/csi-snapshot-controller/webhook_service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: csi-snapshot-webhook - namespace: kube-system + namespace: ${CONTROLPLANE_NAMESPACE} labels: app: csi-snapshot-webhook hypershift.openshift.io/allow-guest-webhooks: "true" @@ -11,8 +11,8 @@ metadata: capability.openshift.io/name: CSISnapshot spec: ports: - - name: webhook - port: 443 - targetPort: 8443 + - name: webhook + port: 443 + targetPort: 8443 selector: app: csi-snapshot-webhook diff --git a/assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml b/assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml index 3d56d25c29..d831850a1f 100644 --- a/assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml +++ b/assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml @@ -2,4 +2,4 @@ apiVersion: v1 kind: ServiceAccount metadata: name: csi-snapshot-webhook - namespace: kube-system + namespace: ${CONTROLPLANE_NAMESPACE} diff --git a/assets/components/openshift-dns/dns/daemonset.yaml b/assets/components/openshift-dns/dns/daemonset.yaml index d6b720767b..ad71b08ce7 100644 --- a/assets/components/openshift-dns/dns/daemonset.yaml +++ b/assets/components/openshift-dns/dns/daemonset.yaml @@ -1,5 +1,6 @@ kind: DaemonSet apiVersion: apps/v1 +# name, namespace and labels are set at runtime spec: # minReadySeconds should be 3x the readiness probe's polling interval (i.e. periodSeconds). minReadySeconds: 9 @@ -7,91 +8,83 @@ spec: metadata: annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - dns.operator.openshift.io/daemonset-dns: default spec: serviceAccountName: dns priorityClassName: system-node-critical containers: - - name: dns - imagePullPolicy: IfNotPresent - terminationMessagePolicy: FallbackToLogsOnError - command: ["coredns"] - args: ["-conf", "/etc/coredns/Corefile"] - volumeMounts: - - name: config-volume - mountPath: /etc/coredns - readOnly: true - ports: - - containerPort: 5353 - name: dns - protocol: UDP - - containerPort: 5353 - name: dns-tcp - protocol: TCP - readinessProbe: - httpGet: - path: /ready - port: 8181 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value! - successThreshold: 1 - failureThreshold: 3 - timeoutSeconds: 3 - livenessProbe: - httpGet: - path: /health - port: 8080 - scheme: HTTP - initialDelaySeconds: 60 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 5 - resources: - requests: - cpu: 50m - memory: 70Mi - image: '{{ .ReleaseImage.coredns }}' - - name: kube-rbac-proxy - args: - - --logtostderr - - --secure-listen-address=:9154 - - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 - - --upstream=http://127.0.0.1:9153/ - - --tls-cert-file=/etc/tls/private/tls.crt - - --tls-private-key-file=/etc/tls/private/tls.key - ports: - - containerPort: 9154 - name: metrics - resources: - requests: - cpu: 10m - memory: 40Mi - terminationMessagePolicy: FallbackToLogsOnError - volumeMounts: - - mountPath: /etc/tls/private - name: metrics-tls - readOnly: true - image: '{{ .ReleaseImage.kube_rbac_proxy }}' - imagePullPolicy: IfNotPresent + - name: dns + # image is set at runtime + imagePullPolicy: IfNotPresent + terminationMessagePolicy: FallbackToLogsOnError + command: [ "coredns" ] + args: [ "-conf", "/etc/coredns/Corefile" ] + volumeMounts: + - name: config-volume + mountPath: /etc/coredns + readOnly: true + ports: + - containerPort: 5353 + name: dns + protocol: UDP + - containerPort: 5353 + name: dns-tcp + protocol: TCP + readinessProbe: + httpGet: + path: /ready + port: 8181 + scheme: HTTP + initialDelaySeconds: 10 + periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value! + successThreshold: 1 + failureThreshold: 3 + timeoutSeconds: 3 + livenessProbe: + httpGet: + path: /health + port: 8080 + scheme: HTTP + initialDelaySeconds: 60 + timeoutSeconds: 5 + successThreshold: 1 + failureThreshold: 5 + resources: + requests: + cpu: 50m + memory: 70Mi + - name: kube-rbac-proxy + # image is set at runtime + args: + - --logtostderr + - --secure-listen-address=:9154 + - --tls-cipher-suites=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 + - --upstream=http://127.0.0.1:9153/ + - --tls-cert-file=/etc/tls/private/tls.crt + - --tls-private-key-file=/etc/tls/private/tls.key + ports: + - containerPort: 9154 + name: metrics + resources: + requests: + cpu: 10m + memory: 40Mi + terminationMessagePolicy: FallbackToLogsOnError + volumeMounts: + - mountPath: /etc/tls/private + name: metrics-tls + readOnly: true dnsPolicy: Default + # nodeSelector is set at runtime. volumes: - - name: config-volume - configMap: - items: - - key: Corefile - path: Corefile - name: dns-default - - name: metrics-tls - secret: - defaultMode: 420 - secretName: dns-default-metrics-tls - nodeSelector: - kubernetes.io/os: linux - tolerations: - - key: node-role.kubernetes.io/master - operator: Exists + - name: config-volume + configMap: + # Name is set at runtime + items: + - key: Corefile + path: Corefile + - name: metrics-tls + # secretName is set at runtime + # tolerations is set at runtime. updateStrategy: type: RollingUpdate rollingUpdate: @@ -103,11 +96,3 @@ spec: maxSurge: 10% # maxUnavailable must be zero when maxSurge is nonzero. maxUnavailable: 0 - selector: - matchLabels: - dns.operator.openshift.io/daemonset-dns: default -metadata: - name: dns-default - namespace: openshift-dns - labels: - dns.operator.openshift.io/owning-dns: default diff --git a/assets/components/openshift-dns/dns/service.yaml b/assets/components/openshift-dns/dns/service.yaml index 3849d98bce..0dca87150b 100644 --- a/assets/components/openshift-dns/dns/service.yaml +++ b/assets/components/openshift-dns/dns/service.yaml @@ -1,24 +1,19 @@ kind: Service apiVersion: v1 +# name, namespace,labels and annotations are set at runtime spec: + # clusterIP will be automatically managed. + # selector is set at runtime ports: - - name: dns - port: 53 - targetPort: dns - protocol: UDP - - name: dns-tcp - port: 53 - targetPort: dns-tcp - protocol: TCP - - name: metrics - port: 9154 - targetPort: metrics - protocol: TCP - clusterIP: '{{.ClusterIP}}' - selector: - dns.operator.openshift.io/daemonset-dns: default -metadata: - annotations: - service.beta.openshift.io/serving-cert-secret-name: dns-default-metrics-tls - name: dns-default - namespace: openshift-dns + - name: dns + port: 53 + targetPort: dns + protocol: UDP + - name: dns-tcp + port: 53 + targetPort: dns-tcp + protocol: TCP + - name: metrics + port: 9154 + targetPort: metrics + protocol: TCP diff --git a/assets/components/openshift-dns/node-resolver/daemonset.yaml b/assets/components/openshift-dns/node-resolver/daemonset.yaml deleted file mode 100644 index 6d8a5fbf32..0000000000 --- a/assets/components/openshift-dns/node-resolver/daemonset.yaml +++ /dev/null @@ -1,140 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: node-resolver - namespace: openshift-dns -spec: - revisionHistoryLimit: 10 - selector: - matchLabels: - dns.operator.openshift.io/daemonset-node-resolver: "" - template: - metadata: - annotations: - target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - dns.operator.openshift.io/daemonset-node-resolver: "" - spec: - containers: - - command: - - /bin/bash - - -c - - | - #!/bin/bash - set -uo pipefail - - trap 'jobs -p | xargs kill || true; wait; exit 0' TERM - - NAMESERVER=${DNS_DEFAULT_SERVICE_HOST} - OPENSHIFT_MARKER="openshift-generated-node-resolver" - HOSTS_FILE="/etc/hosts" - TEMP_FILE="/etc/hosts.tmp" - - IFS=', ' read -r -a services <<< "${SERVICES}" - - # Make a temporary file with the old hosts file's attributes. - if ! cp -f --attributes-only "${HOSTS_FILE}" "${TEMP_FILE}"; then - echo "Failed to preserve hosts file. Exiting." - exit 1 - fi - - while true; do - declare -A svc_ips - for svc in "${services[@]}"; do - # Fetch service IP from cluster dns if present. We make several tries - # to do it: IPv4, IPv6, IPv4 over TCP and IPv6 over TCP. The two last ones - # are for deployments with Kuryr on older OpenStack (OSP13) - those do not - # support UDP loadbalancers and require reaching DNS through TCP. - cmds=('dig -t A @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t AAAA @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t A +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"' - 'dig -t AAAA +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"') - for i in ${!cmds[*]} - do - ips=($(eval "${cmds[i]}")) - if [[ "$?" -eq 0 && "${#ips[@]}" -ne 0 ]]; then - svc_ips["${svc}"]="${ips[@]}" - break - fi - done - done - - # Update /etc/hosts only if we get valid service IPs - # We will not update /etc/hosts when there is coredns service outage or api unavailability - # Stale entries could exist in /etc/hosts if the service is deleted - if [[ -n "${svc_ips[*]-}" ]]; then - # Build a new hosts file from /etc/hosts with our custom entries filtered out - if ! sed --silent "/# ${OPENSHIFT_MARKER}/d; w ${TEMP_FILE}" "${HOSTS_FILE}"; then - # Only continue rebuilding the hosts entries if its original content is preserved - sleep 60 & wait - continue - fi - - # Append resolver entries for services - rc=0 - for svc in "${!svc_ips[@]}"; do - for ip in ${svc_ips[${svc}]}; do - echo "${ip} ${svc} ${svc}.${CLUSTER_DOMAIN} # ${OPENSHIFT_MARKER}" >> "${TEMP_FILE}" || rc=$? - done - done - if [[ $rc -ne 0 ]]; then - sleep 60 & wait - continue - fi - - - # TODO: Update /etc/hosts atomically to avoid any inconsistent behavior - # Replace /etc/hosts with our modified version if needed - cmp "${TEMP_FILE}" "${HOSTS_FILE}" || cp -f "${TEMP_FILE}" "${HOSTS_FILE}" - # TEMP_FILE is not removed to avoid file create/delete and attributes copy churn - fi - sleep 60 & wait - unset svc_ips - done - env: - - name: SERVICES - # Comma or space separated list of services - # NOTE: For now, ensure these are relative names; for each relative name, - # an alias with the CLUSTER_DOMAIN suffix will also be added. - value: "image-registry.openshift-image-registry.svc" - - name: NAMESERVER - value: 172.30.0.10 - - name: CLUSTER_DOMAIN - value: cluster.local - image: {{ .ReleaseImage.cli }} - imagePullPolicy: IfNotPresent - name: dns-node-resolver - resources: - requests: - cpu: 5m - memory: 21Mi - securityContext: - privileged: true - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: FallbackToLogsOnError - volumeMounts: - - mountPath: /etc/hosts - name: hosts-file - dnsPolicy: ClusterFirst - hostNetwork: true - nodeSelector: - kubernetes.io/os: linux - priorityClassName: system-node-critical - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - serviceAccount: node-resolver - serviceAccountName: node-resolver - terminationGracePeriodSeconds: 30 - tolerations: - - operator: Exists - volumes: - - hostPath: - path: /etc/hosts - type: File - name: hosts-file - updateStrategy: - rollingUpdate: - maxSurge: 0 - maxUnavailable: 33% - type: RollingUpdate diff --git a/assets/components/openshift-router/cluster-role.yaml b/assets/components/openshift-router/cluster-role.yaml index b3e0d21755..f0b344e35d 100644 --- a/assets/components/openshift-router/cluster-role.yaml +++ b/assets/components/openshift-router/cluster-role.yaml @@ -51,6 +51,7 @@ rules: - use resourceNames: - hostnetwork + - restricted - apiGroups: - discovery.k8s.io diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml index 1621b7532d..25cfae777c 100644 --- a/assets/components/openshift-router/deployment.yaml +++ b/assets/components/openshift-router/deployment.yaml @@ -1,70 +1,35 @@ # Deployment with default values +# Ingress Controller specific values are applied at runtime. kind: Deployment apiVersion: apps/v1 +# name and namespace are set at runtime. spec: progressDeadlineSeconds: 600 template: metadata: annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' - labels: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default spec: serviceAccountName: router + # nodeSelector is set at runtime. priorityClassName: system-cluster-critical containers: - name: router + # image is set at runtime. imagePullPolicy: IfNotPresent securityContext: # See https://bugzilla.redhat.com/2007246 allowPrivilegeEscalation: true readOnlyRootFilesystem: false terminationMessagePolicy: FallbackToLogsOnError + # Merged at runtime. env: - - name: ROUTER_SERVICE_NAMESPACE - value: openshift-ingress - - name: DEFAULT_CERTIFICATE_DIR - value: /etc/pki/tls/private - - name: DEFAULT_DESTINATION_CA_PATH - value: /var/run/configmaps/service-ca/service-ca.crt - - name: STATS_PORT - value: "1936" - - name: RELOAD_INTERVAL - value: 5s - - name: ROUTER_ALLOW_WILDCARD_ROUTES - value: "false" - - name: ROUTER_CANONICAL_HOSTNAME - value: router-default.apps.{{ .BaseDomain }} - - name: ROUTER_CIPHERS - value: ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384 - - name: ROUTER_CIPHERSUITES - value: TLS_AES_128_GCM_SHA256:TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256 - - name: ROUTER_DISABLE_HTTP2 - value: "true" - - name: ROUTER_DISABLE_NAMESPACE_OWNERSHIP_CHECK - value: '{{.RouterNamespaceOwnership}}' - - name: ROUTER_LOAD_BALANCE_ALGORITHM - value: random - - name: ROUTER_METRICS_TYPE - value: haproxy - - name: ROUTER_SERVICE_NAME - value: default - - name: ROUTER_SET_FORWARDED_HEADERS - value: append - - name: ROUTER_TCP_BALANCE_SCHEME - value: source - - name: ROUTER_THREADS - value: "4" - - name: SSL_MIN_VERSION - value: TLSv1.2 - - name: ROUTER_USE_PROXY_PROTOCOL - value: "false" - - name: GRACEFUL_SHUTDOWN_DELAY - value: 1s - - name: ROUTER_DOMAIN - value: apps.{{ .BaseDomain }} - - name: ROUTER_IP_V4_V6_MODE - value: '{{ .RouterMode }}' + - name: ROUTER_SERVICE_NAMESPACE + value: openshift-ingress + - name: DEFAULT_CERTIFICATE_DIR + value: /etc/pki/tls/private + - name: DEFAULT_DESTINATION_CA_PATH + value: /var/run/configmaps/service-ca/service-ca.crt livenessProbe: failureThreshold: 3 httpGet: @@ -98,55 +63,22 @@ spec: cpu: 100m memory: 256Mi volumeMounts: - - mountPath: /etc/pki/tls/private - name: default-certificate - readOnly: true - - mountPath: /var/run/configmaps/service-ca - name: service-ca-bundle - readOnly: true - image: '{{ .ReleaseImage.haproxy_router }}' - ports: - - name: http - containerPort: 80 - protocol: TCP - - name: https - containerPort: 443 - protocol: TCP - - name: metrics - containerPort: 1936 - protocol: TCP - args: - - -v=4 - volumes: - - name: default-certificate - secret: - defaultMode: 420 - secretName: router-certs-default - - name: service-ca-bundle - configMap: - defaultMode: 420 - items: - - key: service-ca.crt - path: service-ca.crt + - mountPath: /etc/pki/tls/private + name: default-certificate + readOnly: true + - mountPath: /var/run/configmaps/service-ca name: service-ca-bundle - optional: false - restartPolicy: Always - dnsPolicy: ClusterFirst - nodeSelector: - kubernetes.io/os: linux - node-role.kubernetes.io/worker: "" - serviceAccount: router - securityContext: {} - schedulerName: default-scheduler - minReadySeconds: 30 - selector: - matchLabels: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default - replicas: 1 - strategy: - type: Recreate -metadata: - name: router-default - namespace: openshift-ingress - labels: - ingresscontroller.operator.openshift.io/owning-ingresscontroller: default + readOnly: true + volumes: + - name: default-certificate + secret: + defaultMode: 420 + # SecretName is set at run-time. + - name: service-ca-bundle + configMap: + defaultMode: 420 + items: + - key: service-ca.crt + path: service-ca.crt + name: service-ca-bundle + optional: false diff --git a/assets/components/openshift-router/service-cloud.yaml b/assets/components/openshift-router/service-cloud.yaml index 305993fb02..9f5a072b7f 100644 --- a/assets/components/openshift-router/service-cloud.yaml +++ b/assets/components/openshift-router/service-cloud.yaml @@ -7,24 +7,21 @@ metadata: namespace: openshift-ingress labels: app: router - ingresscontroller.operator.openshift.io/owning-ingresscontroller: default - name: router-default spec: type: LoadBalancer selector: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default + app: router # This also has the effect of marking LB pool targets as unhealthy when no # router pods are present on a node behind the service. externalTrafficPolicy: Local internalTrafficPolicy: Cluster ports: - - name: http - protocol: TCP - port: {{ .RouterHttpPort }} - targetPort: http - - name: https - protocol: TCP - port: {{ .RouterHttpsPort }} - targetPort: https + - name: http + protocol: TCP + port: 80 + targetPort: http + - name: https + protocol: TCP + port: 443 + targetPort: https sessionAffinity: None - ipFamilyPolicy: '{{.IPFamily}}' diff --git a/assets/components/openshift-router/service-internal.yaml b/assets/components/openshift-router/service-internal.yaml index 5183fe49b8..126f6ba273 100644 --- a/assets/components/openshift-router/service-internal.yaml +++ b/assets/components/openshift-router/service-internal.yaml @@ -2,28 +2,21 @@ # Ingress Controller specific annotations are applied at runtime. kind: Service apiVersion: v1 +# name, namespace and annotations are set at runtime. spec: type: ClusterIP internalTrafficPolicy: Cluster ports: - - name: http - port: 80 - protocol: TCP - targetPort: http - - name: https - port: 443 - protocol: TCP - targetPort: https - - name: metrics - port: 1936 - protocol: TCP - targetPort: metrics + - name: http + port: 80 + protocol: TCP + targetPort: http + - name: https + port: 443 + protocol: TCP + targetPort: https + - name: metrics + port: 1936 + protocol: TCP + targetPort: metrics sessionAffinity: None - selector: - ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default - ipFamilyPolicy: '{{.IPFamily}}' -metadata: - labels: - ingresscontroller.operator.openshift.io/owning-ingresscontroller: default - name: router-internal-default - namespace: openshift-ingress diff --git a/assets/components/service-ca/deployment.yaml b/assets/components/service-ca/deployment.yaml index fc27a300fb..6b9c679a97 100644 --- a/assets/components/service-ca/deployment.yaml +++ b/assets/components/service-ca/deployment.yaml @@ -25,46 +25,43 @@ spec: spec: serviceAccountName: service-ca containers: - - name: service-ca-controller - image: '{{ .ReleaseImage.service_ca_operator }}' - imagePullPolicy: IfNotPresent - command: ["service-ca-operator", "controller"] - ports: - - containerPort: 8443 - securityContext: - runAsNonRoot: true - resources: - requests: - memory: 120Mi - cpu: 10m - terminationMessagePolicy: FallbackToLogsOnError - volumeMounts: - - mountPath: /var/run/secrets/signing-key - name: signing-key - - mountPath: /var/run/configmaps/signing-cabundle - name: signing-cabundle - args: - - -v=2 + - name: service-ca-controller + image: ${IMAGE} + imagePullPolicy: IfNotPresent + command: ["service-ca-operator", "controller"] + ports: + - containerPort: 8443 + securityContext: + runAsNonRoot: true + resources: + requests: + memory: 120Mi + cpu: 10m + terminationMessagePolicy: FallbackToLogsOnError + volumeMounts: + - mountPath: /var/run/secrets/signing-key + name: signing-key + - mountPath: /var/run/configmaps/signing-cabundle + name: signing-cabundle volumes: - - name: signing-key - secret: - secretName: '{{.TLSSecret}}' - - name: signing-cabundle - configMap: - name: '{{.CAConfigMap}}' + - name: signing-key + secret: + secretName: signing-key + - name: signing-cabundle + configMap: + name: signing-cabundle nodeSelector: node-role.kubernetes.io/master: "" priorityClassName: "system-cluster-critical" tolerations: - - key: node-role.kubernetes.io/master - operator: Exists - effect: "NoSchedule" - - key: "node.kubernetes.io/unreachable" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - - key: "node.kubernetes.io/not-ready" - operator: "Exists" - effect: "NoExecute" - tolerationSeconds: 120 - replicas: 1 + - key: node-role.kubernetes.io/master + operator: Exists + effect: "NoSchedule" + - key: "node.kubernetes.io/unreachable" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 + - key: "node.kubernetes.io/not-ready" + operator: "Exists" + effect: "NoExecute" + tolerationSeconds: 120 diff --git a/assets/components/service-ca/ns.yaml b/assets/components/service-ca/ns.yaml index 5826956115..0ba2847ecc 100644 --- a/assets/components/service-ca/ns.yaml +++ b/assets/components/service-ca/ns.yaml @@ -5,3 +5,5 @@ metadata: annotations: openshift.io/node-selector: "" workload.openshift.io/allowed: "management" + labels: + openshift.io/run-level-: "" # remove the label on upgrades diff --git a/assets/controllers/kube-apiserver/defaultconfig.yaml b/assets/controllers/kube-apiserver/defaultconfig.yaml index b69a1ae3a1..5fe580be4f 100644 --- a/assets/controllers/kube-apiserver/defaultconfig.yaml +++ b/assets/controllers/kube-apiserver/defaultconfig.yaml @@ -14,21 +14,21 @@ admission: kind: PodSecurityConfiguration apiVersion: pod-security.admission.config.k8s.io/v1 defaults: - enforce: "restricted" - enforce-version: "latest" - audit: "restricted" - audit-version: "latest" - warn: "restricted" - warn-version: "latest" + enforce: "invalid-to-force-substitution" + enforce-version: "invalid-to-force-substitution" + audit: "invalid-to-force-substitution" + audit-version: "invalid-to-force-substitution" + warn: "invalid-to-force-substitution" + warn-version: "invalid-to-force-substitution" exemptions: usernames: - # The build controller creates pods that are likely to be privileged - # based on BuildConfig objects. Access to these build pods is however - # still limited by the SCC exec admission and so we can safely add the - # build-controller SA here. - # This configuration should never be exposed to cluster users as no - # such guarantees are made for any other OpenShift SA/user. - - system:serviceaccount:openshift-infra:build-controller + # The build controller creates pods that are likely to be privileged + # based on BuildConfig objects. Access to these build pods is however + # still limited by the SCC exec admission and so we can safely add the + # build-controller SA here. + # This configuration should never be exposed to cluster users as no + # such guarantees are made for any other OpenShift SA/user. + - system:serviceaccount:openshift-infra:build-controller apiServerArguments: allow-privileged: - "true" @@ -122,7 +122,7 @@ apiServerArguments: goaway-chance: - "0" http2-max-streams-per-connection: - - "2000" # recommended is 1000, but we need to mitigate https://github.com/kubernetes/kubernetes/issues/74412 + - "2000" # recommended is 1000, but we need to mitigate https://github.com/kubernetes/kubernetes/issues/74412 kubelet-certificate-authority: - /etc/kubernetes/static-pod-resources/configmaps/kubelet-serving-ca/ca-bundle.crt kubelet-client-certificate: @@ -167,7 +167,7 @@ apiServerArguments: shutdown-delay-duration: - 70s # give SDN some time to converge: 30s for iptable lock contention, 25s for the second try and some seconds for AWS to update ELBs shutdown-send-retry-after: - - "true" + - "true" storage-backend: - etcd3 storage-media-type: diff --git a/assets/controllers/kube-controller-manager/defaultconfig.yaml b/assets/controllers/kube-controller-manager/defaultconfig.yaml index 4cb47f0949..591926231f 100644 --- a/assets/controllers/kube-controller-manager/defaultconfig.yaml +++ b/assets/controllers/kube-controller-manager/defaultconfig.yaml @@ -2,39 +2,45 @@ apiVersion: kubecontrolplane.config.openshift.io/v1 kind: KubeControllerManagerConfig extendedArguments: enable-dynamic-provisioning: - - "true" + - "true" allocate-node-cidrs: - - "false" + - "false" use-service-account-credentials: - - "true" + - "true" + flex-volume-plugin-dir: + - "/etc/kubernetes/kubelet-plugins/volume/exec" # created by machine-config-operator, owned by storage team/hekumar@redhat.com + pv-recycler-pod-template-filepath-nfs: # owned by storage team/fbertina@redhat.com + - "/etc/kubernetes/static-pod-resources/configmaps/recycler-config/recycler-pod.yaml" + pv-recycler-pod-template-filepath-hostpath: # owned by storage team/fbertina@redhat.com + - "/etc/kubernetes/static-pod-resources/configmaps/recycler-config/recycler-pod.yaml" leader-elect: - - "true" + - "true" leader-elect-retry-period: - - "3s" + - "3s" leader-elect-resource-lock: - - "leases" + - "leases" leader-elect-renew-deadline: - - "12s" # Increase api call timeout value from default 5s to 6s, required in case primary dns server fail. + - "12s" # Increase api call timeout value from default 5s to 6s, required in case primary dns server fail. controllers: - - "*" - - "-ttl" # TODO: this is excluded in kube-core, but not in #21092 - - "-bootstrapsigner" - - "-tokencleaner" + - "*" + - "-ttl" # TODO: this is excluded in kube-core, but not in #21092 + - "-bootstrapsigner" + - "-tokencleaner" cluster-signing-duration: - - "720h" + - "720h" secure-port: - - "10257" + - "10257" cert-dir: - - "/var/run/kubernetes" + - "/var/run/kubernetes" root-ca-file: - - "/etc/kubernetes/static-pod-resources/configmaps/serviceaccount-ca/ca-bundle.crt" + - "/etc/kubernetes/static-pod-resources/configmaps/serviceaccount-ca/ca-bundle.crt" service-account-private-key-file: - - "/etc/kubernetes/static-pod-resources/secrets/service-account-private-key/service-account.key" + - "/etc/kubernetes/static-pod-resources/secrets/service-account-private-key/service-account.key" cluster-signing-cert-file: - - "/etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.crt" + - "/etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.crt" cluster-signing-key-file: - - "/etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.key" + - "/etc/kubernetes/static-pod-certs/secrets/csr-signer/tls.key" kube-api-qps: - - "150" # this is a historical values + - "150" # this is a historical values kube-api-burst: - - "300" # this is a historical values + - "300" # this is a historical values diff --git a/assets/core/kubelet.yaml b/assets/core/kubelet.yaml index b4d29296be..b1d7f695ec 100644 --- a/assets/core/kubelet.yaml +++ b/assets/core/kubelet.yaml @@ -1,37 +1,35 @@ -kind: KubeletConfiguration -apiVersion: kubelet.config.k8s.io/v1beta1 -authentication: - anonymous: - enabled: false - x509: - clientCAFile: "{{ .clientCAFile }}" -cgroupDriver: systemd -cgroupsPerQOS: true -clusterDNS: - - "{{ .clusterDNSIP }}" -clusterDomain: cluster.local -containerLogMaxSize: 50Mi -containerRuntimeEndpoint: unix:///var/run/crio/crio.sock -enforceNodeAllocatable: [] -failSwapOn: false -featureGates: - APIPriorityAndFairness: true - DownwardAPIHugePages: true - PodSecurity: true - RotateKubeletServerCertificate: false # TODO -kubeAPIBurst: 100 -kubeAPIQPS: 50 -maxPods: 250 -nodeStatusReportFrequency: 5m -rotateCertificates: false # TODO -serializeImagePulls: false -serverTLSBootstrap: false # TODO -tlsCertFile: "{{ .tlsCertFile }}" -tlsPrivateKeyFile: "{{ .tlsPrivateKeyFile }}" -volumePluginDir: "{{ .volumePluginDir }}" -{{- if .resolvConf }} -resolvConf: "{{ .resolvConf }}" -{{- end }} -{{ if .userProvidedConfig }} -{{- .userProvidedConfig -}} -{{ end }} +mode: 0644 +path: "/etc/kubernetes/kubelet.conf" +contents: + inline: | + kind: KubeletConfiguration + apiVersion: kubelet.config.k8s.io/v1beta1 + authentication: + x509: + clientCAFile: /etc/kubernetes/kubelet-ca.crt + anonymous: + enabled: false + cgroupDriver: systemd + cgroupRoot: / + clusterDNS: + - {{.ClusterDNSIP}} + clusterDomain: cluster.local + containerLogMaxSize: 50Mi + enableSystemLogQuery: true + maxPods: 250 + kubeAPIQPS: 50 + kubeAPIBurst: 100 + podPidsLimit: 4096 + protectKernelDefaults: true + rotateCertificates: true + serializeImagePulls: false + staticPodPath: /etc/kubernetes/manifests + systemCgroups: /system.slice + nodeStatusUpdateFrequency: 10s + nodeStatusReportFrequency: 5m + serverTLSBootstrap: true + tlsMinVersion: {{.TLSMinVersion}} + tlsCipherSuites: + {{- range .TLSCipherSuites }} + - {{ . }} + {{- end }} diff --git a/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml b/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml deleted file mode 100644 index bd48ff0f64..0000000000 --- a/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml +++ /dev/null @@ -1,282 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/470 - api.openshift.io/merged-by-featuregates: "true" - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/bootstrap-required: "true" - name: securitycontextconstraints.security.openshift.io -spec: - group: security.openshift.io - names: - kind: SecurityContextConstraints - listKind: SecurityContextConstraintsList - plural: securitycontextconstraints - singular: securitycontextconstraints - shortNames: - - scc - scope: Cluster - versions: - - additionalPrinterColumns: - - description: Determines if a container can request to be run as privileged - jsonPath: .allowPrivilegedContainer - name: Priv - type: string - - description: A list of capabilities that can be requested to add to the container - jsonPath: .allowedCapabilities - name: Caps - type: string - - description: Strategy that will dictate what labels will be set in the SecurityContext - jsonPath: .seLinuxContext.type - name: SELinux - type: string - - description: Strategy that will dictate what RunAsUser is used in the SecurityContext - jsonPath: .runAsUser.type - name: RunAsUser - type: string - - description: Strategy that will dictate what fs group is used by the SecurityContext - jsonPath: .fsGroup.type - name: FSGroup - type: string - - description: Strategy that will dictate what supplemental groups are used by the SecurityContext - jsonPath: .supplementalGroups.type - name: SupGroup - type: string - - description: Sort order of SCCs - jsonPath: .priority - name: Priority - type: string - - description: Force containers to run with a read only root file system - jsonPath: .readOnlyRootFilesystem - name: ReadOnlyRootFS - type: string - - description: White list of allowed volume plugins - jsonPath: .volumes - name: Volumes - type: string - name: v1 - schema: - openAPIV3Schema: - description: "SecurityContextConstraints governs the ability to make requests that affect the SecurityContext that will be applied to a container. For historical reasons SCC was exposed under the core Kubernetes API group. That exposure is deprecated and will be removed in a future release - users should instead use the security.openshift.io group to manage SecurityContextConstraints. \n Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer)." - properties: - allowHostDirVolumePlugin: - description: AllowHostDirVolumePlugin determines if the policy allow containers to use the HostDir volume plugin - type: boolean - allowHostIPC: - description: AllowHostIPC determines if the policy allows host ipc in the containers. - type: boolean - allowHostNetwork: - description: AllowHostNetwork determines if the policy allows the use of HostNetwork in the pod spec. - type: boolean - allowHostPID: - description: AllowHostPID determines if the policy allows host pid in the containers. - type: boolean - allowHostPorts: - description: AllowHostPorts determines if the policy allows host ports in the containers. - type: boolean - allowPrivilegeEscalation: - description: AllowPrivilegeEscalation determines if a pod can request to allow privilege escalation. If unspecified, defaults to true. - nullable: true - type: boolean - allowPrivilegedContainer: - description: AllowPrivilegedContainer determines if a container can request to be run as privileged. - type: boolean - allowedCapabilities: - description: AllowedCapabilities is a list of capabilities that can be requested to add to the container. Capabilities in this field maybe added at the pod author's discretion. You must not list a capability in both AllowedCapabilities and RequiredDropCapabilities. To allow all capabilities you may use '*'. - items: - description: Capability represent POSIX capabilities type - type: string - nullable: true - type: array - allowedFlexVolumes: - description: AllowedFlexVolumes is a whitelist of allowed Flexvolumes. Empty or nil indicates that all Flexvolumes may be used. This parameter is effective only when the usage of the Flexvolumes is allowed in the "Volumes" field. - items: - description: AllowedFlexVolume represents a single Flexvolume that is allowed to be used. - properties: - driver: - description: Driver is the name of the Flexvolume driver. - type: string - required: - - driver - type: object - nullable: true - type: array - allowedUnsafeSysctls: - description: "AllowedUnsafeSysctls is a list of explicitly allowed unsafe sysctls, defaults to none. Each entry is either a plain sysctl name or ends in \"*\" in which case it is considered as a prefix of allowed sysctls. Single * means all unsafe sysctls are allowed. Kubelet has to whitelist all allowed unsafe sysctls explicitly to avoid rejection. \n Examples: e.g. \"foo/*\" allows \"foo/bar\", \"foo/baz\", etc. e.g. \"foo.*\" allows \"foo.bar\", \"foo.baz\", etc." - items: - type: string - nullable: true - type: array - apiVersion: - description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - defaultAddCapabilities: - description: DefaultAddCapabilities is the default set of capabilities that will be added to the container unless the pod spec specifically drops the capability. You may not list a capabiility in both DefaultAddCapabilities and RequiredDropCapabilities. - items: - description: Capability represent POSIX capabilities type - type: string - nullable: true - type: array - defaultAllowPrivilegeEscalation: - description: DefaultAllowPrivilegeEscalation controls the default setting for whether a process can gain more privileges than its parent process. - nullable: true - type: boolean - forbiddenSysctls: - description: "ForbiddenSysctls is a list of explicitly forbidden sysctls, defaults to none. Each entry is either a plain sysctl name or ends in \"*\" in which case it is considered as a prefix of forbidden sysctls. Single * means all sysctls are forbidden. \n Examples: e.g. \"foo/*\" forbids \"foo/bar\", \"foo/baz\", etc. e.g. \"foo.*\" forbids \"foo.bar\", \"foo.baz\", etc." - items: - type: string - nullable: true - type: array - fsGroup: - description: FSGroup is the strategy that will dictate what fs group is used by the SecurityContext. - nullable: true - properties: - ranges: - description: Ranges are the allowed ranges of fs groups. If you would like to force a single fs group then supply a single range with the same start and end. - items: - description: 'IDRange provides a min/max of an allowed range of IDs. TODO: this could be reused for UIDs.' - properties: - max: - description: Max is the end of the range, inclusive. - format: int64 - type: integer - min: - description: Min is the start of the range, inclusive. - format: int64 - type: integer - type: object - type: array - type: - description: Type is the strategy that will dictate what FSGroup is used in the SecurityContext. - type: string - type: object - groups: - description: The groups that have permission to use this security context constraints - items: - type: string - nullable: true - type: array - kind: - description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - priority: - description: Priority influences the sort order of SCCs when evaluating which SCCs to try first for a given pod request based on access in the Users and Groups fields. The higher the int, the higher priority. An unset value is considered a 0 priority. If scores for multiple SCCs are equal they will be sorted from most restrictive to least restrictive. If both priorities and restrictions are equal the SCCs will be sorted by name. - format: int32 - nullable: true - type: integer - readOnlyRootFilesystem: - description: ReadOnlyRootFilesystem when set to true will force containers to run with a read only root file system. If the container specifically requests to run with a non-read only root file system the SCC should deny the pod. If set to false the container may run with a read only root file system if it wishes but it will not be forced to. - type: boolean - requiredDropCapabilities: - description: RequiredDropCapabilities are the capabilities that will be dropped from the container. These are required to be dropped and cannot be added. - items: - description: Capability represent POSIX capabilities type - type: string - nullable: true - type: array - runAsUser: - description: RunAsUser is the strategy that will dictate what RunAsUser is used in the SecurityContext. - nullable: true - properties: - type: - description: Type is the strategy that will dictate what RunAsUser is used in the SecurityContext. - type: string - uid: - description: UID is the user id that containers must run as. Required for the MustRunAs strategy if not using namespace/service account allocated uids. - format: int64 - type: integer - uidRangeMax: - description: UIDRangeMax defines the max value for a strategy that allocates by range. - format: int64 - type: integer - uidRangeMin: - description: UIDRangeMin defines the min value for a strategy that allocates by range. - format: int64 - type: integer - type: object - seLinuxContext: - description: SELinuxContext is the strategy that will dictate what labels will be set in the SecurityContext. - nullable: true - properties: - seLinuxOptions: - description: seLinuxOptions required to run as; required for MustRunAs - properties: - level: - description: Level is SELinux level label that applies to the container. - type: string - role: - description: Role is a SELinux role label that applies to the container. - type: string - type: - description: Type is a SELinux type label that applies to the container. - type: string - user: - description: User is a SELinux user label that applies to the container. - type: string - type: object - type: - description: Type is the strategy that will dictate what SELinux context is used in the SecurityContext. - type: string - type: object - seccompProfiles: - description: "SeccompProfiles lists the allowed profiles that may be set for the pod or container's seccomp annotations. An unset (nil) or empty value means that no profiles may be specifid by the pod or container.\tThe wildcard '*' may be used to allow all profiles. When used to generate a value for a pod the first non-wildcard profile will be used as the default." - items: - type: string - nullable: true - type: array - supplementalGroups: - description: SupplementalGroups is the strategy that will dictate what supplemental groups are used by the SecurityContext. - nullable: true - properties: - ranges: - description: Ranges are the allowed ranges of supplemental groups. If you would like to force a single supplemental group then supply a single range with the same start and end. - items: - description: 'IDRange provides a min/max of an allowed range of IDs. TODO: this could be reused for UIDs.' - properties: - max: - description: Max is the end of the range, inclusive. - format: int64 - type: integer - min: - description: Min is the start of the range, inclusive. - format: int64 - type: integer - type: object - type: array - type: - description: Type is the strategy that will dictate what supplemental groups is used in the SecurityContext. - type: string - type: object - users: - description: The users who have permissions to use this security context constraints - items: - type: string - nullable: true - type: array - volumes: - description: Volumes is a white list of allowed volume plugins. FSType corresponds directly with the field names of a VolumeSource (azureFile, configMap, emptyDir). To allow all volumes you may use "*". To allow no volumes, set to ["none"]. - items: - description: FS Type gives strong typing to different file systems that are used by volumes. - type: string - nullable: true - type: array - required: - - allowHostDirVolumePlugin - - allowHostIPC - - allowHostNetwork - - allowHostPID - - allowHostPorts - - allowPrivilegedContainer - - allowedCapabilities - - defaultAddCapabilities - - priority - - readOnlyRootFilesystem - - requiredDropCapabilities - - volumes - type: object - served: true - storage: true diff --git a/assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml b/assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml deleted file mode 100644 index dd8ecd584a..0000000000 --- a/assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/751 - api.openshift.io/merged-by-featuregates: "true" - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/bootstrap-required: "true" - name: rangeallocations.security.internal.openshift.io -spec: - group: security.internal.openshift.io - names: - kind: RangeAllocation - listKind: RangeAllocationList - plural: rangeallocations - singular: rangeallocation - scope: Cluster - versions: - - name: v1 - schema: - openAPIV3Schema: - description: "RangeAllocation is used so we can easily expose a RangeAllocation - typed for security group This is an internal API, not intended for external - consumption. \n Compatibility level 1: Stable within a major release for - a minimum of 12 months or 3 minor releases (whichever is longer)." - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - data: - description: data is a byte array representing the serialized state of - a range allocation. It is a bitmap with each bit set to one to represent - a range is taken. - format: "" - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - range: - description: range is a string representing a unique label for a range - of uids, "1000000000-2000000000/10000". - type: string - type: object - served: true - storage: true diff --git a/assets/crd/route.crd.yaml b/assets/crd/route.crd.yaml deleted file mode 100644 index 598df2e65b..0000000000 --- a/assets/crd/route.crd.yaml +++ /dev/null @@ -1,666 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - api-approved.openshift.io: https://github.com/openshift/api/pull/1228 - api.openshift.io/merged-by-featuregates: "true" - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" - release.openshift.io/feature-set: Default - name: routes.route.openshift.io -spec: - group: route.openshift.io - names: - kind: Route - listKind: RouteList - plural: routes - singular: route - scope: Namespaced - versions: - - additionalPrinterColumns: - - jsonPath: .status.ingress[0].host - name: Host - type: string - - jsonPath: .status.ingress[0].conditions[?(@.type=="Admitted")].status - name: Admitted - type: string - - jsonPath: .spec.to.name - name: Service - type: string - - jsonPath: .spec.tls.type - name: TLS - type: string - name: v1 - schema: - openAPIV3Schema: - description: "A route allows developers to expose services through an HTTP(S) - aware load balancing and proxy layer via a public DNS entry. The route may - further specify TLS options and a certificate, or specify a public CNAME - that the router should also accept for HTTP and HTTPS traffic. An administrator - typically configures their router to be visible outside the cluster firewall, - and may also add additional security, caching, or traffic controls on the - service content. Routers usually talk directly to the service endpoints. - \n Once a route is created, the `host` field may not be changed. Generally, - routers use the oldest route with a given host when resolving conflicts. - \n Routers are subject to additional customization and may support additional - controls via the annotations field. \n Because administrators may configure - multiple routers, the route status field is used to return information to - clients about the names and states of the route under each router. If a - client chooses a duplicate name, for instance, the route status conditions - are used to indicate the route cannot be chosen. \n To enable HTTP/2 ALPN - on a route it requires a custom (non-wildcard) certificate. This prevents - connection coalescing by clients, notably web browsers. We do not support - HTTP/2 ALPN on routes that use the default certificate because of the risk - of connection re-use/coalescing. Routes that do not have their own custom - certificate will not be HTTP/2 ALPN-enabled on either the frontend or the - backend. \n Compatibility level 1: Stable within a major release for a minimum - of 12 months or 3 minor releases (whichever is longer)." - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - allOf: - - anyOf: - - properties: - path: - maxLength: 0 - - properties: - tls: - enum: - - null - - not: - properties: - tls: - properties: - termination: - enum: - - passthrough - - anyOf: - - not: - properties: - host: - maxLength: 0 - - not: - properties: - wildcardPolicy: - enum: - - Subdomain - description: spec is the desired state of the route - properties: - alternateBackends: - description: alternateBackends allows up to 3 additional backends - to be assigned to the route. Only the Service kind is allowed, and - it will be defaulted to Service. Use the weight field in RouteTargetReference - object to specify relative preference. - items: - description: RouteTargetReference specifies the target that resolve - into endpoints. Only the 'Service' kind is allowed. Use 'weight' - field to emphasize one over others. - properties: - kind: - default: Service - description: The kind of target that the route is referring - to. Currently, only 'Service' is allowed - enum: - - Service - - "" - type: string - name: - description: name of the service/target that is being referred - to. e.g. name of the service - minLength: 1 - type: string - weight: - default: 100 - description: weight as an integer between 0 and 256, default - 100, that specifies the target's relative weight against other - target reference objects. 0 suppresses requests to this backend. - format: int32 - maximum: 256 - minimum: 0 - type: integer - required: - - kind - - name - type: object - maxItems: 3 - type: array - host: - description: host is an alias/DNS that points to the service. Optional. - If not specified a route name will typically be automatically chosen. - Must follow DNS952 subdomain conventions. - maxLength: 253 - pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$ - type: string - httpHeaders: - description: httpHeaders defines policy for HTTP headers. - properties: - actions: - description: 'actions specifies options for modifying headers - and their values. Note that this option only applies to cleartext - HTTP connections and to secure HTTP connections for which the - ingress controller terminates encryption (that is, edge-terminated - or reencrypt connections). Headers cannot be modified for TLS - passthrough connections. Setting the HSTS (`Strict-Transport-Security`) - header is not supported via actions. `Strict-Transport-Security` - may only be configured using the "haproxy.router.openshift.io/hsts_header" - route annotation, and only in accordance with the policy specified - in Ingress.Spec.RequiredHSTSPolicies. In case of HTTP request - headers, the actions specified in spec.httpHeaders.actions on - the Route will be executed after the actions specified in the - IngressController''s spec.httpHeaders.actions field. In case - of HTTP response headers, the actions specified in spec.httpHeaders.actions - on the IngressController will be executed after the actions - specified in the Route''s spec.httpHeaders.actions field. The - headers set via this API will not appear in access logs. Any - actions defined here are applied after any actions related to - the following other fields: cache-control, spec.clientTLS, spec.httpHeaders.forwardedHeaderPolicy, - spec.httpHeaders.uniqueId, and spec.httpHeaders.headerNameCaseAdjustments. - The following header names are reserved and may not be modified - via this API: Strict-Transport-Security, Proxy, Cookie, Set-Cookie. - Note that the total size of all net added headers *after* interpolating - dynamic values must not exceed the value of spec.tuningOptions.headerBufferMaxRewriteBytes - on the IngressController. Please refer to the documentation - for that API field for more details.' - properties: - request: - description: 'request is a list of HTTP request headers to - modify. Currently, actions may define to either `Set` or - `Delete` headers values. Actions defined here will modify - the request headers of all requests made through a route. - These actions are applied to a specific Route defined within - a cluster i.e. connections made through a route. Currently, - actions may define to either `Set` or `Delete` headers values. - Route actions will be executed after IngressController actions - for request headers. Actions are applied in sequence as - defined in this list. A maximum of 20 request header actions - may be configured. You can use this field to specify HTTP - request headers that should be set or deleted when forwarding - connections from the client to your application. Sample - fetchers allowed are "req.hdr" and "ssl_c_der". Converters - allowed are "lower" and "base64". Example header values: - "%[req.hdr(X-target),lower]", "%{+Q}[ssl_c_der,base64]". - Any request header configuration applied directly via a - Route resource using this API will override header configuration - for a header of the same name applied via spec.httpHeaders.actions - on the IngressController or route annotation. Note: This - field cannot be used if your route uses TLS passthrough.' - items: - description: RouteHTTPHeader specifies configuration for - setting or deleting an HTTP header. - properties: - action: - description: action specifies actions to perform on - headers, such as setting or deleting headers. - properties: - set: - description: 'set defines the HTTP header that should - be set: added if it doesn''t exist or replaced - if it does. This field is required when type is - Set and forbidden otherwise.' - properties: - value: - description: value specifies a header value. - Dynamic values can be added. The value will - be interpreted as an HAProxy format string - as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 - and may use HAProxy's %[] syntax and otherwise - must be a valid HTTP header value as defined - in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. - The value of this field must be no more than - 16384 characters in length. Note that the - total size of all net added headers *after* - interpolating dynamic values must not exceed - the value of spec.tuningOptions.headerBufferMaxRewriteBytes - on the IngressController. - maxLength: 16384 - minLength: 1 - type: string - required: - - value - type: object - type: - description: type defines the type of the action - to be applied on the header. Possible values are - Set or Delete. Set allows you to set HTTP request - and response headers. Delete allows you to delete - HTTP request and response headers. - enum: - - Set - - Delete - type: string - required: - - type - type: object - x-kubernetes-validations: - - message: set is required when type is Set, and forbidden - otherwise - rule: 'has(self.type) && self.type == ''Set'' ? has(self.set) - : !has(self.set)' - name: - description: 'name specifies the name of a header on - which to perform an action. Its value must be a valid - HTTP header name as defined in RFC 2616 section 4.2. - The name must consist only of alphanumeric and the - following special characters, "-!#$%&''*+.^_`". The - following header names are reserved and may not be - modified via this API: Strict-Transport-Security, - Proxy, Cookie, Set-Cookie. It must be no more than - 255 characters in length. Header name must be unique.' - maxLength: 255 - minLength: 1 - pattern: ^[-!#$%&'*+.0-9A-Z^_`a-z|~]+$ - type: string - x-kubernetes-validations: - - message: strict-transport-security header may not - be modified via header actions - rule: self.lowerAscii() != 'strict-transport-security' - - message: proxy header may not be modified via header - actions - rule: self.lowerAscii() != 'proxy' - - message: cookie header may not be modified via header - actions - rule: self.lowerAscii() != 'cookie' - - message: set-cookie header may not be modified via - header actions - rule: self.lowerAscii() != 'set-cookie' - required: - - action - - name - type: object - maxItems: 20 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map - x-kubernetes-validations: - - message: Either the header value provided is not in correct - format or the sample fetcher/converter specified is not - allowed. The dynamic header value will be interpreted - as an HAProxy format string as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 - and may use HAProxy's %[] syntax and otherwise must be - a valid HTTP header value as defined in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. - Sample fetchers allowed are req.hdr, ssl_c_der. Converters - allowed are lower, base64. - rule: self.all(key, key.action.type == "Delete" || (has(key.action.set) - && key.action.set.value.matches('^(?:%(?:%|(?:\\{[-+]?[QXE](?:,[-+]?[QXE])*\\})?\\[(?:req\\.hdr\\([0-9A-Za-z-]+\\)|ssl_c_der)(?:,(?:lower|base64))*\\])|[^%[:cntrl:]])+$'))) - response: - description: 'response is a list of HTTP response headers - to modify. Currently, actions may define to either `Set` - or `Delete` headers values. Actions defined here will modify - the response headers of all requests made through a route. - These actions are applied to a specific Route defined within - a cluster i.e. connections made through a route. Route actions - will be executed before IngressController actions for response - headers. Actions are applied in sequence as defined in this - list. A maximum of 20 response header actions may be configured. - You can use this field to specify HTTP response headers - that should be set or deleted when forwarding responses - from your application to the client. Sample fetchers allowed - are "res.hdr" and "ssl_c_der". Converters allowed are "lower" - and "base64". Example header values: "%[res.hdr(X-target),lower]", - "%{+Q}[ssl_c_der,base64]". Note: This field cannot be used - if your route uses TLS passthrough.' - items: - description: RouteHTTPHeader specifies configuration for - setting or deleting an HTTP header. - properties: - action: - description: action specifies actions to perform on - headers, such as setting or deleting headers. - properties: - set: - description: 'set defines the HTTP header that should - be set: added if it doesn''t exist or replaced - if it does. This field is required when type is - Set and forbidden otherwise.' - properties: - value: - description: value specifies a header value. - Dynamic values can be added. The value will - be interpreted as an HAProxy format string - as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 - and may use HAProxy's %[] syntax and otherwise - must be a valid HTTP header value as defined - in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. - The value of this field must be no more than - 16384 characters in length. Note that the - total size of all net added headers *after* - interpolating dynamic values must not exceed - the value of spec.tuningOptions.headerBufferMaxRewriteBytes - on the IngressController. - maxLength: 16384 - minLength: 1 - type: string - required: - - value - type: object - type: - description: type defines the type of the action - to be applied on the header. Possible values are - Set or Delete. Set allows you to set HTTP request - and response headers. Delete allows you to delete - HTTP request and response headers. - enum: - - Set - - Delete - type: string - required: - - type - type: object - x-kubernetes-validations: - - message: set is required when type is Set, and forbidden - otherwise - rule: 'has(self.type) && self.type == ''Set'' ? has(self.set) - : !has(self.set)' - name: - description: 'name specifies the name of a header on - which to perform an action. Its value must be a valid - HTTP header name as defined in RFC 2616 section 4.2. - The name must consist only of alphanumeric and the - following special characters, "-!#$%&''*+.^_`". The - following header names are reserved and may not be - modified via this API: Strict-Transport-Security, - Proxy, Cookie, Set-Cookie. It must be no more than - 255 characters in length. Header name must be unique.' - maxLength: 255 - minLength: 1 - pattern: ^[-!#$%&'*+.0-9A-Z^_`a-z|~]+$ - type: string - x-kubernetes-validations: - - message: strict-transport-security header may not - be modified via header actions - rule: self.lowerAscii() != 'strict-transport-security' - - message: proxy header may not be modified via header - actions - rule: self.lowerAscii() != 'proxy' - - message: cookie header may not be modified via header - actions - rule: self.lowerAscii() != 'cookie' - - message: set-cookie header may not be modified via - header actions - rule: self.lowerAscii() != 'set-cookie' - required: - - action - - name - type: object - maxItems: 20 - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map - x-kubernetes-validations: - - message: Either the header value provided is not in correct - format or the sample fetcher/converter specified is not - allowed. The dynamic header value will be interpreted - as an HAProxy format string as defined in http://cbonte.github.io/haproxy-dconv/2.6/configuration.html#8.2.6 - and may use HAProxy's %[] syntax and otherwise must be - a valid HTTP header value as defined in https://datatracker.ietf.org/doc/html/rfc7230#section-3.2. - Sample fetchers allowed are res.hdr, ssl_c_der. Converters - allowed are lower, base64. - rule: self.all(key, key.action.type == "Delete" || (has(key.action.set) - && key.action.set.value.matches('^(?:%(?:%|(?:\\{[-+]?[QXE](?:,[-+]?[QXE])*\\})?\\[(?:res\\.hdr\\([0-9A-Za-z-]+\\)|ssl_c_der)(?:,(?:lower|base64))*\\])|[^%[:cntrl:]])+$'))) - type: object - type: object - path: - description: path that the router watches for, to route traffic for - to the service. Optional - pattern: ^/ - type: string - port: - description: If specified, the port to be used by the router. Most - routers will use all endpoints exposed by the service by default - - set this value to instruct routers which port to use. - properties: - targetPort: - allOf: - - not: - enum: - - 0 - - not: - enum: - - "" - anyOf: null - description: The target port on pods selected by the service this - route points to. If this is a string, it will be looked up as - a named port in the target endpoints port list. Required - x-kubernetes-int-or-string: true - required: - - targetPort - type: object - subdomain: - description: "subdomain is a DNS subdomain that is requested within - the ingress controller's domain (as a subdomain). If host is set - this field is ignored. An ingress controller may choose to ignore - this suggested name, in which case the controller will report the - assigned name in the status.ingress array or refuse to admit the - route. If this value is set and the server does not support this - field host will be populated automatically. Otherwise host is left - empty. The field may have multiple parts separated by a dot, but - not all ingress controllers may honor the request. This field may - not be changed after creation except by a user with the update routes/custom-host - permission. \n Example: subdomain `frontend` automatically receives - the router subdomain `apps.mycluster.com` to have a full hostname - `frontend.apps.mycluster.com`." - maxLength: 253 - pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$ - type: string - tls: - allOf: - - anyOf: - - properties: - caCertificate: - maxLength: 0 - certificate: - maxLength: 0 - destinationCACertificate: - maxLength: 0 - key: - maxLength: 0 - - not: - properties: - termination: - enum: - - passthrough - - anyOf: - - properties: - destinationCACertificate: - maxLength: 0 - - not: - properties: - termination: - enum: - - edge - description: The tls field provides the ability to configure certificates - and termination for the route. - properties: - caCertificate: - description: caCertificate provides the cert authority certificate - contents - type: string - certificate: - description: certificate provides certificate contents. This should - be a single serving certificate, not a certificate chain. Do - not include a CA certificate. - type: string - destinationCACertificate: - description: destinationCACertificate provides the contents of - the ca certificate of the final destination. When using reencrypt - termination this file should be provided in order to have routers - use it for health checks on the secure connection. If this field - is not specified, the router may provide its own destination - CA and perform hostname validation using the short service name - (service.namespace.svc), which allows infrastructure generated - certificates to automatically verify. - type: string - insecureEdgeTerminationPolicy: - description: "insecureEdgeTerminationPolicy indicates the desired - behavior for insecure connections to a route. While each router - may make its own decisions on which ports to expose, this is - normally port 80. \n If a route does not specify insecureEdgeTerminationPolicy, - then the default behavior is \"None\". \n * Allow - traffic - is sent to the server on the insecure port (edge/reencrypt terminations - only). \n * None - no traffic is allowed on the insecure port - (default). \n * Redirect - clients are redirected to the secure - port." - enum: - - Allow - - None - - Redirect - - "" - type: string - key: - description: key provides key file contents - type: string - termination: - description: "termination indicates termination type. \n * edge - - TLS termination is done by the router and http is used to - communicate with the backend (default) * passthrough - Traffic - is sent straight to the destination without the router providing - TLS termination * reencrypt - TLS termination is done by the - router and https is used to communicate with the backend \n - Note: passthrough termination is incompatible with httpHeader - actions" - enum: - - edge - - reencrypt - - passthrough - type: string - required: - - termination - type: object - x-kubernetes-validations: - - message: 'cannot have both spec.tls.termination: passthrough and - spec.tls.insecureEdgeTerminationPolicy: Allow' - rule: 'has(self.termination) && has(self.insecureEdgeTerminationPolicy) - ? !((self.termination==''passthrough'') && (self.insecureEdgeTerminationPolicy==''Allow'')) - : true' - to: - description: to is an object the route should use as the primary backend. - Only the Service kind is allowed, and it will be defaulted to Service. - If the weight field (0-256 default 100) is set to zero, no traffic - will be sent to this backend. - properties: - kind: - default: Service - description: The kind of target that the route is referring to. - Currently, only 'Service' is allowed - enum: - - Service - - "" - type: string - name: - description: name of the service/target that is being referred - to. e.g. name of the service - minLength: 1 - type: string - weight: - default: 100 - description: weight as an integer between 0 and 256, default 100, - that specifies the target's relative weight against other target - reference objects. 0 suppresses requests to this backend. - format: int32 - maximum: 256 - minimum: 0 - type: integer - required: - - kind - - name - type: object - wildcardPolicy: - default: None - description: Wildcard policy if any for the route. Currently only - 'Subdomain' or 'None' is allowed. - enum: - - None - - Subdomain - - "" - type: string - required: - - to - type: object - x-kubernetes-validations: - - message: header actions are not permitted when tls termination is passthrough. - rule: '!has(self.tls) || self.tls.termination != ''passthrough'' || - !has(self.httpHeaders)' - status: - description: status is the current state of the route - properties: - ingress: - description: ingress describes the places where the route may be exposed. - The list of ingress points may contain duplicate Host or RouterName - values. Routes are considered live once they are `Ready` - items: - description: RouteIngress holds information about the places where - a route is exposed. - properties: - conditions: - description: Conditions is the state of the route, may be empty. - items: - description: RouteIngressCondition contains details for the - current condition of this route on a particular router. - properties: - lastTransitionTime: - description: RFC 3339 date and time when this condition - last transitioned - format: date-time - type: string - message: - description: Human readable message indicating details - about last transition. - type: string - reason: - description: (brief) reason for the condition's last transition, - and is usually a machine and human readable constant - type: string - status: - description: Status is the status of the condition. Can - be True, False, Unknown. - type: string - type: - description: Type is the type of the condition. Currently - only Admitted or UnservableInFutureVersions. - type: string - required: - - status - - type - type: object - type: array - host: - description: Host is the host string under which the route is - exposed; this value is required - type: string - routerCanonicalHostname: - description: CanonicalHostname is the external host name for - the router that can be used as a CNAME for the host requested - for this route. This value is optional and may not be set - in all cases. - type: string - routerName: - description: Name is a name chosen by the router to identify - itself; this value is required - type: string - wildcardPolicy: - description: Wildcard policy is the wildcard policy that was - allowed where this route is exposed. - type: string - type: object - type: array - type: object - required: - - spec - type: object - served: true - storage: true - subresources: - status: {} diff --git a/assets/crd/storage_version_migration.crd.yaml b/assets/crd/storage_version_migration.crd.yaml deleted file mode 100644 index eac880a8d7..0000000000 --- a/assets/crd/storage_version_migration.crd.yaml +++ /dev/null @@ -1,100 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: storageversionmigrations.migration.k8s.io - annotations: - "api-approved.kubernetes.io": "https://github.com/kubernetes/community/pull/2524" - include.release.openshift.io/hypershift: "true" - include.release.openshift.io/ibm-cloud-managed: "true" - include.release.openshift.io/self-managed-high-availability: "true" -spec: - group: migration.k8s.io - names: - kind: StorageVersionMigration - listKind: StorageVersionMigrationList - plural: storageversionmigrations - singular: storageversionmigration - scope: Cluster - preserveUnknownFields: false - versions: - - name: v1alpha1 - served: true - storage: true - subresources: - status: {} - schema: - openAPIV3Schema: - description: StorageVersionMigration represents a migration of stored data - to the latest storage version. - type: object - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: Specification of the migration. - type: object - required: - - resource - properties: - continueToken: - description: The token used in the list options to get the next chunk - of objects to migrate. When the .status.conditions indicates the - migration is "Running", users can use this token to check the progress - of the migration. - type: string - resource: - description: The resource that is being migrated. The migrator sends - requests to the endpoint serving the resource. Immutable. - type: object - properties: - group: - description: The name of the group. - type: string - resource: - description: The name of the resource. - type: string - version: - description: The name of the version. - type: string - status: - description: Status of the migration. - type: object - properties: - conditions: - description: The latest available observations of the migration's - current state. - type: array - items: - description: Describes the state of a migration at a certain point. - type: object - required: - - status - - type - properties: - lastUpdateTime: - description: The last time this condition was updated. - type: string - format: date-time - message: - description: A human readable message indicating details about - the transition. - type: string - reason: - description: The reason for the condition's last transition. - type: string - status: - description: Status of the condition, one of True, False, Unknown. - type: string - type: - description: Type of the condition. - type: string diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f94dd9d963..7180e1abaa 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,18 +1,18 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-08-12-210753" + "base": "4.18.0-0.nightly-arm64-2024-08-27-181947" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f5ceadbb0cc38973a0738da567ad92b4bfe002440830870d0391c6e58ec2203", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14b7112ec12e8b854354426c73aca7cd61d34a278964c29cb60f500a5bb396f2", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed1043d4b938921389829a042a32246ea1699cebf14ba6703d664ca3fc87723", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85b564315ac337db27be4d97a3680c09d895c816210d13401a1c35dd1677151d", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:582efda70ef19ba38bebd32b5860021015adc23a51ad6b910a22d1680cdad846", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a28b25b4745fb4ce326dc8c68c63604606c7398b1c5ebf5e92cce5d550b13ce4", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce02d02845bb663ee4551097b593540575ff9e03f4e1cfe670b291e7f981feb2", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff448737adadea489e77f7ebe8a8a615dda5d1a84a5ca9087158c8482f83f4a7", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e99ccba70c29daca7823898b14c87373b55be8f7ac168025beaa9a2c3c57a540", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87a5167d4b1f6efaccebcf009057a80638269b25b86e19ed63fe060175749ae2", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3631b25990b2e14b992cb82eda4624f22b53c9f8861127f6ec5fadad69d1963", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65a6c6ceec0ccc594c8066a3251faef15461fe2dbb0f989481a1cecd0476d9e6", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fce06a36f46ccba434777775e9885838d339a22979d5f0024f2ef1d924ae6bac", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d18a54770d66a28808c2ccc4a7fa4de6a4900906fa53bcfce9132f37aea99f59", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69d8921a0b657cb3e5c675b1d077c99ea4bd4105402a6fcd4bf35ecae690b6b4" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8d3470d2c238e069f849703c9230678fe4fa70c8a6fe0f428a047e2af8fade5", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e222f99c345f536fcc8a61955e0445266d01e9aa7ee85ba1932925449c938361" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 5b78b18fe8..980cff001e 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,18 +1,18 @@ { "release": { - "base": "4.17.0-0.nightly-2024-08-09-031511" + "base": "4.18.0-0.nightly-2024-08-27-195306" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30a1a89811d79d955901eaa45d02a62d6ce234491256e6a6e229af9c9935f149", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e06839473a75025488f6118a6928bd6e467cbe3dea9ef46f28972ca55219bcac", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5fe1f43bb9876dbb7b8927913e8d8e75e7691d0b3d09b3f112edf9c572a92e8a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a002dfe00f1b8d15ed4487335c7789550363c85cdd612c52f3e8b11028309d5", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b2f10722231e7591443711c25aff801d0866b37cd82e69b6d966ff7e50c36c4", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0566b01d42c9761bd3129a346e44ada6807eaf592d47a4e85c30a271ec2a3b1", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:198b971f96aac6a4123d4ba6c51833e3e04da753cefc91197860ae8871d29cee", "openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f50c13dd28d1fb27ca443ddf611c040fea65bbe3e88f4d1bf6cd3da1117485e", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13e890f8679773305aa8e09af3e0c2f56f51a350e43fc8825720e65b09a3dc69", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b202402fad083c9d07eb66f8c9e65bc525dad49eb533233b0a625359e5c41ff", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4bf2fea1d314c72dcc272ccecadcd84fd288bc11a004761945249b705393439", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8d9a3bedd4fd3e7becb7a814d0b9fcc487c57355712897bd337528cce05da80", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6f0ec531a112300d1203792a769e626bcf525c0507845f8b309467e6d828c1d", "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:d236a30c0793850c3453163cd0160227fb0beb81863d17ff1d9ee1439c8798b3", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0032f18b30fc97d6c40693c5ac4e4a229cd7e9133a99816cbf77002e3f66b2f7", - "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef7b4cacf557c2027b7109fe7933d327cd3efb52b595401885d5b85a812705be" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd58aac289b3c3809d0e4aea03e16731973aab17e3f2650ce6eaa73794fdc454", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5c07d182634915176cc416479189129b192f4c6da2c09598c929bb230ac12f2" } } diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..5f96a08568 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,855 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-08-27-181947 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-08-27-181947 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/api/.git/ +HEAD is now at 2b42490 Merge pull request #1939 from haircommander/add-allow-host-users + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/ +HEAD is now at ffba005 Merge pull request #214 from davidvossel/hcp-tolerations + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 3a72709 Merge pull request #420 from Miciah/OCPBUGS-38102-bump-to-k8s.io-v0.30.3-controller-runtime-v0.18.4 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 26f0181 Merge pull request #1126 from gcs278/clear-lb-param-status + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 37df1b1 Merge pull request #1721 from vrutkovs/library-go-1772 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 0a9ed57 Merge pull request #814 from tjungblu/ckao_lg_1743 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at 98ca953 Merge pull request #546 from ingvagabund/545 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at c21e13f Merge pull request #2322 from orenc1/networking_console_plugin + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at 2b962c7 Merge pull request #354 from ingvagabund/update-owners + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at c502ece Merge pull request #151 from ingvagabund/bump-k8s-1.30.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/ +HEAD is now at aa558ca Merge pull request #156 from dfajmon/rebase-8.0.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 1fb31653 Merge pull request #273 from Elbehery/rebase-etcd-3.5.14-openshift-4.17 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at a092ee7d2 Merge pull request #2054 from haircommander/storage-test-openshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/ +HEAD is now at 34fafc0 Merge pull request #205 from openshift-bot/art-consistency-openshift-4.17-ose-kube-storage-version-migrator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at 005ee686 Merge pull request #4415 from cheesesashimi/zzlotnik/fix-OCPBUGS-29444 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at aabcbc2 Merge pull request #318 from sanchezl/ocpbugs-35731 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/ +HEAD is now at 7915649d OCPBUGS-30333: Move Helm to bingo dep and update it (#837) + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at a47f6be Merge pull request #44 from ingvagabund/bump-k8s-1.30.1 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 1f7d647 Merge pull request #241 from lunarwhite/fix-doc + +# Cloning registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-08-27-195306 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 0fa02c54 Merge pull request #1848 from hongkailiu/OTA-1292-d + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at a656fdf Merge pull request #128 from grzpiotrowski/OCPBUGS-36454-rename-dockerfile + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/ +HEAD is now at aa558ca Merge pull request #156 from dfajmon/rebase-8.0.1 + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 47b8420 Merge pull request #616 from grzpiotrowski/OCPBUGS-36454-rename-dockerfile + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at 8ea2c99 Merge pull request #98 from ibihim/release-0.17.1-downstream + +lvms_operator not from release payload, skipping + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at 4b17dc23 Merge pull request #2268 from tssurya/downstream-merge-20th-august + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at a092ee7d2 Merge pull request #2054 from haircommander/storage-test-openshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at 1f7d647 Merge pull request #241 from lunarwhite/fix-doc + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at 0fa02c54 Merge pull request #1848 from hongkailiu/OTA-1292-d + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at a656fdf Merge pull request #128 from grzpiotrowski/OCPBUGS-36454-rename-dockerfile + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/ +HEAD is now at aa558ca Merge pull request #156 from dfajmon/rebase-8.0.1 + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at 47b8420 Merge pull request #616 from grzpiotrowski/OCPBUGS-36454-rename-dockerfile + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at 8ea2c99 Merge pull request #98 from ibihim/release-0.17.1-downstream + +lvms_operator not from release payload, skipping + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at 4b17dc23 Merge pull request #2268 from tssurya/downstream-merge-20th-august + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at a092ee7d2 Merge pull request #2054 from haircommander/storage-test-openshift + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 1f7d647 Merge pull request #241 from lunarwhite/fix-doc + +Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch. +error: branch 'rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27' not found. +Switched to a new branch 'rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 ca9853bdd] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-csi-snapshot-controller-operator embedded-component no change + +cluster-kube-controller-manager-operator embedded-component no change + +cluster-kube-scheduler-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +csi-external-snapshotter embedded-component no change + +etcd embedded-component no change + +kubernetes-kube-storage-version-migrator embedded-component no change + +openshift-controller-manager embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +csi-external-snapshotter image-amd64 no change + +csi-external-snapshotter image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +csi-external-snapshotter image-arm64 no change + +csi-external-snapshotter image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 23d122d4b] update changelog + 2 files changed, 347 insertions(+), 38 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@c502ece1b8bdccdbc58a327520685d9a1d2f59cf +go: downloading github.com/openshift/api v0.0.0-20240530053948-b01900f1982a +go: downloading github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87 +go: downloading github.com/openshift/library-go v0.0.0-20240528110646-354b673304be +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240805184523-43740e9179f5 +go: downloading k8s.io/klog/v2 v2.120.1 +go: downloading k8s.io/utils v0.0.0-20240102154912-e7106e64919e +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/stretchr/testify v1.8.4 +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/spf13/cobra v1.7.0 +go: downloading sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading github.com/fsnotify/fsnotify v1.7.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240805184523-43740e9179f5 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/openshift/kubernetes v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20240604062218-c502ece1b8bd +go: downloading github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 +go: downloading sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20240604082609-a47f6be3676d +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading golang.org/x/sys v0.18.0 +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 +go: downloading github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240605171054-34fafc04e5f2 +go: downloading github.com/google/go-cmp v0.6.0 +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/google/gofuzz v1.2.0 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.4.1 +go: downloading github.com/golang/protobuf v1.5.4 +go: downloading github.com/google/gnostic-models v0.6.8 +go: downloading google.golang.org/protobuf v1.33.0 +go: downloading golang.org/x/net v0.23.0 +go: downloading github.com/imdario/mergo v0.3.11 +go: downloading golang.org/x/term v0.18.0 +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading github.com/go-logr/logr v1.4.1 +go: downloading github.com/inconshreveable/mousetrap v1.1.0 +go: downloading github.com/vishvananda/netns v0.0.4 +go: downloading sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd +go: downloading github.com/google/uuid v1.3.1 +go: downloading golang.org/x/time v0.3.0 +go: downloading github.com/jonboulle/clockwork v0.2.2 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.1 +go: downloading github.com/russross/blackfriday/v2 v2.1.0 +go: downloading golang.org/x/crypto v0.21.0 +go: downloading golang.org/x/sync v0.6.0 +go: downloading go.uber.org/zap v1.26.0 +go: downloading k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading google.golang.org/grpc v1.59.0 +go: downloading go.opentelemetry.io/otel/trace v1.19.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/Microsoft/go-winio v0.6.0 +go: downloading github.com/coreos/go-systemd/v22 v22.5.0 +go: downloading github.com/google/cadvisor v0.49.0 +go: downloading github.com/opencontainers/runc v1.1.12 +go: downloading go.opentelemetry.io/otel v1.19.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 +go: downloading go.opentelemetry.io/otel/sdk v1.19.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/prometheus/client_golang v1.16.0 +go: downloading github.com/prometheus/client_model v0.4.0 +go: downloading github.com/prometheus/procfs v0.10.1 +go: downloading github.com/prometheus/common v0.44.0 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/go-openapi/swag v0.22.3 +go: downloading golang.org/x/oauth2 v0.11.0 +go: downloading github.com/go-errors/errors v1.4.2 +go: downloading github.com/go-openapi/jsonreference v0.20.2 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading golang.org/x/text v0.14.0 +go: downloading github.com/moby/term v0.0.0-20221205130635-1aeaba878587 +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.9.0 +go: downloading github.com/emicklei/go-restful/v3 v3.11.0 +go: downloading go.uber.org/atomic v1.10.0 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20240314173009-2cd07f4ca53d +go: downloading github.com/onsi/gomega v1.31.0 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading golang.org/x/tools v0.18.0 +go: downloading go.uber.org/multierr v1.11.0 +go: downloading go.uber.org/goleak v1.3.0 +go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d +go: downloading github.com/coreos/go-semver v0.3.1 +go: downloading google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d +go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d +go: downloading github.com/onsi/ginkgo v1.16.5 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.2.1 +go: downloading gopkg.in/square/go-jose.v2 v2.6.0 +go: downloading go.etcd.io/etcd/server/v3 v3.5.10 +go: downloading github.com/cyphar/filepath-securejoin v0.2.4 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 +go: downloading go.opentelemetry.io/proto/otlp v1.0.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/opencontainers/selinux v1.11.0 +go: downloading github.com/golang/mock v1.6.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0 +go: downloading github.com/container-storage-interface/spec v1.8.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20240716092710-e88385a79b17 +go: downloading github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading github.com/google/cel-go v0.17.8 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.2.0 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 +go: downloading github.com/mailru/easyjson v0.7.7 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.2 +go: downloading github.com/go-logr/zapr v1.3.0 +go: downloading github.com/go-openapi/jsonpointer v0.19.6 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240805184523-43740e9179f5 +go: downloading github.com/creack/pty v1.1.18 +go: downloading github.com/google/btree v1.0.1 +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/kr/pretty v0.3.1 +go: downloading github.com/fvbommel/sortorder v1.1.0 +go: downloading github.com/gorilla/websocket v1.5.0 +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 +go: downloading github.com/coreos/go-oidc v2.2.1+incompatible +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240805184523-43740e9179f5 +go: downloading go.opentelemetry.io/otel/metric v1.19.0 +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/cenkalti/backoff/v4 v4.2.1 +go: downloading github.com/felixge/httpsnoop v1.0.3 +go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading cloud.google.com/go/compute/metadata v0.2.3 +go: downloading cloud.google.com/go/compute v1.23.0 +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/containerd/cgroups v1.1.0 +go: downloading github.com/Microsoft/hcsshim v0.8.25 +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 +go: downloading go.etcd.io/bbolt v1.3.8 +go: downloading go.etcd.io/etcd/pkg/v3 v3.5.10 +go: downloading github.com/godbus/dbus/v5 v5.1.0 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.17.0 +go: downloading github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading google.golang.org/api v0.126.0 +go: downloading gopkg.in/gcfg.v1 v1.2.3 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/distribution/reference v0.5.0 +go: downloading github.com/containerd/ttrpc v1.2.2 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading github.com/josharian/intern v1.0.0 +go: downloading github.com/kr/text v0.2.0 +go: downloading github.com/rogpeppe/go-internal v1.10.0 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading golang.org/x/mod v0.15.0 +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/pquerna/cachecontrol v0.1.0 +go: downloading github.com/stretchr/objx v0.5.0 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.10 +go: downloading github.com/dustin/go-humanize v1.0.1 +go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 +go: downloading gopkg.in/warnings.v0 v0.1.2 +go: downloading github.com/checkpoint-restore/go-criu/v5 v5.3.0 +go: downloading github.com/containerd/console v1.0.3 +go: downloading github.com/mrunalp/fileutils v0.5.1 +go: downloading github.com/docker/docker v20.10.27+incompatible +go: downloading github.com/docker/go-connections v0.4.0 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df +go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 +go: downloading github.com/xlab/treeprint v1.2.0 +go: downloading github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 +go: downloading github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 +go: downloading github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 +go: downloading github.com/golang/glog v1.1.2 +go: downloading go.opencensus.io v0.24.0 +go: downloading github.com/golang-jwt/jwt/v4 v4.5.0 +go: downloading go.etcd.io/etcd/client/v2 v2.305.10 +go: downloading github.com/cilium/ebpf v0.9.1 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.10.0 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading github.com/docker/distribution v2.8.2+incompatible +go: downloading golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e +go: downloading github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 +go: downloading github.com/envoyproxy/protoc-gen-validate v1.0.2 +go: downloading github.com/frankban/quicktest v1.14.0 +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.4 +go: downloading go.starlark.net v0.0.0-20230525235612-a134d8f9ddca +go: downloading github.com/googleapis/gax-go/v2 v2.11.0 +go: downloading github.com/google/s2a-go v0.1.7 +go: downloading github.com/googleapis/enterprise-certificate-proxy v0.2.3 +go mod edit -require github.com/openshift/route-controller-manager@a47f6be3676d3eabb864ca339584fe857e1076c5 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@a092ee7d2b3514278dbbcbd47d87fde356c9b0ec +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20240314173009-2cd07f4ca53d +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@1fb3165305efc8d986344b555b22592e6e6c1786 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240819213058-a092ee7d2b35 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace sigs.k8s.io/kube-storage-version-migrator=github.com/openshift/kubernetes-kube-storage-version-migrator@34fafc04e5f2872e282617da31175a7e091ffdb2 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240819213058-a092ee7d2b35 +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@c502ece1b8bdccdbc58a327520685d9a1d2f59cf +go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading go.etcd.io/bbolt v1.3.10 +go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.0 +go: downloading go.opentelemetry.io/otel v1.20.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 +go: downloading go.opentelemetry.io/otel/sdk v1.20.0 +go: downloading github.com/sirupsen/logrus v1.9.3 +go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20240613152121-1fb3165305ef +go: downloading go.opentelemetry.io/otel/metric v1.20.0 +go: downloading go.opentelemetry.io/otel/trace v1.20.0 +go: downloading go.etcd.io/etcd/client/v2 v2.305.14 +go: downloading cloud.google.com/go v0.110.7 +go: downloading github.com/cockroachdb/datadriven v1.0.2 +go mod edit -require github.com/openshift/route-controller-manager@a47f6be3676d3eabb864ca339584fe857e1076c5 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240819213058-a092ee7d2b35 +skipping modulepath github.com/openshift/microshift: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/config: no or unknown command [] +skipping modulepath github.com/openshift/microshift/pkg/util/cryptomaterial: no or unknown command [] +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20240314173009-2cd07f4ca53d +go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/pkg/v3=github.com/openshift/etcd/pkg/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/raft/v3=github.com/openshift/etcd/raft/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace go.etcd.io/etcd/server/v3=github.com/openshift/etcd/server/v3@v3.5.1-0.20240613152121-1fb3165305ef +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240819213058-a092ee7d2b35 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240819213058-a092ee7d2b35 +## Committing changes to microshift/go.mod +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 54adc3e89] update microshift/go.mod + 2 files changed, 83 insertions(+), 83 deletions(-) +## Updating microshift/vendor directory +/go/src/github.com/openshift/microshift /go/src/github.com/openshift/microshift +go: inconsistent vendoring in /go/src/github.com/openshift/microshift: + k8s.io/api: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/apiextensions-apiserver: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/apimachinery: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/apiserver: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/cli-runtime: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/client-go: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/cloud-provider: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/cluster-bootstrap: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/code-generator: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/component-base: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/component-helpers: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/controller-manager: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/cri-api: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/csi-translation-lib: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/dynamic-resource-allocation: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kms: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kube-aggregator: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kube-controller-manager: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kube-proxy: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kube-scheduler: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kubectl: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kubelet: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/kubernetes: is replaced by github.com/openshift/kubernetes@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/legacy-cloud-providers: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/metrics: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/mount-utils: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/pod-security-admission: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/sample-apiserver: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/sample-cli-plugin: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/sample-controller: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + k8s.io/endpointslice: is replaced by github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240819213058-a092ee7d2b35 in go.mod, but marked as replaced by github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240805184523-43740e9179f5 in vendor/modules.txt + + To ignore the vendor directory, use -mod=readonly or -mod=mod. + To sync the vendor directory, run: + go mod vendor +panic: runtime error: invalid memory address or nil pointer dereference +[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x548c41] + +goroutine 1 [running]: +main.findCodeRoots() + cmd/doc/dirs.go:234 +0x7c1 +main.codeRoots.func1() + cmd/doc/dirs.go:175 +0xf +sync.(*Once).doSlow(0x579e40?, 0x550001?) + sync/once.go:74 +0xc2 +sync.(*Once).Do(...) + sync/once.go:65 +main.codeRoots() + cmd/doc/dirs.go:174 +0x2c +main.dirsInit({0x0, 0x0, 0x60?}) + cmd/doc/dirs.go:58 +0x325 +main.main() + cmd/doc/main.go:88 +0x65 +exit status 2 +go mod vendor +for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch; do \ + echo "Applying patch $p"; \ + git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply --reject || exit 1; \ +done +Applying patch scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch +Checking patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go... +Hunk #1 succeeded at 256 (offset 13 lines). +Applied patch vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 33 (offset 1 line). +Hunk #3 succeeded at 86 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Hunk #2 succeeded at 26 (offset 1 line). +Hunk #3 succeeded at 50 (offset 1 line). +Hunk #4 succeeded at 109 (offset 2 lines). +Hunk #5 succeeded at 127 (offset 2 lines). +Hunk #6 succeeded at 141 (offset 2 lines). +Hunk #7 succeeded at 157 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch +Checking patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go... +Applied patch vendor/k8s.io/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0010-kube-apiserver-command-context.patch +Checking patch vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go... +Hunk #1 succeeded at 149 (offset -21 lines). +Applied patch vendor/k8s.io/kubernetes/cmd/kube-apiserver/app/server.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch +Checking patch vendor/k8s.io/klog/v2/goroutine_labels.go... +Checking patch vendor/k8s.io/klog/v2/internal/buffer/buffer.go... +Hunk #1 succeeded at 144 (offset -5 lines). +Checking patch vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go... +Applied patch vendor/k8s.io/klog/v2/goroutine_labels.go cleanly. +Applied patch vendor/k8s.io/klog/v2/internal/buffer/buffer.go cleanly. +Applied patch vendor/k8s.io/klog/v2/internal/buffer/goroutine_labels.go cleanly. +Applying patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch +Checking patch vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go... +Hunk #1 succeeded at 37 (offset 1 line). +Hunk #2 succeeded at 157 (offset 2 lines). +Applied patch vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/controllermanager.go cleanly. +/go/src/github.com/openshift/microshift +## Commiting changes to microshift/vendor directory +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 76cfa6a7e] update microshift/vendor + 3 files changed, 59 insertions(+), 59 deletions(-) +## Committing changes to etcd/go.mod +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 33a38b487] update etcd/go.mod + 2 files changed, 44 insertions(+), 44 deletions(-) +## Updating etcd/vendor directory +/go/src/github.com/openshift/microshift/etcd /go/src/github.com/openshift/microshift +go mod vendor +/go/src/github.com/openshift/microshift +## Commiting changes to etcd/vendor directory +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 7f55e0e04] update etcd/vendor + 1 file changed, 37 insertions(+), 37 deletions(-) +Rebasing release_*.json +## Committing changes to pkg/release +[rebase-main-4.18.0-0.nightly-2024-08-27-195306_amd64-2024-08-27_arm64-2024-08-27 9f93bb831] update component images + 2 files changed, 2 insertions(+), 2 deletions(-) +Copying manifests +2024-08-28 04:27:28,066 INFO Clearing directory assets/components/openshift-dns/dns/ +2024-08-28 04:27:28,067 DEBUG Copying assets/components/openshift-dns/dns/cluster-role-binding.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role-binding.yaml +2024-08-28 04:27:28,068 DEBUG Copying assets/components/openshift-dns/dns/cluster-role.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role.yaml +2024-08-28 04:27:28,068 INFO Restoring assets/components/openshift-dns/dns/configmap.yaml +2024-08-28 04:27:28,068 DEBUG Executing 'git restore assets/components/openshift-dns/dns/configmap.yaml' +2024-08-28 04:27:28,087 DEBUG Copying assets/components/openshift-dns/dns/daemonset.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/daemonset.yaml +2024-08-28 04:27:28,087 DEBUG Copying assets/components/openshift-dns/dns/namespace.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/namespace.yaml +2024-08-28 04:27:28,088 DEBUG Copying assets/components/openshift-dns/dns/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service-account.yaml +2024-08-28 04:27:28,088 DEBUG Copying assets/components/openshift-dns/dns/service.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service.yaml +2024-08-28 04:27:28,089 INFO Clearing directory assets/components/openshift-dns/node-resolver +2024-08-28 04:27:28,090 WARNING Ignoring components/openshift-dns/node-resolver/daemonset.yaml because it's created by processing daemonset.yaml.tmpl +2024-08-28 04:27:28,090 INFO Restoring assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl +2024-08-28 04:27:28,090 DEBUG Executing 'git restore assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl' +2024-08-28 04:27:28,107 DEBUG Copying assets/components/openshift-dns/node-resolver/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/service-account.yaml +2024-08-28 04:27:28,107 DEBUG Copying assets/components/openshift-dns/node-resolver/update-node-resolver.sh <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/update-node-resolver.sh +2024-08-28 04:27:28,108 INFO Clearing directory assets/components/openshift-router/ +2024-08-28 04:27:28,109 DEBUG Copying assets/components/openshift-router/cluster-role-binding.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role-binding.yaml +2024-08-28 04:27:28,109 DEBUG Copying assets/components/openshift-router/cluster-role.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role.yaml +2024-08-28 04:27:28,110 INFO Restoring assets/components/openshift-router/cluster-role-system-router.yaml +2024-08-28 04:27:28,110 DEBUG Executing 'git restore assets/components/openshift-router/cluster-role-system-router.yaml' +2024-08-28 04:27:28,128 INFO Restoring assets/components/openshift-router/configmap.yaml +2024-08-28 04:27:28,128 DEBUG Executing 'git restore assets/components/openshift-router/configmap.yaml' +2024-08-28 04:27:28,146 DEBUG Copying assets/components/openshift-router/deployment.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/deployment.yaml +2024-08-28 04:27:28,147 DEBUG Copying assets/components/openshift-router/namespace.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/namespace.yaml +2024-08-28 04:27:28,147 DEBUG Copying assets/components/openshift-router/service-account.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-account.yaml +2024-08-28 04:27:28,148 DEBUG Copying assets/components/openshift-router/service-internal.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-internal.yaml +2024-08-28 04:27:28,149 DEBUG Copying assets/components/openshift-router/service-cloud.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-cloud.yaml +2024-08-28 04:27:28,149 INFO Restoring assets/components/openshift-router/serving-certificate.yaml +2024-08-28 04:27:28,149 DEBUG Executing 'git restore assets/components/openshift-router/serving-certificate.yaml' +2024-08-28 04:27:28,167 INFO Restoring assets/components/openshift-router/cluster-role-aggregate-route.yaml +2024-08-28 04:27:28,168 DEBUG Executing 'git restore assets/components/openshift-router/cluster-role-aggregate-route.yaml' +2024-08-28 04:27:28,185 WARNING Ignoring components/ovn/ because it's not covered by rebase script yet +2024-08-28 04:27:28,185 INFO Clearing directory assets/components/service-ca/ +2024-08-28 04:27:28,186 DEBUG Copying assets/components/service-ca/clusterrole.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrole.yaml +2024-08-28 04:27:28,186 DEBUG Copying assets/components/service-ca/clusterrolebinding.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrolebinding.yaml +2024-08-28 04:27:28,186 DEBUG Copying assets/components/service-ca/deployment.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/deployment.yaml +2024-08-28 04:27:28,186 DEBUG Copying assets/components/service-ca/ns.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/ns.yaml +2024-08-28 04:27:28,187 DEBUG Copying assets/components/service-ca/role.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/role.yaml +2024-08-28 04:27:28,187 DEBUG Copying assets/components/service-ca/rolebinding.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/rolebinding.yaml +2024-08-28 04:27:28,187 DEBUG Copying assets/components/service-ca/sa.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/sa.yaml +2024-08-28 04:27:28,187 DEBUG Copying assets/components/service-ca/signing-cabundle.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/signing-cabundle.yaml +2024-08-28 04:27:28,187 DEBUG Copying assets/components/service-ca/signing-secret.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/signing-secret.yaml +2024-08-28 04:27:28,188 INFO Not clearing dir components/csi-snapshot-controller/ +2024-08-28 04:27:28,188 DEBUG Copying assets/components/csi-snapshot-controller/csi_controller_deployment.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/csi_controller_deployment.yaml +2024-08-28 04:27:28,188 DEBUG Copying assets/components/csi-snapshot-controller/serviceaccount.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/serviceaccount.yaml +2024-08-28 04:27:28,189 DEBUG Copying assets/components/csi-snapshot-controller/webhook_config.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/webhook_config.yaml +2024-08-28 04:27:28,189 DEBUG Copying assets/components/csi-snapshot-controller/webhook_deployment.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/webhook_deployment.yaml +2024-08-28 04:27:28,190 DEBUG Copying assets/components/csi-snapshot-controller/webhook_service.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/webhook_service.yaml +2024-08-28 04:27:28,190 DEBUG Copying assets/components/csi-snapshot-controller/webhook_serviceaccount.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/webhook_serviceaccount.yaml +2024-08-28 04:27:28,191 DEBUG Copying assets/components/csi-snapshot-controller/webhook_clusterrole.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/./rbac/webhook_clusterrole.yaml +2024-08-28 04:27:28,191 DEBUG Copying assets/components/csi-snapshot-controller/webhook_clusterrolebinding.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/./rbac/webhook_clusterrolebinding.yaml +2024-08-28 04:27:28,192 DEBUG Copying assets/components/csi-snapshot-controller/volumesnapshotclasses.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshotclasses.yaml +2024-08-28 04:27:28,193 DEBUG Copying assets/components/csi-snapshot-controller/volumesnapshotcontents.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshotcontents.yaml +2024-08-28 04:27:28,194 DEBUG Copying assets/components/csi-snapshot-controller/volumesnapshots.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshots.yaml +2024-08-28 04:27:28,194 DEBUG Copying assets/components/csi-snapshot-controller/05_operand_rbac.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/../manifests/05_operand_rbac.yaml +2024-08-28 04:27:28,195 WARNING Ignoring components/csi-snapshot-controller/clusterrole.yaml because extracted automatically from 05_operand_rbac.yaml +2024-08-28 04:27:28,195 WARNING Ignoring components/csi-snapshot-controller/clusterrolebinding.yaml because extracted automatically from 05_operand_rbac.yaml +2024-08-28 04:27:28,195 INFO Clearing directory assets/controllers/cluster-policy-controller/ +2024-08-28 04:27:28,196 DEBUG Copying assets/controllers/cluster-policy-controller/namespace-security-allocation-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-security-allocation-controller-clusterrole.yaml +2024-08-28 04:27:28,197 DEBUG Copying assets/controllers/cluster-policy-controller/namespace-security-allocation-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-security-allocation-controller-clusterrolebinding.yaml +2024-08-28 04:27:28,197 DEBUG Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-syncer-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-syncer-controller-clusterrole.yaml +2024-08-28 04:27:28,204 DEBUG Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-syncer-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-syncer-controller-clusterrolebinding.yaml +2024-08-28 04:27:28,210 DEBUG Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrole.yaml +2024-08-28 04:27:28,211 DEBUG Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrolebinding.yaml +2024-08-28 04:27:28,213 INFO Clearing directory assets/controllers/kube-apiserver/ +2024-08-28 04:27:28,214 DEBUG Copying assets/controllers/kube-apiserver/config-overrides.yaml <- _output/staging/cluster-kube-apiserver-operator/bindata/assets/config/config-overrides.yaml +2024-08-28 04:27:28,214 DEBUG Copying assets/controllers/kube-apiserver/defaultconfig.yaml <- _output/staging/cluster-kube-apiserver-operator/bindata/assets/config/defaultconfig.yaml +2024-08-28 04:27:28,215 INFO Clearing directory assets/controllers/kube-controller-manager/ +2024-08-28 04:27:28,216 DEBUG Copying assets/controllers/kube-controller-manager/defaultconfig.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/../config/defaultconfig.yaml +2024-08-28 04:27:28,216 DEBUG Copying assets/controllers/kube-controller-manager/csr_approver_clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/csr_approver_clusterrole.yaml +2024-08-28 04:27:28,217 DEBUG Copying assets/controllers/kube-controller-manager/csr_approver_clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/csr_approver_clusterrolebinding.yaml +2024-08-28 04:27:28,217 DEBUG Copying assets/controllers/kube-controller-manager/namespace-openshift-kube-controller-manager.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/ns.yaml +2024-08-28 04:27:28,218 INFO Clearing directory assets/controllers/openshift-default-scc-manager/ +2024-08-28 04:27:28,219 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-anyuid.yaml +2024-08-28 04:27:28,220 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostaccess.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostaccess.yaml +2024-08-28 04:27:28,220 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml +2024-08-28 04:27:28,221 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork-v2.yaml +2024-08-28 04:27:28,221 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork.yaml +2024-08-28 04:27:28,222 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-nonroot-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-nonroot-v2.yaml +2024-08-28 04:27:28,222 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-nonroot.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-nonroot.yaml +2024-08-28 04:27:28,223 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-privileged.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-privileged.yaml +2024-08-28 04:27:28,223 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-restricted-v2.yaml +2024-08-28 04:27:28,224 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-restricted.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-restricted.yaml +2024-08-28 04:27:28,225 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_crb-systemauthenticated-scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_crb-systemauthenticated-scc-restricted-v2.yaml +2024-08-28 04:27:28,225 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml +2024-08-28 04:27:28,226 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml +2024-08-28 04:27:28,226 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml +2024-08-28 04:27:28,227 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml +2024-08-28 04:27:28,227 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml +2024-08-28 04:27:28,228 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml +2024-08-28 04:27:28,228 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml +2024-08-28 04:27:28,229 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-privileged.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-privileged.yaml +2024-08-28 04:27:28,230 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml +2024-08-28 04:27:28,230 DEBUG Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-restricted.yaml +2024-08-28 04:27:28,231 INFO Clearing directory assets/controllers/route-controller-manager/ +2024-08-28 04:27:28,232 DEBUG Copying assets/controllers/route-controller-manager/ns.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/ns.yaml +2024-08-28 04:27:28,232 DEBUG Copying assets/controllers/route-controller-manager/sa.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/sa.yaml +2024-08-28 04:27:28,233 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-clusterrole.yaml +2024-08-28 04:27:28,234 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-clusterrolebinding.yaml +2024-08-28 04:27:28,234 DEBUG Copying assets/controllers/route-controller-manager/informer-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/informer-clusterrolebinding.yaml +2024-08-28 04:27:28,235 DEBUG Copying assets/controllers/route-controller-manager/informer-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/informer-clusterrole.yaml +2024-08-28 04:27:28,235 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrolebinding.yaml +2024-08-28 04:27:28,236 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrole.yaml +2024-08-28 04:27:28,237 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-ns.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ns.yaml +2024-08-28 04:27:28,237 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-sa.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-sa.yaml +2024-08-28 04:27:28,238 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-separate-sa-rolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-separate-sa-rolebinding.yaml +2024-08-28 04:27:28,238 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-separate-sa-role.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-separate-sa-role.yaml +2024-08-28 04:27:28,239 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-tokenreview-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-tokenreview-clusterrolebinding.yaml +2024-08-28 04:27:28,240 DEBUG Copying assets/controllers/route-controller-manager/route-controller-manager-tokenreview-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-tokenreview-clusterrole.yaml +2024-08-28 04:27:28,240 INFO Restoring assets/controllers/route-controller-manager/route-controller-manager-authentication-reader-rolebinding.yaml +2024-08-28 04:27:28,240 DEBUG Executing 'git restore assets/controllers/route-controller-manager/route-controller-manager-authentication-reader-rolebinding.yaml' +2024-08-28 04:27:28,258 INFO Not clearing dir core/ +2024-08-28 04:27:28,258 DEBUG Copying assets/core/0000_50_cluster-openshift-controller-manager_00_namespace.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/ns.yaml +2024-08-28 04:27:28,258 DEBUG Copying assets/core/namespace-openshift-infra.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-openshift-infra.yaml +2024-08-28 04:27:28,259 WARNING Ignoring core/priority-class-openshift-user-critical.yaml because it's a priority class needed for oc debug node command - not available in any repo that rebase is using +2024-08-28 04:27:28,259 WARNING Ignoring core/securityv1-local-apiservice.yaml because it's a local API service for security API group, needed if OpenShift API server is not present +2024-08-28 04:27:28,259 DEBUG Copying assets/core/kubelet.yaml <- _output/staging/machine-config-operator/templates/master/01-master-kubelet/_base/files/kubelet.yaml +2024-08-28 04:27:28,260 INFO Clearing directory assets/crd/ +2024-08-28 04:27:28,260 DEBUG Copying assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml <- _output/staging/release-manifests/0000_03_config-operator_01_securitycontextconstraints.crd.yaml +Traceback (most recent call last): + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 161, in + main() + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 154, in main + handle_dir(asset) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 128, in handle_dir + handle_file(file, dst, new_src_prefix) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 111, in handle_file + copy(src, dst) + File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 71, in copy + shutil.copyfile(src, dst) + File "/usr/lib64/python3.9/shutil.py", line 264, in copyfile + with open(src, 'rb') as fsrc: +FileNotFoundError: [Errno 2] No such file or directory: '_output/staging/release-manifests/0000_03_config-operator_01_securitycontextconstraints.crd.yaml'