From 5ea9bbddf0bdc27ed9f99933928657fc967e710e Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 10:55:24 +0200 Subject: [PATCH 01/17] SSC CRD's filename changed --- scripts/auto-rebase/assets.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/auto-rebase/assets.yaml b/scripts/auto-rebase/assets.yaml index 429911430d..24a10e59f2 100644 --- a/scripts/auto-rebase/assets.yaml +++ b/scripts/auto-rebase/assets.yaml @@ -196,6 +196,7 @@ assets: src: release-manifests/ files: - file: 0000_03_config-operator_01_securitycontextconstraints.crd.yaml + src: 0000_03_config-operator_01_securitycontextconstraints-Default.crd.yaml - file: 0000_03_config-operator_02_rangeallocations.crd.yaml - file: storage_version_migration.crd.yaml src: 0000_50_cluster-kube-storage-version-migrator-operator_01_storage_migration_crd.yaml From 8509fc646824ee1bc4f08be240d559ddf08ad20d Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 22 Aug 2024 15:36:36 +0200 Subject: [PATCH 02/17] fix kubelet sed --- scripts/auto-rebase/rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/rebase.sh b/scripts/auto-rebase/rebase.sh index 2d4ddb29a3..b24c14dc68 100755 --- a/scripts/auto-rebase/rebase.sh +++ b/scripts/auto-rebase/rebase.sh @@ -569,7 +569,7 @@ update_openshift_manifests() { # The tlsCipherSuites field was change from a scalar value to gotemplate which broke the yaml formatting and # confused yq. Before processing, delete the offending go templated field. # https://github.com/openshift/machine-config-operator/commit/3b979e1ddf2a6e2c3e9b4a7872e31db888da1d57 - sed -n -i '/tlsCipherSuites:/,/{{- end }}/d' "${REPOROOT}/assets/core/kubelet.yaml" + sed -i '/tlsCipherSuites:/,/{{- end }}/d' "${REPOROOT}/assets/core/kubelet.yaml" # Drop MCO's boilerplate and keep KubeletConfiguration only yq -i '.contents.inline' "${REPOROOT}/assets/core/kubelet.yaml" From 198d710af8a1f2e81817fe9dbbc77836e3b8093b Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:16 +0200 Subject: [PATCH 03/17] 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..9b3ec7e1dc 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-29-020346" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-08-28-220210" From 568d64c0f80d5b1ecf0ab47fdbea3c752e345c14 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:16 +0200 Subject: [PATCH 04/17] update changelog --- scripts/auto-rebase/changelog.txt | 421 ++++++++++++++++++++++++++++-- scripts/auto-rebase/commits.txt | 36 +-- 2 files changed, 419 insertions(+), 38 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 3d1069081c..8f71f92ed2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,32 +1,413 @@ -- 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 01b3675ba7b364e312ac5da6e632251fbaefdda0 + - c85ee33 2024-08-27T12:41:40-04:00 Added CEL to prevent vCenters from changing to unsupported config after install. + - 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 + - 6f0975a 2024-08-13T17:00:50+05:30 Add Conditions field to the config.node object's status + - 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 cbb60dc51cd4aefe4bd1d10a214e481073aa9233 + - f4c121a 2024-08-28T09:49:37+01:00 Live migration: report network overlap via live_migration_blocked metric + - 8c0b8d8 2024-08-21T23:06:57-04:00 rebase openshift/api + - 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 c72b183b6b632269d0210e321931b8fd02fab803 + - 32de3196 2024-08-27T11:46:13-04:00 node-joiner: use proxy settings when required + - b2c293e3 2024-08-21T21:48:37-04:00 OTA-1292: upgrade-status: handle the OS image annotation better + - 270cb4fd 2024-08-21T11:13:34-04:00 make the idle command's scale update unconditional + - 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 210daea41c93d6ac12391fa9dfa75ae4b68f0048 + - 1336d3a0 2024-08-22T15:37:22+02:00 skip eip test when iptables doesn't exist + - 71f242b5 2024-08-22T13:45:04+01:00 Node IP hander: ignore mgnt port IPs + - c76d0894 2024-08-22T13:44:34+02:00 udn, layer2, IC: add tests for IC clusters + - 83291cc6 2024-08-22T13:43:30+02:00 udn, unit tests: move newMultiHomedPod to the multihoming test utils + - 9f78a5a0 2024-08-22T13:43:30+02:00 udn, unit tests: move cluster config opts to the multihoming test utils + - 9cecad04 2024-08-22T13:43:30+02:00 udn, layer2: drop network join addresses reroute policy + - 9422e8d3 2024-08-22T13:43:30+02:00 udn, layer2: add LRPs to the GR router + - 0b0148cb 2024-08-22T13:43:30+02:00 udn, unit tests: allow managementPortIP to be re-used for L2 tests + - d5a75835 2024-08-22T13:43:30+02:00 udn, e2e tests: skip egress tests for layer2 topologies on non-IC deployments + - 6a190dd9 2024-08-22T13:43:30+02:00 udn, layer2, unit tests: assert network cleanup + - 19b666b2 2024-08-22T13:43:30+02:00 udn, e2e tests: adjust expected routes according to the network topology + - c7891bdb 2024-08-22T13:43:30+02:00 udn, layer2, e2e tests: run egress tests + - a688e1c5 2024-08-22T13:43:26+02:00 udn, layer2, tests: provide the expectations for l2 topologies + - b736a513 2024-08-22T13:31:31+02:00 udn, l2, controller: Add unit test + - b0517df3 2024-08-22T09:23:35+02:00 Un-skip egress gateway tests for ipv6. + - 1d138038 2024-08-21T19:40:29+02:00 udn, tests: adjust primary UDN expectations for layer2 + - 78a25665 2024-08-21T19:40:28+02:00 udn, tests: parametrize management port creation + - 3f8767c8 2024-08-21T15:37:37+02:00 udn, layer3, tests: compute the management port IP + - 3fab0a44 2024-08-21T15:37:37+02:00 udn, egress, l2: Use node join ip at LRP + - a400a278 2024-08-21T15:37:37+02:00 udn, l2: add .1 address to LRP + - eb653929 2024-08-21T15:37:37+02:00 udn, l2: Skip network subnet route + - c37b5bbb 2024-08-21T15:37:37+02:00 udn, l2: do not invoke cluster router related ops + - a3a5e812 2024-08-21T15:37:37+02:00 udn, egress: sync gateway for layer2 primary UDNs + - 07f4744c 2024-08-21T15:37:37+02:00 udn, layer2: add COPP for secondary layer2 controllers + - 5738da3f 2024-08-21T12:28:18+01:00 Fix IPv6 network mgnt port IP address assignment + - 2c4ef862 2024-08-20T14:21:24-04:00 Make Route Manager API blocking + - 3bc5069b 2024-08-20T15:55:23+02:00 E2E: Use both the NAD and the CRD in endpointslice mirror tests + - 9ecc3202 2024-08-20T13:43:26+02:00 UDN: Add routes manager + - aa06675e 2024-08-20T11:39:39+02:00 E2E: Rename endpointslices_mirror.go to network_segmentation_endpointslices_mirror.go + - 17ccab17 2024-08-19T13:07:34-07:00 enable interconnect in helm chart + - 69b8a147 2024-08-19T16:40:40+02:00 udn, layer3, unit tests: add cleanup tests + - 288c1687 2024-08-19T16:38:07+02:00 udn, unit tests: add secondary net ext ids to cluster router and join switch + - 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 + - fc7d24ba 2024-08-14T09:46:34+03:00 networksegmentation,UDN CRD: Remove localnet + - 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. + - 73c54c8a 2024-08-08T10:28:37+02:00 Set gomega poll interval on retry to allow ~5 retries instead of just 1. + - 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 c72b183b6b632269d0210e321931b8fd02fab803 + - 32de3196 2024-08-27T11:46:13-04:00 node-joiner: use proxy settings when required + - b2c293e3 2024-08-21T21:48:37-04:00 OTA-1292: upgrade-status: handle the OS image annotation better + - 270cb4fd 2024-08-21T11:13:34-04:00 make the idle command's scale update unconditional + - 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 210daea41c93d6ac12391fa9dfa75ae4b68f0048 + - 1336d3a0 2024-08-22T15:37:22+02:00 skip eip test when iptables doesn't exist + - 71f242b5 2024-08-22T13:45:04+01:00 Node IP hander: ignore mgnt port IPs + - c76d0894 2024-08-22T13:44:34+02:00 udn, layer2, IC: add tests for IC clusters + - 83291cc6 2024-08-22T13:43:30+02:00 udn, unit tests: move newMultiHomedPod to the multihoming test utils + - 9f78a5a0 2024-08-22T13:43:30+02:00 udn, unit tests: move cluster config opts to the multihoming test utils + - 9cecad04 2024-08-22T13:43:30+02:00 udn, layer2: drop network join addresses reroute policy + - 9422e8d3 2024-08-22T13:43:30+02:00 udn, layer2: add LRPs to the GR router + - 0b0148cb 2024-08-22T13:43:30+02:00 udn, unit tests: allow managementPortIP to be re-used for L2 tests + - d5a75835 2024-08-22T13:43:30+02:00 udn, e2e tests: skip egress tests for layer2 topologies on non-IC deployments + - 6a190dd9 2024-08-22T13:43:30+02:00 udn, layer2, unit tests: assert network cleanup + - 19b666b2 2024-08-22T13:43:30+02:00 udn, e2e tests: adjust expected routes according to the network topology + - c7891bdb 2024-08-22T13:43:30+02:00 udn, layer2, e2e tests: run egress tests + - a688e1c5 2024-08-22T13:43:26+02:00 udn, layer2, tests: provide the expectations for l2 topologies + - b736a513 2024-08-22T13:31:31+02:00 udn, l2, controller: Add unit test + - b0517df3 2024-08-22T09:23:35+02:00 Un-skip egress gateway tests for ipv6. + - 1d138038 2024-08-21T19:40:29+02:00 udn, tests: adjust primary UDN expectations for layer2 + - 78a25665 2024-08-21T19:40:28+02:00 udn, tests: parametrize management port creation + - 3f8767c8 2024-08-21T15:37:37+02:00 udn, layer3, tests: compute the management port IP + - 3fab0a44 2024-08-21T15:37:37+02:00 udn, egress, l2: Use node join ip at LRP + - a400a278 2024-08-21T15:37:37+02:00 udn, l2: add .1 address to LRP + - eb653929 2024-08-21T15:37:37+02:00 udn, l2: Skip network subnet route + - c37b5bbb 2024-08-21T15:37:37+02:00 udn, l2: do not invoke cluster router related ops + - a3a5e812 2024-08-21T15:37:37+02:00 udn, egress: sync gateway for layer2 primary UDNs + - 07f4744c 2024-08-21T15:37:37+02:00 udn, layer2: add COPP for secondary layer2 controllers + - 5738da3f 2024-08-21T12:28:18+01:00 Fix IPv6 network mgnt port IP address assignment + - 2c4ef862 2024-08-20T14:21:24-04:00 Make Route Manager API blocking + - 3bc5069b 2024-08-20T15:55:23+02:00 E2E: Use both the NAD and the CRD in endpointslice mirror tests + - 9ecc3202 2024-08-20T13:43:26+02:00 UDN: Add routes manager + - aa06675e 2024-08-20T11:39:39+02:00 E2E: Rename endpointslices_mirror.go to network_segmentation_endpointslices_mirror.go + - 17ccab17 2024-08-19T13:07:34-07:00 enable interconnect in helm chart + - 69b8a147 2024-08-19T16:40:40+02:00 udn, layer3, unit tests: add cleanup tests + - 288c1687 2024-08-19T16:38:07+02:00 udn, unit tests: add secondary net ext ids to cluster router and join switch + - 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 + - fc7d24ba 2024-08-14T09:46:34+03:00 networksegmentation,UDN CRD: Remove localnet + - 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. + - 73c54c8a 2024-08-08T10:28:37+02:00 Set gomega poll interval on retry to allow ~5 retries instead of just 1. + - 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..9cd514000d 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 01b3675ba7b364e312ac5da6e632251fbaefdda0 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 cbb60dc51cd4aefe4bd1d10a214e481073aa9233 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 c72b183b6b632269d0210e321931b8fd02fab803 +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 210daea41c93d6ac12391fa9dfa75ae4b68f0048 +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 c72b183b6b632269d0210e321931b8fd02fab803 +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 210daea41c93d6ac12391fa9dfa75ae4b68f0048 +https://github.com/openshift/kubernetes image-arm64 a092ee7d2b3514278dbbcbd47d87fde356c9b0ec https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755 From 89df67a3dfc4cb47ee657a6c36e78e59a791f9a9 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:24 +0200 Subject: [PATCH 05/17] 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 2841b804d340b03ad9c17fd5fa87607510951c05 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:29 +0200 Subject: [PATCH 06/17] 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 9aced3f1e77d807eba920216f573c3b442b48794 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:30 +0200 Subject: [PATCH 07/17] 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 950976799ab264f4f7c5e5b6fe1496977d549e45 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:32 +0200 Subject: [PATCH 08/17] 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 d873cbd6f3ca657153d95a6b996732c0d8d7298c Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:32 +0200 Subject: [PATCH 09/17] 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..781a85c45a 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:dd8e46d497df5e239c5700ac322fc6e802c17bc92d0c2487f159f91b81c641ab" 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..03bf1de75e 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:dde00d1e697b62f24f12dd771c36eeff0342e3e27f088e3685b3e3ac8dafc0d5" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 142dfff1401c2fdf8995dc70a42d9596bf3eecb1 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:34 +0200 Subject: [PATCH 10/17] update manifests --- .../openshift-router/cluster-role.yaml | 1 + ...tor_01_securitycontextconstraints.crd.yaml | 13 ++++++++++++ assets/crd/route.crd.yaml | 8 ++++++++ .../multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 20 +++++++++---------- assets/release/release-x86_64.json | 20 +++++++++---------- 13 files changed, 70 insertions(+), 48 deletions(-) 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/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml b/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml index bd48ff0f64..5eab08c558 100644 --- a/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml +++ b/assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml @@ -7,6 +7,7 @@ metadata: include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" release.openshift.io/bootstrap-required: "true" + release.openshift.io/feature-set: Default name: securitycontextconstraints.security.openshift.io spec: group: security.openshift.io @@ -90,6 +91,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic 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: @@ -103,12 +105,14 @@ spec: type: object nullable: true type: array + x-kubernetes-list-type: atomic 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 + x-kubernetes-list-type: atomic 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 @@ -119,6 +123,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic defaultAllowPrivilegeEscalation: description: DefaultAllowPrivilegeEscalation controls the default setting for whether a process can gain more privileges than its parent process. nullable: true @@ -129,6 +134,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic fsGroup: description: FSGroup is the strategy that will dictate what fs group is used by the SecurityContext. nullable: true @@ -148,6 +154,7 @@ spec: type: integer type: object type: array + x-kubernetes-list-type: atomic type: description: Type is the strategy that will dictate what FSGroup is used in the SecurityContext. type: string @@ -158,6 +165,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic 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 @@ -178,6 +186,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic runAsUser: description: RunAsUser is the strategy that will dictate what RunAsUser is used in the SecurityContext. nullable: true @@ -228,6 +237,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic supplementalGroups: description: SupplementalGroups is the strategy that will dictate what supplemental groups are used by the SecurityContext. nullable: true @@ -247,6 +257,7 @@ spec: type: integer type: object type: array + x-kubernetes-list-type: atomic type: description: Type is the strategy that will dictate what supplemental groups is used in the SecurityContext. type: string @@ -257,6 +268,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic 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: @@ -264,6 +276,7 @@ spec: type: string nullable: true type: array + x-kubernetes-list-type: atomic required: - allowHostDirVolumePlugin - allowHostIPC diff --git a/assets/crd/route.crd.yaml b/assets/crd/route.crd.yaml index 598df2e65b..615e64e465 100644 --- a/assets/crd/route.crd.yaml +++ b/assets/crd/route.crd.yaml @@ -135,6 +135,10 @@ spec: type: object maxItems: 3 type: array + x-kubernetes-list-map-keys: + - name + - kind + x-kubernetes-list-type: map host: description: host is an alias/DNS that points to the service. Optional. If not specified a route name will typically be automatically chosen. @@ -636,6 +640,9 @@ spec: - type type: object type: array + x-kubernetes-list-map-keys: + - type + x-kubernetes-list-type: map host: description: Host is the host string under which the route is exposed; this value is required @@ -656,6 +663,7 @@ spec: type: string type: object type: array + x-kubernetes-list-type: atomic type: object required: - spec diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index a9f86b2713..c61a9cb70f 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/multus/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:5cb6b6572cbcdfb12f9bd636e66fc4903d788b61f3bdd7602c780ac4bcaa1118 + digest: sha256:4bb9fdcf25dd5512c889827d0d9b96750a6c2932971fe1a32c484fc295348b5c - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8e18e55188a989e4ef899146fc8c3d7b79c1a56c22874ee73f5e7eb154eab99d + digest: sha256:c1e30563ea2a7e6896a0c257b1d987db8e437193a418452781e7ae51f0c39fed diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 1a290829b6..fac8d75db0 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/multus/kustomization.x86_64.yaml @@ -2,7 +2,7 @@ images: - name: multus-cni-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:02259cfe48802196291cbbb55232ee514388eed26bfe2bd88d099f83eb23f776 + digest: sha256:55fb4277c7e47714415e9773001aee43b3af0f1314970bbd33d1a691662eb147 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:daaad0fa7d8a501c99af9f68771d805d5ddab3265c6cf3fb2b92c66a6cc9bce5 + digest: sha256:f61173b3cd88c95d6bd2b93538a9bc8ec8520b00d17387678e383d0133ff6660 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index e02617b173..0f29e7af14 100644 --- a/assets/optional/multus/release-multus-aarch64.json +++ b/assets/optional/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-08-12-210753" + "base": "4.18.0-0.nightly-arm64-2024-08-28-220210" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5cb6b6572cbcdfb12f9bd636e66fc4903d788b61f3bdd7602c780ac4bcaa1118", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e18e55188a989e4ef899146fc8c3d7b79c1a56c22874ee73f5e7eb154eab99d" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bb9fdcf25dd5512c889827d0d9b96750a6c2932971fe1a32c484fc295348b5c", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1e30563ea2a7e6896a0c257b1d987db8e437193a418452781e7ae51f0c39fed" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 66ecad49a6..086bca7242 100644 --- a/assets/optional/multus/release-multus-x86_64.json +++ b/assets/optional/multus/release-multus-x86_64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.17.0-0.nightly-2024-08-09-031511" + "base": "4.18.0-0.nightly-2024-08-29-020346" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02259cfe48802196291cbbb55232ee514388eed26bfe2bd88d099f83eb23f776", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:daaad0fa7d8a501c99af9f68771d805d5ddab3265c6cf3fb2b92c66a6cc9bce5" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55fb4277c7e47714415e9773001aee43b3af0f1314970bbd33d1a691662eb147", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f61173b3cd88c95d6bd2b93538a9bc8ec8520b00d17387678e383d0133ff6660" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 14115787db..5fcdf78af2 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f + digest: sha256:44e1ceccd8f290ffcfd530c2da7cc2290f9bb85ab82db24119ea6c435082a867 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d + digest: sha256:b16133031bc34573613287686d175b0decd68169a337742256b577f8bcaaa7f8 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612 + digest: sha256:c08965f728f1b7e2e11a218f27e78fe37b1317120d324ad6f7f84917282c51c2 patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b16133031bc34573613287686d175b0decd68169a337742256b577f8bcaaa7f8 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44e1ceccd8f290ffcfd530c2da7cc2290f9bb85ab82db24119ea6c435082a867 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index aab966ef93..740c8f14f6 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485 + digest: sha256:f0c638da04bdf6a82521cf501523325af1e3c92c7ccc00287614f26477e521b1 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410 + digest: sha256:3dcbde79ffab694672adb11b955a42b18588826ac450dad43116977716540813 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18 + digest: sha256:756b2dfcafd33286f162a6e80a78e9006ec595d7d752c31d2f007be06564a84b patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dcbde79ffab694672adb11b955a42b18588826ac450dad43116977716540813 - op: add path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0c638da04bdf6a82521cf501523325af1e3c92c7ccc00287614f26477e521b1 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 826fe98797..3c2051b1ea 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-arm64-2024-08-12-210753" + "base": "4.18.0-0.nightly-arm64-2024-08-28-220210" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12dc8a627bffff0cf245b05d8404bcba1988b358ee00cd9f25fe2ad5d2eab83f", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96d031f82daf9fbbeb6d9f82afe90ba1a7cf404eab35a6a0a9ab436d0095050d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9520964f43a9244f072af5a55fd2877d4830709772e8cdcaf5ab078f792b2612" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44e1ceccd8f290ffcfd530c2da7cc2290f9bb85ab82db24119ea6c435082a867", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b16133031bc34573613287686d175b0decd68169a337742256b577f8bcaaa7f8", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c08965f728f1b7e2e11a218f27e78fe37b1317120d324ad6f7f84917282c51c2" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index a2e17f733a..9f1435394a 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.17.0-0.nightly-2024-08-09-031511" + "base": "4.18.0-0.nightly-2024-08-29-020346" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0c638da04bdf6a82521cf501523325af1e3c92c7ccc00287614f26477e521b1", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3dcbde79ffab694672adb11b955a42b18588826ac450dad43116977716540813", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:756b2dfcafd33286f162a6e80a78e9006ec595d7d752c31d2f007be06564a84b" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f94dd9d963..1997168e64 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-28-220210" }, "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:80dad27aeb2e552562a627be557704d33d30ba0dba197b26fd400a4f9e74350a", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e436b14c96dba6250760cac79f4cdb948bd9a1e0fc144b3b6b5ef88ce920c7b", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ba5edd4d6d94dc96d1bf366762e0ee5c8f19c8757673baa17c6f3d522836a407", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c08965f728f1b7e2e11a218f27e78fe37b1317120d324ad6f7f84917282c51c2", "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:815e559cefa805b92c018e45e1029ac9b0b2cd0ce658455ac206cb9d62fe2200", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dde00d1e697b62f24f12dd771c36eeff0342e3e27f088e3685b3e3ac8dafc0d5", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cba567281555642dbf5100ad0022f41fa5222e9e9c456a81726dafb1a4c38312", "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:812c012d8797a7dd9f2b16b749b8e7ec3452c9250f293397d7a6cdcefa786c99", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d1cd5e88ade244fab71a50e17c8e3d2d151944fd37ddc1f6da3cff94b050596" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 5b78b18fe8..b4d5d30547 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-29-020346" }, "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:88283d09f83af1bb4ce283b88a2841dabfaa49af4feed366af510b7a5dca02ad", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c6a75c9c9ec516bc20db7f2686cde5072b4608b854ae57d072357e9ec38bfdf", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5adcb7b4fee01cc4a6436eb27a6c2b7c88e63d1421b559598083add33a34e52", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:756b2dfcafd33286f162a6e80a78e9006ec595d7d752c31d2f007be06564a84b", "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:6dd981fd6e2624220c1047f11782c563f0b47788aef985b19bb27201013839c4", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd8e46d497df5e239c5700ac322fc6e802c17bc92d0c2487f159f91b81c641ab", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae6043c154ee3197f4d5a696efb9b6111dd4815275db1ec90e5724d2eabfffd1", "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:f5636cf3df8acf8e45496971300c8e3a5e6364c621ca819ccce2b471c3d17431", + "csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37f0c6260ccaa5bcc7bfaf1751d3f186726275a200bbedfb1aa9689b41aa851e" } } From 10056cf88c0af9d35018122e69c8cbec7cfddec2 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:09:35 +0200 Subject: [PATCH 11/17] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index 8808a1f4d1..2b8910c7f3 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=30 KUBE_GIT_VERSION=v1.30.3 -KUBE_GIT_COMMIT=43740e9179f50acbf24f0c597f78fa9abd121c96 +KUBE_GIT_COMMIT=a092ee7d2b3514278dbbcbd47d87fde356c9b0ec KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b06752aef1..4c57f1aebd 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-12-210753 +OCP_VERSION := 4.18.0-0.nightly-arm64-2024-08-28-220210 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index de7eb2cf2b..cd059e69d0 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.17.0-0.nightly-2024-08-09-031511 +OCP_VERSION := 4.18.0-0.nightly-2024-08-29-020346 From e7339ae736998944aedaf2406d58d549ab2767d3 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:29:10 +0200 Subject: [PATCH 12/17] Bump cri-tools, keep cri-o version The RHOCP mirror doesn't have the cri-o 1.31 yet --- packaging/rpm/microshift.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec index b435eee962..807c3496f0 100644 --- a/packaging/rpm/microshift.spec +++ b/packaging/rpm/microshift.spec @@ -62,7 +62,7 @@ BuildRequires: golang # DO NOT REMOVE Requires: cri-o >= 1.30.0, cri-o < 1.31.0 -Requires: cri-tools >= 1.30.0, cri-tools < 1.31.0 +Requires: cri-tools >= 1.31.0, cri-tools < 1.32.0 Requires: iptables Requires: microshift-selinux = %{version} Requires: microshift-networking = %{version} From 5a053c4f76cb6651a6dfcdb7cdc30773a2c7ff0d Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:29:40 +0200 Subject: [PATCH 13/17] Remove rhel92 and rhel93 for Y-2, 4.16 supports rhel94 --- .../group2/rhel92-microshift-yminus2.toml | 60 ------------------- ...s2.toml => rhel94-microshift-yminus2.toml} | 6 +- .../el92-yminus2@el94-crel@upgrade-ok.sh | 18 ------ .../el93-yminus2@el94-crel@upgrade-ok.sh | 18 ------ ...sh => el94-yminus2@el94-src@upgrade-ok.sh} | 4 +- ...sh => el94-yminus2@el94-src@upgrade-ok.sh} | 4 +- 6 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 test/image-blueprints/layer1-base/group2/rhel92-microshift-yminus2.toml rename test/image-blueprints/layer1-base/group2/{rhel93-microshift-yminus2.toml => rhel94-microshift-yminus2.toml} (89%) delete mode 100644 test/scenarios/periodics/el92-yminus2@el94-crel@upgrade-ok.sh delete mode 100644 test/scenarios/periodics/el93-yminus2@el94-crel@upgrade-ok.sh rename test/scenarios/periodics/{el93-yminus2@el94-src@upgrade-ok.sh => el94-yminus2@el94-src@upgrade-ok.sh} (79%) rename test/scenarios/presubmits/{el92-yminus2@el94-src@upgrade-ok.sh => el94-yminus2@el94-src@upgrade-ok.sh} (79%) diff --git a/test/image-blueprints/layer1-base/group2/rhel92-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel92-microshift-yminus2.toml deleted file mode 100644 index 5197d55743..0000000000 --- a/test/image-blueprints/layer1-base/group2/rhel92-microshift-yminus2.toml +++ /dev/null @@ -1,60 +0,0 @@ -name = "rhel-9.2-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}" -description = "RHEL 9.2 with MicroShift from two minor versions back installed." -version = "0.0.1" -modules = [] -groups = [] -distro = "rhel-92" - -[[packages]] -name = "microshift" -version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-greenboot" -version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-networking" -version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-selinux" -version = "{{ .Env.YMINUS2_RELEASE_VERSION }}*" - -[[packages]] -name = "microshift-test-agent" -version = "*" - -[customizations.services] -enabled = ["microshift", "microshift-test-agent"] - -[customizations.firewall] -ports = ["22:tcp", "80:tcp", "443:tcp", "5353:udp", "6443:tcp", "30000-32767:tcp", "30000-32767:udp"] - -[customizations.firewall.services] -enabled = ["mdns", "ssh", "http", "https"] - -[[customizations.firewall.zones]] -name = "trusted" -sources = ["10.42.0.0/16", "169.254.169.1"] - -[[customizations.files]] -path = "/etc/crio/crio.conf.d/00-crio-crun.yaml" -data = """ -[crio.runtime.runtimes.crun] -runtime_path = "" -runtime_type = "oci" -runtime_root = "/run/crun" -runtime_config_path = "" -monitor_path = "" -""" - -# Extend Greenboot wait timeout to 10m for MicroShift to be ready. -# Greenboot configuration must come after RPM install to avoid -# /etc/greenboot/greenboot.conf overwrite by the package update. -[[customizations.files]] -path = "/etc/greenboot/greenboot.conf" -data = """ -GREENBOOT_WATCHDOG_CHECK_ENABLED=true -MICROSHIFT_WAIT_TIMEOUT_SEC=600 -""" diff --git a/test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml b/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml similarity index 89% rename from test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml rename to test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml index e348f33d04..f89f043e95 100644 --- a/test/image-blueprints/layer1-base/group2/rhel93-microshift-yminus2.toml +++ b/test/image-blueprints/layer1-base/group2/rhel94-microshift-yminus2.toml @@ -1,9 +1,9 @@ -name = "rhel-9.3-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}" -description = "RHEL 9.3 with MicroShift from two minor versions back installed." +name = "rhel-9.4-microshift-4.{{ .Env.YMINUS2_MINOR_VERSION }}" +description = "RHEL 9.4 with MicroShift from two minor versions back installed." version = "0.0.1" modules = [] groups = [] -distro = "rhel-93" +distro = "rhel-94" [[packages]] name = "microshift" diff --git a/test/scenarios/periodics/el92-yminus2@el94-crel@upgrade-ok.sh b/test/scenarios/periodics/el92-yminus2@el94-crel@upgrade-ok.sh deleted file mode 100644 index ffe370b346..0000000000 --- a/test/scenarios/periodics/el92-yminus2@el94-crel@upgrade-ok.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${YMINUS2_MINOR_VERSION}" - launch_vm host1 rhel-9.2 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel-9.4-microshift-crel" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios/periodics/el93-yminus2@el94-crel@upgrade-ok.sh b/test/scenarios/periodics/el93-yminus2@el94-crel@upgrade-ok.sh deleted file mode 100644 index 4963318c06..0000000000 --- a/test/scenarios/periodics/el93-yminus2@el94-crel@upgrade-ok.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Sourced from scenario.sh and uses functions defined there. - -scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.3-microshift-4.${YMINUS2_MINOR_VERSION}" - launch_vm host1 rhel-9.3 -} - -scenario_remove_vms() { - remove_vm host1 -} - -scenario_run_tests() { - run_tests host1 \ - --variable "TARGET_REF:rhel-9.4-microshift-crel" \ - suites/upgrade/upgrade-successful.robot -} diff --git a/test/scenarios/periodics/el93-yminus2@el94-src@upgrade-ok.sh b/test/scenarios/periodics/el94-yminus2@el94-src@upgrade-ok.sh similarity index 79% rename from test/scenarios/periodics/el93-yminus2@el94-src@upgrade-ok.sh rename to test/scenarios/periodics/el94-yminus2@el94-src@upgrade-ok.sh index f9b547f6ff..801d641e4a 100644 --- a/test/scenarios/periodics/el93-yminus2@el94-src@upgrade-ok.sh +++ b/test/scenarios/periodics/el94-yminus2@el94-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.3-microshift-4.${YMINUS2_MINOR_VERSION}" - launch_vm host1 rhel-9.3 + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${YMINUS2_MINOR_VERSION}" + launch_vm host1 rhel-9.4 } scenario_remove_vms() { diff --git a/test/scenarios/presubmits/el92-yminus2@el94-src@upgrade-ok.sh b/test/scenarios/presubmits/el94-yminus2@el94-src@upgrade-ok.sh similarity index 79% rename from test/scenarios/presubmits/el92-yminus2@el94-src@upgrade-ok.sh rename to test/scenarios/presubmits/el94-yminus2@el94-src@upgrade-ok.sh index aa054477a9..801d641e4a 100644 --- a/test/scenarios/presubmits/el92-yminus2@el94-src@upgrade-ok.sh +++ b/test/scenarios/presubmits/el94-yminus2@el94-src@upgrade-ok.sh @@ -3,8 +3,8 @@ # Sourced from scenario.sh and uses functions defined there. scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template "rhel-9.2-microshift-4.${YMINUS2_MINOR_VERSION}" - launch_vm host1 rhel-9.2 + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${YMINUS2_MINOR_VERSION}" + launch_vm host1 rhel-9.4 } scenario_remove_vms() { From 5e8b5c0314cd679c5dd8081496467e4439eeb95c Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:30:20 +0200 Subject: [PATCH 14/17] Update common_version.sh --- test/bin/common_versions.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/test/bin/common_versions.sh b/test/bin/common_versions.sh index 46c7679987..7707239bb2 100644 --- a/test/bin/common_versions.sh +++ b/test/bin/common_versions.sh @@ -36,7 +36,7 @@ get_vrel_from_rhsm() { # The current release minor version (e.g. '17' for '4.17') affects # the definition of previous and fake next versions. -export MINOR_VERSION=17 +export MINOR_VERSION=18 export PREVIOUS_MINOR_VERSION=$(( "${MINOR_VERSION}" - 1 )) export YMINUS2_MINOR_VERSION=$(( "${MINOR_VERSION}" - 2 )) export FAKE_NEXT_MINOR_VERSION=$(( "${MINOR_VERSION}" + 1 )) @@ -47,8 +47,8 @@ export FAKE_NEXT_MINOR_VERSION=$(( "${MINOR_VERSION}" + 1 )) # # For a release branch, the current release repository should come from the # official 'rhocp' stream. -CURRENT_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp-dev-preview/latest-4.17/el9/os" -CURRENT_RELEASE_VERSION="$(get_vrel_from_beta "${CURRENT_RELEASE_REPO}")" +CURRENT_RELEASE_REPO="" #"https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp-dev-preview/latest-4.18/el9/os" +CURRENT_RELEASE_VERSION="" #"$(get_vrel_from_beta "${CURRENT_RELEASE_REPO}")" export CURRENT_RELEASE_REPO export CURRENT_RELEASE_VERSION @@ -62,13 +62,13 @@ export CURRENT_RELEASE_VERSION # # For a release branch, the previous release repository should come from the # official 'rhocp' stream. -PREVIOUS_RELEASE_REPO="rhocp-4.16-for-rhel-9-$(uname -m)-rpms" -PREVIOUS_RELEASE_VERSION="$(get_vrel_from_rhsm "${PREVIOUS_RELEASE_REPO}")" +PREVIOUS_RELEASE_REPO="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/microshift/ocp/latest-4.17/el9/os" +PREVIOUS_RELEASE_VERSION="$(get_vrel_from_beta "${PREVIOUS_RELEASE_REPO}")" export PREVIOUS_RELEASE_REPO export PREVIOUS_RELEASE_VERSION # The y-2 release repository value should always contain the 'rhocp' repository name. -YMINUS2_RELEASE_REPO="rhocp-4.15-for-rhel-9-$(uname -m)-rpms" +YMINUS2_RELEASE_REPO="rhocp-4.16-for-rhel-9-$(uname -m)-rpms" YMINUS2_RELEASE_VERSION="$(get_vrel_from_rhsm "${YMINUS2_RELEASE_REPO}")" export YMINUS2_RELEASE_REPO export YMINUS2_RELEASE_VERSION @@ -77,16 +77,18 @@ export YMINUS2_RELEASE_VERSION # If the release version is defined, the repository should be deduced from the # CURRENT_RELEASE_REPO setting. RHOCP_MINOR_Y="" -RHOCP_MINOR_Y_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.17-el9-beta/" +RHOCP_MINOR_Y_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.18-el9-beta/" export RHOCP_MINOR_Y export RHOCP_MINOR_Y_BETA # Define either a release version or the OpenShift mirror beta repository URL. # If the release version is defined, the repository should be deduced from the # PREVIOUS_RELEASE_REPO setting. -export RHOCP_MINOR_Y1=16 -export RHOCP_MINOR_Y1_BETA="" +RHOCP_MINOR_Y1="" +RHOCP_MINOR_Y1_BETA="https://mirror.openshift.com/pub/openshift-v4/$(uname -m)/dependencies/rpms/4.17-el9-beta/" +export RHOCP_MINOR_Y1 +export RHOCP_MINOR_Y1_BETA # Define a release version as it is not expected to use the OpenShift mirror # for the y-2 release. -export RHOCP_MINOR_Y2=15 +export RHOCP_MINOR_Y2=16 From 51ab139d3a78dd32bd75d4834b6faeaba0ce10c7 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:30:34 +0200 Subject: [PATCH 15/17] Don't run scenarios with CREL if it doesn't exist --- .../el94-crel@el94-src@optional-upgrade.sh | 16 +++++++++++++++- .../periodics/el94-crel@el94-src@upgrade-ok.sh | 16 +++++++++++++++- .../periodics/el94-prel@el94-crel@upgrade-ok.sh | 17 ++++++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/test/scenarios/periodics/el94-crel@el94-src@optional-upgrade.sh b/test/scenarios/periodics/el94-crel@el94-src@optional-upgrade.sh index bcbc6b02ab..979ac33b44 100644 --- a/test/scenarios/periodics/el94-crel@el94-src@optional-upgrade.sh +++ b/test/scenarios/periodics/el94-crel@el94-src@optional-upgrade.sh @@ -2,16 +2,30 @@ # Sourced from scenario.sh and uses functions defined there. +start_commit=rhel-9.4-microshift-crel-optionals + scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-crel-optionals + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi + prepare_kickstart host1 kickstart.ks.template "${start_commit}" launch_vm host1 rhel-9.4 } scenario_remove_vms() { + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi remove_vm host1 } scenario_run_tests() { + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi run_tests host1 \ --variable "TARGET_REF:rhel-9.4-microshift-source-optionals" \ suites/upgrade/upgrade-multus.robot diff --git a/test/scenarios/periodics/el94-crel@el94-src@upgrade-ok.sh b/test/scenarios/periodics/el94-crel@el94-src@upgrade-ok.sh index 7247a37bcd..86ea708c4f 100644 --- a/test/scenarios/periodics/el94-crel@el94-src@upgrade-ok.sh +++ b/test/scenarios/periodics/el94-crel@el94-src@upgrade-ok.sh @@ -2,16 +2,30 @@ # Sourced from scenario.sh and uses functions defined there. +start_commit=rhel-9.4-microshift-crel + scenario_create_vms() { - prepare_kickstart host1 kickstart.ks.template rhel-9.4-microshift-crel + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi + prepare_kickstart host1 kickstart.ks.template "${start_commit}" launch_vm host1 rhel-9.4 } scenario_remove_vms() { + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi remove_vm host1 } scenario_run_tests() { + if ! does_commit_exist "${start_commit}"; then + echo "Commit '${start_commit}' not found in ostree repo - skipping test" + return 0 + fi run_tests host1 \ --variable "TARGET_REF:rhel-9.4-microshift-source" \ suites/upgrade/upgrade-successful.robot diff --git a/test/scenarios/periodics/el94-prel@el94-crel@upgrade-ok.sh b/test/scenarios/periodics/el94-prel@el94-crel@upgrade-ok.sh index a199c1be78..9abfa7cfd5 100644 --- a/test/scenarios/periodics/el94-prel@el94-crel@upgrade-ok.sh +++ b/test/scenarios/periodics/el94-prel@el94-crel@upgrade-ok.sh @@ -2,17 +2,32 @@ # Sourced from scenario.sh and uses functions defined there. +target_commit=rhel-9.4-microshift-crel + scenario_create_vms() { + if ! does_commit_exist "${target_commit}"; then + echo "Commit '${target_commit}' not found in ostree repo - skipping test" + return 0 + fi + prepare_kickstart host1 kickstart.ks.template "rhel-9.4-microshift-4.${PREVIOUS_MINOR_VERSION}" launch_vm host1 } scenario_remove_vms() { + if ! does_commit_exist "${target_commit}"; then + echo "Commit '${target_commit}' not found in ostree repo - skipping test" + return 0 + fi remove_vm host1 } scenario_run_tests() { + if ! does_commit_exist "${target_commit}"; then + echo "Commit '${target_commit}' not found in ostree repo - skipping test" + return 0 + fi run_tests host1 \ - --variable "TARGET_REF:rhel-9.4-microshift-crel" \ + --variable "TARGET_REF:${target_commit}" \ suites/upgrade/upgrade-successful.robot } From 363e0fd53a1b8e7a379384b8742e7d9a050a4735 Mon Sep 17 00:00:00 2001 From: Patryk Matuszak Date: Thu, 29 Aug 2024 11:30:43 +0200 Subject: [PATCH 16/17] Enable more repos for rpm-install test --- .../presubmits/el94-src@rpm-install.sh | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/test/scenarios/presubmits/el94-src@rpm-install.sh b/test/scenarios/presubmits/el94-src@rpm-install.sh index 6707f54d09..d2f1ff9bb0 100644 --- a/test/scenarios/presubmits/el94-src@rpm-install.sh +++ b/test/scenarios/presubmits/el94-src@rpm-install.sh @@ -13,6 +13,28 @@ export SKIP_GREENBOOT=true # did not want to spend the resources on a new VM. export TEST_RANDOMIZATION=none +configure_microshift_mirror() { + local -r repo=$1 + + # `repo` might be empty if we install microshift from rhocp + if [[ -z "${repo}" ]] ; then + return + fi + + local -r tmp_file=$(mktemp) + tee "${tmp_file}" >/dev/null < Date: Thu, 29 Aug 2024 11:31:32 +0200 Subject: [PATCH 17/17] Update `jq` in WP suite because of cri-tools fix in 1.31 The fix causes `crictl inspect` with multiple args to output a valid json array, instead of bunch of json objects. --- test/suites/tuned/workload-partitioning.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/suites/tuned/workload-partitioning.robot b/test/suites/tuned/workload-partitioning.robot index 35b16048db..0bdeafabdd 100644 --- a/test/suites/tuned/workload-partitioning.robot +++ b/test/suites/tuned/workload-partitioning.robot @@ -161,7 +161,7 @@ Get Json From Crio Output END ${stdout} ${stderr} ${rc}= Execute Command - ... crictl ps -q | xargs sudo crictl inspect | jq -rs '[.[] | select(.info.runtimeSpec.annotations["target.workload.openshift.io/management"] ${NOT_WORKLOADS})]' + ... crictl ps -q | xargs sudo crictl inspect | jq -rs '[.[][] | select(.info.runtimeSpec.annotations["target.workload.openshift.io/management"] ${NOT_WORKLOADS})]' ... sudo=True ... return_stdout=True ... return_stderr=True @@ -175,7 +175,7 @@ Crio Save Pod Manifest ${path}= Create Random Temp File Set Global Variable ${DEBUG_OUTPUT_FILE} ${path} ${stdout} ${stderr} ${rc}= Execute Command - ... crictl ps -q | xargs sudo crictl inspect | jq -rs '[.[] | select(.status.id=="${pod_id}")]' >${DEBUG_OUTPUT_FILE} 2>&1 + ... crictl ps -q | xargs sudo crictl inspect | jq -rs '[.[][] | select(.status.id=="${pod_id}")]' >${DEBUG_OUTPUT_FILE} 2>&1 ... sudo=True ... return_stdout=True ... return_stderr=True