Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-11-144244_amd64-2024-11-11_arm64-2024-11-11 #4169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 4 commits into from
Nov 12, 2024
Merged

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-11-144244_amd64-2024-11-11_arm64-2024-11-11 #4169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcb26a9
update last_rebase.sh
Nov 12, 2024
25aaf7e
update changelog
Nov 12, 2024
a38c925
update manifests
Nov 12, 2024
34125dc
update buildfiles
Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-10-184114
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-11-191251
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.18.0-0.nightly-2024-11-10-133523
OCP_VERSION := 4.18.0-0.nightly-2024-11-11-144244
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
"base": "4.18.0-0.nightly-arm64-2024-11-11-191251"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-10-133523"
"base": "4.18.0-0.nightly-2024-11-11-144244"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902",
Expand Down
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
digest: sha256:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
digest: sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4
Expand All @@ -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:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
- 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:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
digest: sha256:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
digest: sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81
Expand All @@ -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:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
- 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:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
"base": "4.18.0-0.nightly-arm64-2024-11-11-191251"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4"
}
}
6 changes: 3 additions & 3 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-10-133523"
"base": "4.18.0-0.nightly-2024-11-11-144244"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
"base": "4.18.0-0.nightly-arm64-2024-11-11-191251"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50c645fde15c60d0738dc9c51c498ca0ca5032db57982f8c13f3bfbc42014021",
Expand Down
2 changes: 1 addition & 1 deletion assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-10-133523"
"base": "4.18.0-0.nightly-2024-11-11-144244"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7186ff2cc5b5580a686b5f80389cbb9310088ab2036241236f2ff6dafcf3145",
Expand Down
63 changes: 3 additions & 60 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,4 @@
- api embedded-component dfe4d9fc5cef45bc0ea563cba3a7d1c9515a36b5 to a2817b89f7e0989016967055a142d5e88bed18de
- a5347b6 2024-11-08T18:31:46+01:00 Add OperatorLifecycleManagerV1 cluster version capability
- 424692f 2024-11-08T13:59:04+01:00 CONSOLE-4265: Add new API field to ConsolePlugin CRD for allowing additional CSP sources
- 565c25d 2024-11-07T15:57:03+01:00 Bump OLM resource to operatov1
- 29f8c34 2024-11-06T06:03:30-08:00 Power VS: Run make update and make verify
- 6e64326 2024-11-05T17:10:38-08:00 Power VS: Fix Service Endpoint validation
- 9d54824 2024-10-29T15:52:51-04:00 make update
- 299a603 2024-10-29T15:20:08-04:00 enable ManagedBootImagesAWS

- cluster-kube-apiserver-operator embedded-component 9bde41c029ca3999d1b2030124b93741d7a4d406 to 6f57eb351e819e5d89564661783f953bf84cb43b
- 1c0e5ff 2024-11-05T13:43:01+01:00 Enable VolumesAttributesClass API in kube-apiserver

- cluster-network-operator embedded-component fff6ea5e6f9e070ffa3a7e90a33eac03b7da217e to c08eeb28481ac598774ad51c2be03d2e748f74e0
- 94a0950 2024-11-07T12:44:52+01:00 Provide support for user owned IPsec machine configs
- 128bc71 2024-10-29T15:44:29+08:00 Pass transit_switch_subnet options in ovnkube-node pod

- kubernetes embedded-component b903dd22e38b8e6d3eefac0798cfb86295d26fab to e7a7a8d687079e02b36a459284a85cdb27f68e1e
- 1140fa4fd 2024-11-07T22:37:56+05:30 UPSTREAM: <carry>: Remove ValidateHostExternalCertificate from route admission
- 31761e83e 2024-11-07T22:34:31+05:30 UPSTREAM: <drop>: bump openshift/library-go@0064ad7
- f7a6af325 2024-11-05T07:14:11-05:00 UPSTREAM: <carry>: Bump kube-proxy image to 4.18 base images
- 90712ae66 2024-10-18T15:43:23-04:00 UPSTREAM: <carry>: Fix default skips in test-kubernetes-e2e.sh
- 988724b03 2024-10-18T15:43:10-04:00 UPSTREAM: <carry>: Drop openshift-sdn-specific skips

- machine-config-operator embedded-component c3ea34361f8418343b48dc43c03065742c0f72a7 to 518286cf32fc743a235397a2e85a57506acc2401
- 8b16347f 2024-11-07T10:02:09-05:00 API bump for ManagedBootImagesAWS
- 9d8fec83 2024-11-04T10:20:02-05:00 add multi arch builder images

- operator-framework-olm embedded-component 8459ce13c0feca2a5139b62589f2467cca373b04 to 562dbf8dc413cdaf6cee91ae28f065b66a2734fe
- 01fd09a5 2024-11-09T00:48:20+00:00 build(deps): bump k8s.io/kube-aggregator from 0.31.1 to 0.31.2 (#3431)
- 2eb75919 2024-11-09T00:47:16+00:00 build(deps): bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#3433)

- oc image-amd64 4309021b5c670048cd15b00e6d823413bbae3659 to 5110357c067c5933e75604504f1521927ccaaf27
- 140fe773 2024-11-06T12:27:51-08:00 pkg/cli/admin/upgrade: Propagate --force for --to-multi-arch
- f2f8f3f4 2024-11-06T10:01:43-08:00 pkg/cli/admin/upgrade: Error on --to-multi-arch with --to-latest

- router image-amd64 e05cf92d31b1ee0c1774229072143f3a694e54ea to 6c988a565350d9599c5aa1d835bdb69739cea2c6
- 8a9230d 2024-11-05T17:57:41+01:00 NE-1815: Activate dynamic cookies for dynamic server slots (DCM)

- ovn-kubernetes image-amd64 c3dc7d42c893a307fc89bd187b9cb045e0b106f2 to e3c68e24bd9bbd83dbf7409a8c1414e72a334680
- 38be918f 2024-11-04T07:27:32-08:00 OKD-227: bump ovn version to 24.09.0-41 for OKD

- kubernetes image-amd64 b903dd22e38b8e6d3eefac0798cfb86295d26fab to e7a7a8d687079e02b36a459284a85cdb27f68e1e
- 1140fa4fd 2024-11-07T22:37:56+05:30 UPSTREAM: <carry>: Remove ValidateHostExternalCertificate from route admission
- 31761e83e 2024-11-07T22:34:31+05:30 UPSTREAM: <drop>: bump openshift/library-go@0064ad7
- f7a6af325 2024-11-05T07:14:11-05:00 UPSTREAM: <carry>: Bump kube-proxy image to 4.18 base images
- 90712ae66 2024-10-18T15:43:23-04:00 UPSTREAM: <carry>: Fix default skips in test-kubernetes-e2e.sh
- 988724b03 2024-10-18T15:43:10-04:00 UPSTREAM: <carry>: Drop openshift-sdn-specific skips

- oc image-arm64 4309021b5c670048cd15b00e6d823413bbae3659 to 5110357c067c5933e75604504f1521927ccaaf27
- 140fe773 2024-11-06T12:27:51-08:00 pkg/cli/admin/upgrade: Propagate --force for --to-multi-arch
- f2f8f3f4 2024-11-06T10:01:43-08:00 pkg/cli/admin/upgrade: Error on --to-multi-arch with --to-latest

- router image-arm64 e05cf92d31b1ee0c1774229072143f3a694e54ea to 6c988a565350d9599c5aa1d835bdb69739cea2c6
- 8a9230d 2024-11-05T17:57:41+01:00 NE-1815: Activate dynamic cookies for dynamic server slots (DCM)

- kubernetes image-arm64 960cb692b229012f1240ef702a41ea4aaa036944 to e7a7a8d687079e02b36a459284a85cdb27f68e1e
- 1140fa4fd 2024-11-07T22:37:56+05:30 UPSTREAM: <carry>: Remove ValidateHostExternalCertificate from route admission
- 31761e83e 2024-11-07T22:34:31+05:30 UPSTREAM: <drop>: bump openshift/library-go@0064ad7
- 90712ae66 2024-10-18T15:43:23-04:00 UPSTREAM: <carry>: Fix default skips in test-kubernetes-e2e.sh
- 988724b03 2024-10-18T15:43:10-04:00 UPSTREAM: <carry>: Drop openshift-sdn-specific skips
- operator-framework-olm embedded-component 562dbf8dc413cdaf6cee91ae28f065b66a2734fe to 7f5600b3d466ca4b02e314acf98aac1588a06663
- 909e9d8e 2024-11-11T00:28:11+00:00 build(deps): bump github.com/prometheus/client_golang (#3417)
- 1329e88b 2024-11-11T00:26:03+00:00 build(deps): bump github.com/onsi/ginkgo/v2 from 2.20.2 to 2.21.0 (#3432)

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ https://github.com/openshift/kubernetes embedded-component e7a7a8d687079e02b36a4
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component 518286cf32fc743a235397a2e85a57506acc2401
https://github.com/openshift/openshift-controller-manager embedded-component 3ebe2f4f3900d6a3748ef0faf3535f635dbf7d11
https://github.com/openshift/operator-framework-olm embedded-component 562dbf8dc413cdaf6cee91ae28f065b66a2734fe
https://github.com/openshift/operator-framework-olm embedded-component 7f5600b3d466ca4b02e314acf98aac1588a06663
https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-amd64 5110357c067c5933e75604504f1521927ccaaf27
Expand Down
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-11-10-133523" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-10-184114"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-11-11-144244" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-11-11-191251"