Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-08-09-031511_amd64-2024-08-09_arm64-2024-08-10 #3753

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

Closed
microshift-rebase-script wants to merge 4 commits into from
Closed

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-08-09-031511_amd64-2024-08-09_arm64-2024-08-10 #3753

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
d01897e
update last_rebase.sh
Aug 12, 2024
170e80a
update changelog
Aug 12, 2024
6a5dae2
update manifests
Aug 12, 2024
7850d96
update buildfiles
Aug 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.17.0-0.nightly-arm64-2024-08-09-003150
OCP_VERSION := 4.17.0-0.nightly-arm64-2024-08-10-022343
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.17.0-0.nightly-2024-08-08-013133
OCP_VERSION := 4.17.0-0.nightly-2024-08-09-031511
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.17.0-0.nightly-arm64-2024-08-09-003150"
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6d51d2275cd9649c7f7c1a44ff50e6bfc02aa5eee391419320fb6460e5d662c",
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.17.0-0.nightly-2024-08-08-013133"
"base": "4.17.0-0.nightly-2024-08-09-031511"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02259cfe48802196291cbbb55232ee514388eed26bfe2bd88d099f83eb23f776",
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:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21
digest: sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6
digest: sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec
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:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b
- 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:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc
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:df7ed04a549d96a65ac60a695510df406ea879992bbb706ecb8f1c872bdb8f64
digest: sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:abed724148986650a5214ca8833d907eb96a3e344b2eeab31e8d312e0e0b7d3a
digest: sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:df47aabf5cd84f98c4c420a4c1cae56225e47907d4370dcab60a0108ad33cd18
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:abed724148986650a5214ca8833d907eb96a3e344b2eeab31e8d312e0e0b7d3a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fd976f5f4982535c7ab0ea3346d1d8c785ec7caa5fb6dae2e240b45dbdb8410
- 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:df7ed04a549d96a65ac60a695510df406ea879992bbb706ecb8f1c872bdb8f64
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:364296a51d5c167c141ac5ad9e99210de08d3432cc20ab65f5017cdb6ba1f485
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.17.0-0.nightly-arm64-2024-08-09-003150"
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b855ba9ba47dac0d2357ff5bf5c9e8f80244c26f0cb9b75053f2bdfc3db1d21",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f9d31442e1fd3199d95015c919dd93f5da35f0a0a880a207bc2ef950e2ef5d6",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56a79e3da867ae0117c52fc831764340f913171d8f1480961318be0d6f81c9fc",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f275836bca0b98a7803150fcaf6c9bdb609f9cacc0959a3ba63af9dcd85e790b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec"
}
}
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.17.0-0.nightly-2024-08-08-013133"
"base": "4.17.0-0.nightly-2024-08-09-031511"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df7ed04a549d96a65ac60a695510df406ea879992bbb706ecb8f1c872bdb8f64",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abed724148986650a5214ca8833d907eb96a3e344b2eeab31e8d312e0e0b7d3a",
"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"
}
}
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2024-08-09-003150"
"base": "4.17.0-0.nightly-arm64-2024-08-10-022343"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:264c08c3597e082462bf0056dcd893a7543136ada9898a9775da4ec605535e8e",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d274a61aeb647111f90640820adcae819e554aa0b3fb6d0f04114d418be0a58",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7ac1f05360374948723b6d485d2d060576cce5f76cb02165ac534bd6e74c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7579bf3d6ccbe63615ad7286d39655844de37be42c91ad44f14512acfd488208",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc35935b69ef2bb23681365232199b386cb690cf0ce9489fa6cfb02ffeca9fe8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:811dd223cabc58775a85c53d1803c0c279de66eb0fb57c4bdfe69098161a64ec",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b33fcd7435f4bd91e3d72e2ac1d9ebf79f1e02e720d8dfe4629105e1b4373ff",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-2024-08-08-013133"
"base": "4.17.0-0.nightly-2024-08-09-031511"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6d64b46692c53d389eb31ae7bd6a1b4768ecef85ae2e88c044f85b57accc950b",
"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",
Expand Down
31 changes: 30 additions & 1 deletion scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
- oc image-arm64 c2b6a626630692cead9c1fd0021e0b205ea033e6 to 535bf8e3ba0965d64070bd6109bb5de332f670b3
- 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

- cluster-ingress-operator embedded-component 338435581ef8ffeaa793d5acdbebf3dbad3c6f48 to 7cf86c7c749fa62b9cffd9a62275e33a4083985e
- 2639954 2024-08-07T12:41:52-04:00 Bump controller-runtime to 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

- machine-config-operator embedded-component 217f60789684c1e696c8ac9e1f974bec631ebf5e to 9c7a000be04738e98e4bae1709dad0b83af93113
- 3bb751ae 2024-08-07T11:44:50-06:00 Enabled boot image updates for AWS

- 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)

- 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

- oc image-arm64 535bf8e3ba0965d64070bd6109bb5de332f670b3 to 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf
- 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
- 1c32ae6 2024-08-07T10:01:37-04:00 Bump k8s.io/* packages to v0.30.3

16 changes: 8 additions & 8 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
https://github.com/openshift/api embedded-component 3cab566552bbc5c8ce7d11991cbc2bd1f21e1e1b
https://github.com/openshift/api embedded-component cbdcd0df43e80e4b31d1804e471828ed16fe06dc
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 338435581ef8ffeaa793d5acdbebf3dbad3c6f48
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-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 007124e56caf6a40af5d946884efb832889443c4
https://github.com/openshift/cluster-network-operator embedded-component d0ca3151c265f8c23fecdd82b9fc634e4a2c3756
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-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2
https://github.com/openshift/machine-config-operator embedded-component 217f60789684c1e696c8ac9e1f974bec631ebf5e
https://github.com/openshift/machine-config-operator embedded-component 9c7a000be04738e98e4bae1709dad0b83af93113
https://github.com/openshift/openshift-controller-manager embedded-component aabcbc2cf5d944f64e6ebdbc4e0ce7f1b95bd127
https://github.com/openshift/operator-framework-olm embedded-component 1fb6193e2a029c7134894acf788db94cbc7eebad
https://github.com/openshift/operator-framework-olm embedded-component 38181182174edf751226e1f5b988afd6baa373e4
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 c2b6a626630692cead9c1fd0021e0b205ea033e6
https://github.com/openshift/oc image-amd64 535bf8e3ba0965d64070bd6109bb5de332f670b3
https://github.com/openshift/coredns image-amd64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1
https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec
https://github.com/openshift/csi-external-snapshotter image-amd64 aa558ca4bc55238e1909119f94eaf33872a76dec
Expand All @@ -26,11 +26,11 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
https://github.com/openshift/ovn-kubernetes image-amd64 190304949659af8efca11d173682a373dac97792
https://github.com/openshift/kubernetes image-amd64 43740e9179f50acbf24f0c597f78fa9abd121c96
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 535bf8e3ba0965d64070bd6109bb5de332f670b3
https://github.com/openshift/oc image-arm64 51ca91a2e3bc21e8d3c6b1850fd1088a1d002ecf
https://github.com/openshift/coredns image-arm64 d3b441c150ccbcc0d9ebf03b8c39a730b830ddb1
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 a7313722c6e0541fcc00e92c459dd5d32a4a1534
https://github.com/openshift/router image-arm64 a33f2b6ad04f8c39b95c1839340f0e38b5c0662a
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
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.17.0-0.nightly-2024-08-08-013133" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-08-09-003150"
./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-10-022343"