Skip to content

Commit 85494ad

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-08-075347_amd64-2024-10-08_arm64-2024-10-08 (#4039)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 135e596 commit 85494ad

12 files changed

+79
-64
lines changed

‎Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-06-235641
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-08-191329

‎Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.18.0-0.nightly-2024-10-06-174104
1+
OCP_VERSION := 4.18.0-0.nightly-2024-10-08-075347

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2024-10-06-235641"
3+
"base": "4.18.0-0.nightly-arm64-2024-10-08-191329"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf985f63a1208e9d3ee5262bebb4dd7f5d05d7469bf32f7ccf369e3ae7aa79a7",

‎assets/optional/multus/release-multus-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2024-10-06-174104"
3+
"base": "4.18.0-0.nightly-2024-10-08-075347"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd82881597e6e1e40cac6029323e29f94afb0b86e5b50214d305ef7b72526461",

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2
5+
digest: sha256:32bfeb604fe64f1182aabc8151b2a08b796c6b8c6788e6ebfb449b0d805c6b0a
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380
8+
digest: sha256:589886ba44a4550d043c683bde21d6f172db22da0922b90c9bdd935844014e36
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
1111
digest: sha256:db5a8adb8ba28af664548b6ec03614b688700e53ef1e151d9103b37c0e0d5c32
@@ -16,12 +16,12 @@ patches:
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:589886ba44a4550d043c683bde21d6f172db22da0922b90c9bdd935844014e36
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32bfeb604fe64f1182aabc8151b2a08b796c6b8c6788e6ebfb449b0d805c6b0a
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2024-10-06-235641"
3+
"base": "4.18.0-0.nightly-arm64-2024-10-08-191329"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b8f8b6d818a2a7a02fb22f6a0f8896f0fab18e0967ee3bfa3137947198214c2",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d5503b0b626dbd3d268588c863196cdb63bafc67b6ffabeec3e6fb091d64b380",
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32bfeb604fe64f1182aabc8151b2a08b796c6b8c6788e6ebfb449b0d805c6b0a",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:589886ba44a4550d043c683bde21d6f172db22da0922b90c9bdd935844014e36",
88
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db5a8adb8ba28af664548b6ec03614b688700e53ef1e151d9103b37c0e0d5c32"
99
}
1010
}

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2024-10-06-174104"
3+
"base": "4.18.0-0.nightly-2024-10-08-075347"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:135ad5129d7715ea5f381fea7de4c2e382b863f15dd896d0f55b6d0a799a6ca8",

‎assets/release/release-aarch64.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2024-10-06-235641"
3+
"base": "4.18.0-0.nightly-arm64-2024-10-08-191329"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23c6086305f6327cf3211a8602802c62aefe6a70290fdd7dcef6975e0e17a0af",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c047aca8811d9f2899ffab03ccc7cff3ec433616c290256a629f613fee208c11",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4f51077fe6238eb7b669c866b930177a2be02a695023d99afb35bfe3b5df0d7",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d008a15cee226c7bca1e6169fe86cb6d35ac5693391f9b2dc05eca9323293c36",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:db5a8adb8ba28af664548b6ec03614b688700e53ef1e151d9103b37c0e0d5c32",
1010
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5b6f405b910410acb7e383eaf29f57d31935bc1c6e5bd1f1a8179b773fcf187",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a2bca47a463d92cda0b68e9d63672233c729d42215fcc5425b7c5001164e0ee",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99196cd06d9072ae211db4ebb89f687bcac488b8a7cb717875a2477227f4e3e0",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d12a6a01b873f11177bfe032fa891ce2a487dd9e65ed089d101e5e3209969af",
15-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:add4e0bfd48f0cc7b0180b75a45b130a5a78bd88e2ded14bae6c448c4dace4e7"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c747705554f38b94a4295adbd127a70d8590b01e573aef1e1e51e191f0670749",
15+
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20d6362d96da6e17d3421500a64be339f169b03c97948fe077eca3240bd6fdaa"
1616
}
1717
}

‎assets/release/release-x86_64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2024-10-06-174104"
3+
"base": "4.18.0-0.nightly-2024-10-08-075347"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79d9110d22a11359889d029dba7aeddc9f93e5ebaf60edbad6716b1cb640f844",

‎scripts/auto-rebase/changelog.txt

Lines changed: 56 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,61 @@
1-
- api embedded-component e415140e5d5f18cccd54255f4cd218649e88a328 to b1f700bdd8d22c4033be4e4e9ef751d89ade42e8
2-
- 5ed6751 2024-10-03T21:22:42-04:00 RFE-6242: ingress: rename loadBalancerIP to floatingIP
3-
- a2ad73e 2024-10-03T16:07:59+01:00 Fix network tests after update to 1.31
4-
- 6f1022c 2024-10-03T15:04:37+01:00 Update tests vendor
5-
- 1ff8613 2024-10-03T15:04:36+01:00 Update integration tests module to K8s 1.31
6-
- 1f55562 2024-10-03T13:47:10+01:00 Add envtest archives for K8s 1.31.1
7-
- 692815c 2024-10-03T12:09:32+01:00 Publish kubebuilder openshift binaries to 1.31.0
8-
- 444665a 2024-10-01T16:15:14-04:00 generated
9-
- b66574f 2024-10-01T13:59:23-04:00 align the easy lowlevel operator condition validation to metav1.Condition
1+
- api embedded-component b1f700bdd8d22c4033be4e4e9ef751d89ade42e8 to 82e082220d910f489d35880174e2eb90e21f5589
2+
- 77162c9 2024-10-02T16:12:22-04:00 CORS-3695: Update the api for aws cluster hosted dns options
103

11-
- cluster-ingress-operator embedded-component 21d8fb4437149b00bd67ba3f357db6b596115592 to 6587d8cbfc46ab5e3412dbc7d13c935421099516
12-
- 8afaffb 2024-09-17T03:39:13-04:00 aws/dns: Always log AWS API endpoints
13-
- 8999989 2024-09-17T03:39:01-04:00 aws/dns: Tidy up logging for custom endpoints
14-
- e0c2c2b 2024-09-17T03:38:51-04:00 aws/dns: Replace a useless break statement
15-
- f634f87 2024-09-17T03:38:31-04:00 aws/dns: Move a to-do for elbv2 custom endpoint
16-
- 30f72ca 2024-09-17T03:37:26-04:00 aws/dns: Add test for NewProvider
4+
- cluster-openshift-controller-manager-operator embedded-component 95bd10ad4841d72b46c58078a1e4d2559d5e2c67 to 0ee6371401da744c7c71723c505463672b9bad45
5+
- 0906447 2024-09-18T15:55:35+00:00 Updating ose-cluster-openshift-controller-manager-operator-container image to be consistent with ART for 4.18 Reconciling with https://github.com/openshift/ocp-build-data/tree/dd68246f3237db5db458127566fc7b05b55e1660/images/ose-cluster-openshift-controller-manager-operator.yml
176

18-
- kubernetes embedded-component 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
19-
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
7+
- oc image-arm64 4afb880d54e10ac4d0e7a6db0036dc7537bc639d to 3692450b96d57ae3870e5f693e833a0701d0e2b0
8+
- 07bd140b 2024-10-07T13:54:12-04:00 day2: additional rbac policy rules
209

21-
- oc image-amd64 6bba0756103a7df8a126920ecc35dbcd7915d167 to 4afb880d54e10ac4d0e7a6db0036dc7537bc639d
22-
- 4afb880d 2024-10-05T13:22:46+00:00 NO-JIRA: Use suggested functions instead of deprecated ones (#1894)
23-
- d8cac253 2024-10-04T10:06:03-07:00 pkg/cli/admin/upgrade/recommend: Show most-recent update options
24-
- 768f7a04 2024-10-02T07:53:31+03:00 Change kube version in image components
25-
- 2c3abbe4 2024-10-02T07:53:31+03:00 React to changes in kubectl/cmd.go
26-
- c9a615b7 2024-10-02T07:53:31+03:00 React to interface changes in commands
27-
- eac0d7de 2024-10-02T07:53:22+03:00 Bump k8s dependencies to 1.31.1 and go mod tidy/vendor
28-
- a915ac6f 2024-10-02T07:53:22+03:00 Update to new go version 1.22.5
29-
- 0cd2e2c9 2024-09-30T10:08:40-07:00 pkg/cli/admin/upgrade/recommend/examples: Update examples
10+
- csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 to f52ce8b8b0799a341caf1fb864bba5d9d040a856
11+
- 75c7e0d 2024-10-02T14:04:48+02:00 UPSTREAM: <carry>: Add OpenShift files
12+
- 126d7fd 2024-08-29T08:31:06+02:00 create changelog v8.1.0
13+
- 7b0eb44 2024-08-28T13:39:02-04:00 Remove unwanted file
14+
- 3c2470c 2024-08-27T12:00:57+02:00 Add group snapshot controller unit tests
15+
- e2b8496 2024-08-26T15:16:19+02:00 fix opMgr.scheduleOpsInFlightMetric go routine leak
16+
- f463a99 2024-08-26T11:12:21+00:00 Bump the github-dependencies group across 1 directory with 7 updates
17+
- 1226227 2024-08-26T12:37:44+02:00 Look for a VolumeGroupSnapshotClass when getting the class of a VolumeGroupSnapshot
18+
- 8b182cc 2024-08-26T12:36:48+02:00 Document Volume Group Snapshot feature in the README file
19+
- f0fb893 2024-08-15T07:42:50+00:00 Bump the github-dependencies group across 1 directory with 8 updates
20+
- 7d6ba79 2024-08-14T14:30:13+02:00 update kubernetes to v1.31.0
21+
- 74451a6 2024-08-14T03:16:56+00:00 Squashed 'release-tools/' changes from f40f0ccd4..988496a1f
22+
- c98b259 2024-08-07T19:24:35+02:00 [snapshot-controller] Retry PVC finalizer removal on conflict
23+
- b34b8a1 2024-08-02T10:13:37+02:00 update go version in trivy.yaml
24+
- f2d374f 2024-08-01T16:04:04+02:00 update kubernetes to 1.31.0-rc.0
25+
- 495ff63 2024-07-30T23:04:34-07:00 Update controller deployment to latest version
26+
- b2fd105 2024-06-24T11:04:09+00:00 Bump k8s.io/klog/v2 in the k8s-dependencies group
27+
- 4f6440c 2024-06-18T22:21:19+02:00 Correctly detect newly created Volume[Group]SnapshotClasses
28+
- fe4a04d 2024-06-18T22:19:44+02:00 Avoid group snapshot provisioning with mismatching CSI Drivers
29+
- f0f8f08 2024-06-17T11:43:39+00:00 Bump the github-dependencies group across 1 directory with 16 updates
30+
- 0109d4b 2024-06-17T11:42:38+00:00 Bump the k8s-dependencies group across 1 directory with 2 updates
31+
- 4a2f955 2024-06-17T12:22:58+05:30 Add group snapshot controller metrics
32+
- 594e663 2024-06-05T13:22:33+00:00 test: fix trivy error
33+
- 9a73243 2024-06-05T13:14:48+00:00 test: ignore spelling error
34+
- 5666da4 2024-06-05T13:13:14+00:00 Squashed 'release-tools/' changes from adb3af9d..f40f0ccd
3035

31-
- kubernetes image-amd64 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
32-
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
33-
34-
- oc image-arm64 6bba0756103a7df8a126920ecc35dbcd7915d167 to 4afb880d54e10ac4d0e7a6db0036dc7537bc639d
35-
- 4afb880d 2024-10-05T13:22:46+00:00 NO-JIRA: Use suggested functions instead of deprecated ones (#1894)
36-
- d8cac253 2024-10-04T10:06:03-07:00 pkg/cli/admin/upgrade/recommend: Show most-recent update options
37-
- 768f7a04 2024-10-02T07:53:31+03:00 Change kube version in image components
38-
- 2c3abbe4 2024-10-02T07:53:31+03:00 React to changes in kubectl/cmd.go
39-
- c9a615b7 2024-10-02T07:53:31+03:00 React to interface changes in commands
40-
- eac0d7de 2024-10-02T07:53:22+03:00 Bump k8s dependencies to 1.31.1 and go mod tidy/vendor
41-
- a915ac6f 2024-10-02T07:53:22+03:00 Update to new go version 1.22.5
42-
- 0cd2e2c9 2024-09-30T10:08:40-07:00 pkg/cli/admin/upgrade/recommend/examples: Update examples
43-
44-
- kubernetes image-arm64 1892e4deb967a2b39cfc2fea87a8bd49274449ef to 8540bd493e8a42ffb61a3f470f71290488332b1c
45-
- 1b4e07927 2024-10-03T09:23:47-03:00 UPSTREAM: <carry>: Add OpenShift tooling, images, configs and docs
36+
- csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7 to f52ce8b8b0799a341caf1fb864bba5d9d040a856
37+
- 75c7e0d 2024-10-02T14:04:48+02:00 UPSTREAM: <carry>: Add OpenShift files
38+
- 126d7fd 2024-08-29T08:31:06+02:00 create changelog v8.1.0
39+
- 7b0eb44 2024-08-28T13:39:02-04:00 Remove unwanted file
40+
- 3c2470c 2024-08-27T12:00:57+02:00 Add group snapshot controller unit tests
41+
- e2b8496 2024-08-26T15:16:19+02:00 fix opMgr.scheduleOpsInFlightMetric go routine leak
42+
- f463a99 2024-08-26T11:12:21+00:00 Bump the github-dependencies group across 1 directory with 7 updates
43+
- 1226227 2024-08-26T12:37:44+02:00 Look for a VolumeGroupSnapshotClass when getting the class of a VolumeGroupSnapshot
44+
- 8b182cc 2024-08-26T12:36:48+02:00 Document Volume Group Snapshot feature in the README file
45+
- f0fb893 2024-08-15T07:42:50+00:00 Bump the github-dependencies group across 1 directory with 8 updates
46+
- 7d6ba79 2024-08-14T14:30:13+02:00 update kubernetes to v1.31.0
47+
- 74451a6 2024-08-14T03:16:56+00:00 Squashed 'release-tools/' changes from f40f0ccd4..988496a1f
48+
- c98b259 2024-08-07T19:24:35+02:00 [snapshot-controller] Retry PVC finalizer removal on conflict
49+
- b34b8a1 2024-08-02T10:13:37+02:00 update go version in trivy.yaml
50+
- f2d374f 2024-08-01T16:04:04+02:00 update kubernetes to 1.31.0-rc.0
51+
- 495ff63 2024-07-30T23:04:34-07:00 Update controller deployment to latest version
52+
- b2fd105 2024-06-24T11:04:09+00:00 Bump k8s.io/klog/v2 in the k8s-dependencies group
53+
- 4f6440c 2024-06-18T22:21:19+02:00 Correctly detect newly created Volume[Group]SnapshotClasses
54+
- fe4a04d 2024-06-18T22:19:44+02:00 Avoid group snapshot provisioning with mismatching CSI Drivers
55+
- f0f8f08 2024-06-17T11:43:39+00:00 Bump the github-dependencies group across 1 directory with 16 updates
56+
- 0109d4b 2024-06-17T11:42:38+00:00 Bump the k8s-dependencies group across 1 directory with 2 updates
57+
- 4a2f955 2024-06-17T12:22:58+05:30 Add group snapshot controller metrics
58+
- 594e663 2024-06-05T13:22:33+00:00 test: fix trivy error
59+
- 9a73243 2024-06-05T13:14:48+00:00 test: ignore spelling error
60+
- 5666da4 2024-06-05T13:13:14+00:00 Squashed 'release-tools/' changes from adb3af9d..f40f0ccd
4661

0 commit comments

Comments
 (0)