Skip to content

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-25-162526_amd64-2024-06-25_arm64-2024-06-25 #3549

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
Jun 27, 2024
Merged

NO-ISSUE: rebase-main-4.17.0-0.nightly-2024-06-25-162526_amd64-2024-06-25_arm64-2024-06-25 #3549

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
dd6412c
update last_rebase.sh
Jun 27, 2024
6633c69
update changelog
Jun 27, 2024
2e07ce6
update manifests
Jun 27, 2024
5b38409
update buildfiles
Jun 27, 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.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-06-23-145410
OCP_VERSION := 4.17.0-0.nightly-2024-06-25-162526
2 changes: 1 addition & 1 deletion assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ images:
digest: sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770
digest: sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349
4 changes: 2 additions & 2 deletions assets/optional/multus/release-multus-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-06-23-145410"
"base": "4.17.0-0.nightly-2024-06-25-162526"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28f2329cfb13dd6e828bdc18e3ae1440061ef1dc10c955581bb3d6a918c31c21",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55ebcd26a627b2441eef1bb28601c6c278f6229cdca08a8a71ec4a75157b770"
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84c32dc331f53c5ccfcf4ce14305fe88b4e36e06d5237098747c0f1447691349"
}
}
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:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0
digest: sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504
digest: sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c
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:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968
- 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:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2
target:
kind: Deployment
labelSelector: app=catalog-operator
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-06-23-145410"
"base": "4.17.0-0.nightly-2024-06-25-162526"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:085ad447c8591efac7df84d3ee0a7cabac773d3cfab13eb19053f723bc01cfb0",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe66805b129f155b71214de23ea339c636c8fe43f78d1cffdfabafcbe3bd9504",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:614162193d93621526484c67d7c5047fac5bf26cf385d6bdfd7bdd7d2cdb9cf2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77222fb1e82110ae6a1ab462033b4d92bbd0b40cc858efb8907ee02c4e41a968",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a41a0762e142db6fe257c06c3928f5c626051d2f4e6f80963a31383ac3b4804c"
}
}
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.17.0-0.nightly-2024-06-23-145410"
"base": "4.17.0-0.nightly-2024-06-25-162526"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07e8d95d810db091ec0c72f4afb2ee055a9f32eda8979f04a99a11da9cfd7003",
Expand Down
18 changes: 18 additions & 0 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
- machine-config-operator embedded-component 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab to 58aca6909f9d1c319816dc12beedc35150418e40
- 5236644a 2024-06-24T09:51:06-05:00 disable mglru service
- 521d36a9 2024-06-21T17:45:36-04:00 make logging less verbose and make OCL featuregate more explicit in operator
- 17e99bfd 2024-06-13T14:56:05-04:00 MCD should emit events whenever SIGTERM protection is added, removed, or bumped into
- 023c85cd 2024-06-13T13:10:06-04:00 update events in nodecontroller should include MachineConfig / image
- 47a8befb 2024-06-13T13:03:02-04:00 run validations on all MachineOSConfigs before rendering new MCD DaemonSet
- 97cefda5 2024-06-12T14:21:41-04:00 start MachineOSConfig informers only if the featuregate is enabled
- 82b19302 2024-06-12T14:21:41-04:00 initial commit of MCD-side implementation
- 6dc50086 2024-06-12T14:21:41-04:00 move canonicalizePullSecretBytes and add tests for all DockerConfig helpers
- d8ebdfc7 2024-06-12T14:21:41-04:00 wires up operator-side for currentimagepullsecret syncing
- 2d77dcf4 2024-06-12T14:21:40-04:00 certificatewriter should handle the internal registry pull secret

- operator-framework-olm embedded-component 06c943a5bd529b7fb6fa278f637747889f4fab73 to 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61
- 88c8eca4 2024-06-25T00:03:28+00:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217)
- b682d7ee 2024-06-24T18:44:15+02:00 [CARRY] bump e2e timeout by 15 mins
- 56226d58 2024-06-24T18:42:56+02:00 [OCPBUGS-25341]: perform operator apiService certificate validity checks directly (#3217)
- 9c4ea260 2024-06-24T18:37:18+02:00 [OCPBUGS-34173]: fix sorting unpack jobs (#3299)

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 43de97b
https://github.com/openshift/etcd embedded-component 1fb3165305efc8d986344b555b22592e6e6c1786
https://github.com/openshift/kubernetes embedded-component d0324787c86dcd13d4f16745da43b216a6787040
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 34fafc04e5f2872e282617da31175a7e091ffdb2
https://github.com/openshift/machine-config-operator embedded-component 612b9cd6a642a560bb48b9e8f1fa9cb4b54622ab
https://github.com/openshift/machine-config-operator embedded-component 58aca6909f9d1c319816dc12beedc35150418e40
https://github.com/openshift/openshift-controller-manager embedded-component dc54a288f78e85e880ee37da2877629efd65c8c6
https://github.com/openshift/operator-framework-olm embedded-component 06c943a5bd529b7fb6fa278f637747889f4fab73
https://github.com/openshift/operator-framework-olm embedded-component 02e3f41f9a9e88fb3852c6c49e9cd6421fe9db61
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 34c69c72be5a0c71863965a5c6480c236b0f843e
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-06-23-145410" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-25-104321"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2024-06-25-162526" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2024-06-25-104321"