Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-01-105852_amd64-2024-10-01_arm64-2024-10-01 #4005

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
merged 5 commits into from
Oct 2, 2024
Merged

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-01-105852_amd64-2024-10-01_arm64-2024-10-01 #4005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0444472
update last_rebase.sh
Oct 2, 2024
207bf11
update changelog
Oct 2, 2024
fa930ef
update component images
Oct 2, 2024
b4c2397
update manifests
Oct 2, 2024
bbaa4fa
update buildfiles
Oct 2, 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-10-01-011601
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-01-234931
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-09-30-161817
OCP_VERSION := 4.18.0-0.nightly-2024-10-01-105852
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b10e8eb8c507b1f0c630480acb9f3c82a8da74522e271a46983b50d413a20b77
digest: sha256:bf985f63a1208e9d3ee5262bebb4dd7f5d05d7469bf32f7ccf369e3ae7aa79a7
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:85489e050d3344fb6da2df273b023000fa6b574b493a49f567b17fa7e4f33086
digest: sha256:3fda7a96fb65924aac35b3041e263728726e417d90254906c988b60e69bb6c7f
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-10-01-011601"
"base": "4.18.0-0.nightly-arm64-2024-10-01-234931"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b10e8eb8c507b1f0c630480acb9f3c82a8da74522e271a46983b50d413a20b77",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85489e050d3344fb6da2df273b023000fa6b574b493a49f567b17fa7e4f33086"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf985f63a1208e9d3ee5262bebb4dd7f5d05d7469bf32f7ccf369e3ae7aa79a7",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fda7a96fb65924aac35b3041e263728726e417d90254906c988b60e69bb6c7f"
}
}
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-09-30-161817"
"base": "4.18.0-0.nightly-2024-10-01-105852"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2184410d2afe1ae682931d0e213aa8743b757440379caac425833e56f831726",
Expand Down
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1
digest: sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec
digest: sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98
digest: sha256:17d0ca830684495a0897d32b164ff794b3b8d1b96c299ae1673e08e27284400b

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380
- 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:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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-10-01-011601"
"base": "4.18.0-0.nightly-arm64-2024-10-01-234931"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c73712d57f979bb5c1f4ea54898e47697ccbc7b6c035e482330df77bbb54aec1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:55318acbbaaab5e9585be4a98359ab766590b4f0c252de579150ab7c74319fec",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17d0ca830684495a0897d32b164ff794b3b8d1b96c299ae1673e08e27284400b"
}
}
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-09-30-161817"
"base": "4.18.0-0.nightly-2024-10-01-105852"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83dc4352f3f7b395069f3ab4db6ee1b54c74b863b833f1fd69ee392f248e2afe",
Expand Down
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-10-01-011601"
"base": "4.18.0-0.nightly-arm64-2024-10-01-234931"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7900670845b19f28e6dfadfa8efb0c7111487d41690ae6ce74098ffc1c74c18a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7869c9e060124b06c4486138ed1f19fc45e7cbf8a91ffa37059d8654f36ef88",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f44f25911cdf4775490eb0242185ec084f5ed70ae32969e33203bc5d284462a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e965c8eb06a4628bff7960654b7dfad8d603bc8c9b0d8fad91c512613e4cac",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a1e4aa92a3879a8cdbfb6a7d54f5db872d0c974db63f725c5d98515a5eea58e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbc7a9e0519de2d9416c87384fc3b031f749cef398422b834dbf947edffb7896",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9baa11149c589963cf04e9253e249670e1ae8b563df253438ffa537ae6daca71",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f51077fe6238eb7b669c866b930177a2be02a695023d99afb35bfe3b5df0d7",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d008a15cee226c7bca1e6169fe86cb6d35ac5693391f9b2dc05eca9323293c36",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17d0ca830684495a0897d32b164ff794b3b8d1b96c299ae1673e08e27284400b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b6f405b910410acb7e383eaf29f57d31935bc1c6e5bd1f1a8179b773fcf187",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a974a555cc1594fe27ec89ed7f5cc2a670fc56e3218c48318b0299545d9943ac",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99196cd06d9072ae211db4ebb89f687bcac488b8a7cb717875a2477227f4e3e0",
"lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:86f0b8a3a1a699feff2d77d57b0917eaae501086b91c8ae3cbf31e5454967089",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b9ae4e6c83606ecc7bfbd0b125ff8d4089f306393d56038977caa521283c77e",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7e40d11034685172bbbd04e6f0fdd5a2a72f68ba1a37499ea8b182dc0ade6e1"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d12a6a01b873f11177bfe032fa891ce2a487dd9e65ed089d101e5e3209969af",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:add4e0bfd48f0cc7b0180b75a45b130a5a78bd88e2ded14bae6c448c4dace4e7"
}
}
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-09-30-161817"
"base": "4.18.0-0.nightly-2024-10-01-105852"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c2c63d66669138e688c5259b8180dde2bf8847c5f78e2a6850408b35a8a91b8",
Expand Down
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:7a1e4aa92a3879a8cdbfb6a7d54f5db872d0c974db63f725c5d98515a5eea58e"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a974a555cc1594fe27ec89ed7f5cc2a670fc56e3218c48318b0299545d9943ac"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
22 changes: 16 additions & 6 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,19 @@
- cluster-network-operator embedded-component 4eec256fe4565434ccf0f4b44ee74d24c40f6850 to 1773dcfb930d32b51580b1fa7158d9cbbe7b4274
- 9a56d23 2024-09-26T18:15:29+01:00 HOSTEDCP-1981: Add controlplane cli image envar for use with hypershift
- api embedded-component f89ab92f1597eaed4de5b947c1781adde2bf42fb to d67159445fc413170704f4d27d7d4b1e160efe68
- c983c1d 2024-09-26T12:00:26-04:00 RFE-6242: add OpenStackLoadBalancerParameters to ingress API

- machine-config-operator embedded-component 56346ad6c09bb86d6e4b09850dde24b076d101d9 to 8dc705d80b2ab269e6346ebb5d35783fe96c32a3
- 669db136 2024-09-23T11:57:26-04:00 openstack: fix non-old systemd compatible unit
- cluster-kube-apiserver-operator embedded-component 48d9579a5c4d0f6eb9ddbbc96cb44ccda121ce09 to 2eefd79ce2f04541296e6500be50d65dc9ba8bea
- a32a100 2024-09-30T13:43:56-04:00 update library-go for new revision controller
- 6f3ed3b 2024-09-30T13:38:03-04:00 fitting

- operator-framework-olm embedded-component fccb629eb860057467a9287b23f5f8d2295aead9 to fbd00789eda3c50c35be61d04508e2230b17bffa
- c136cee5 2024-09-29T13:27:28+00:00 Improve InstallPlan error handling (#3404)
- cluster-network-operator embedded-component 1773dcfb930d32b51580b1fa7158d9cbbe7b4274 to 70cb43b37eae06172cb88d9067d83b67e73d685e
- 2aad7d4 2024-09-30T10:26:20+02:00 Add certificatesigningrequests/watch RBAC to ovnkube-node

- machine-config-operator embedded-component 8dc705d80b2ab269e6346ebb5d35783fe96c32a3 to f9abd9d45af1028b03ba00fadf5053523a2d7e4f
- 3390cf8a 2024-08-28T15:38:28-04:00 adds OCL quickstart and troubleshooting guides

- oc image-arm64 02786574b09edc1bc4ec2361d8056c1d57ae97c0 to 6bba0756103a7df8a126920ecc35dbcd7915d167
- 6acee56a 2024-09-30T23:21:04+02:00 OWNERS_ALIASES: Update username of David Hurta

- kubernetes image-arm64 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555 to 22a8059b7385368c1183afed6e426021ffaf208a
- 8120f49ce 2024-09-05T10:01:57+00:00 UPSTREAM: <carry>: Updating openshift-enterprise-pod-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/openshift-enterprise-pod.yml

12 changes: 6 additions & 6 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
https://github.com/openshift/api embedded-component f89ab92f1597eaed4de5b947c1781adde2bf42fb
https://github.com/openshift/api embedded-component d67159445fc413170704f4d27d7d4b1e160efe68
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8122add3d1529f0ea8fa918b45e3d7b35d5a0388
https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224
https://github.com/openshift/cluster-ingress-operator embedded-component 382e2ba9256c536215a15a9244ba1630e2caf35d
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 48d9579a5c4d0f6eb9ddbbc96cb44ccda121ce09
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2eefd79ce2f04541296e6500be50d65dc9ba8bea
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component cd996bd0fb68227bfd38caf9e0dc5b6a8561c9bb
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e48e04e19b8aaaf1bca99f7a1de89de0ea2690f1
https://github.com/openshift/cluster-network-operator embedded-component 1773dcfb930d32b51580b1fa7158d9cbbe7b4274
https://github.com/openshift/cluster-network-operator embedded-component 70cb43b37eae06172cb88d9067d83b67e73d685e
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 95bd10ad4841d72b46c58078a1e4d2559d5e2c67
https://github.com/openshift/cluster-policy-controller embedded-component 35753b6b1e97843c6856c9866fe1d8a205d05df4
https://github.com/openshift/csi-external-snapshotter embedded-component 672a0d5ea97a71afd0dfb50002319f30db2e10d7
https://github.com/openshift/etcd embedded-component b3e8498241c28ab67659cb3547694f5267b18836
https://github.com/openshift/kubernetes embedded-component 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
https://github.com/openshift/machine-config-operator embedded-component 8dc705d80b2ab269e6346ebb5d35783fe96c32a3
https://github.com/openshift/machine-config-operator embedded-component f9abd9d45af1028b03ba00fadf5053523a2d7e4f
https://github.com/openshift/openshift-controller-manager embedded-component 979e5c9866d7a674a1cf845b0c84707f7af76616
https://github.com/openshift/operator-framework-olm embedded-component fbd00789eda3c50c35be61d04508e2230b17bffa
https://github.com/openshift/route-controller-manager embedded-component 87dfd7936fc5264ad972dcbc4eb0380dc5cff0db
Expand All @@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 89b245aa3dd7a3417000be8
https://github.com/openshift/ovn-kubernetes image-amd64 b70ae7f5d24c5fcd69a18399419b41468afa6cac
https://github.com/openshift/kubernetes image-amd64 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
https://github.com/openshift/oc image-arm64 02786574b09edc1bc4ec2361d8056c1d57ae97c0
https://github.com/openshift/oc image-arm64 6bba0756103a7df8a126920ecc35dbcd7915d167
https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7
https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7
https://github.com/openshift/router image-arm64 72114ea78be0a032d5cdddcad694e0a352a00e93
https://github.com/openshift/kube-rbac-proxy image-arm64 89b245aa3dd7a3417000be8ad07287d8b5648872
https://github.com/openshift/ovn-kubernetes image-arm64 b70ae7f5d24c5fcd69a18399419b41468afa6cac
https://github.com/openshift/kubernetes image-arm64 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
https://github.com/openshift/kubernetes image-arm64 22a8059b7385368c1183afed6e426021ffaf208a
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-09-30-161817" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-01-011601"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-01-105852" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-01-234931"