Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-10-162038_amd64-2024-07-10_arm64-2024-07-10 #3620

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
Jul 11, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-10-162038_amd64-2024-07-10_arm64-2024-07-10 #3620

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
72576e0
update last_rebase.sh
Jul 11, 2024
89c2318
update changelog
Jul 11, 2024
2710797
update manifests
Jul 11, 2024
97554d7
update buildfiles
Jul 11, 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.16.0-0.nightly-arm64-2024-07-09-212638
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-10-194635
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.16.0-0.nightly-2024-07-09-215042
OCP_VERSION := 4.16.0-0.nightly-2024-07-10-162038
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.16.0-0.nightly-arm64-2024-07-09-212638"
"base": "4.16.0-0.nightly-arm64-2024-07-10-194635"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2163937c0603665d84995a0cbce385fc4378ed0f928ffe25601526872692cdf4",
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.16.0-0.nightly-2024-07-09-215042"
"base": "4.16.0-0.nightly-2024-07-10-162038"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897f93d7062d3adcebaffdb4e11f7873d87fbb3a9ade8cc613e3a3c3926f5ccb",
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:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8
digest: sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d
digest: sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85
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:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378
- 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:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822
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:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9
digest: sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286
digest: sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a
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:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2
- 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:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273
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.16.0-0.nightly-arm64-2024-07-09-212638"
"base": "4.16.0-0.nightly-arm64-2024-07-10-194635"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3998661e3a9bfea52b57efab205ac95afa94bf8179fcd8d2f6cb9ed9c62822",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6cc5ec445f063669b5b6951ac24e6dcb761eb94a772dc3bb833238dc293d378",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85"
}
}
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.16.0-0.nightly-2024-07-09-215042"
"base": "4.16.0-0.nightly-2024-07-10-162038"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:408ae76d766af71bb4c031365df8988dfbda6ae9b7ab65b2a9f5f8e0574c5273",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:000c74529f5c8569855825153a4ea3122e358140133bcb048f7d1d196e0d04d2",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a"
}
}
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.16.0-0.nightly-arm64-2024-07-09-212638"
"base": "4.16.0-0.nightly-arm64-2024-07-10-194635"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0288db3549e7d7278cd26c2bdf14681cafc2af9d566d2df9387f2dec73beddde",
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.16.0-0.nightly-2024-07-09-215042"
"base": "4.16.0-0.nightly-2024-07-10-162038"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c8b7ff02b12c67468f34f9b3f3fccb450797971dab5ab83ae28077e26e05669",
Expand Down
21 changes: 3 additions & 18 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
- machine-config-operator embedded-component 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c to 1ec936b6519a118ba05617efbe338e4961c71e7f
- 65a94db4 2024-06-28T14:00:13+00:00 daemon: Handle correctly OS Version for 4.1 and 4.2 bootimages

- operator-framework-olm embedded-component 555e529c944f9b8b93d2e4d9626e12de51f59854 to ee44d6cb5c16633f9787fc1135d70bd8561da0b6
- 6e9c9e83 2024-07-08T11:46:29-05:00 Update operator-framework-tools.Dockerfile
- dfa5e458 2024-07-08T11:45:54-05:00 Update operator-framework-tools.Dockerfile
- 345509bb 2024-07-03T13:31:04-05:00 don't erase the filesystem from the base
- ea1b9438 2024-07-03T13:31:04-05:00 switch base image
- 782e7f82 2024-06-24T22:51:05-04:00 [OCPBUGS-34173]: fix sorting unpack jobs (#3299)
- b29ba37e 2024-06-24T07:33:39-05:00 UPSTREAM: <carry>: fix xplat compile for of-tools image; hide utest files from git; use rhel8 art builder image
- 096fed55 2024-06-17T12:53:57+02:00 remove default value of catsrc.spec.grpcPodConfig.securityContextConfig (#342)
- b2ba330c 2024-06-17T12:52:23+02:00 OCPBUGS-29729: Updates default security context behavior for catalog source pods (#3206)

- oc image-amd64 8c491baf99f880bd767cb325effbb35beeb47a6c to 0127eb4d4f1131758ef39f445eba783eaf7b240f
- f3d5e4c2 2024-07-05T14:50:19+01:00 debug: set required-scc annotation to privileged for node debug pods

- oc image-arm64 8c491baf99f880bd767cb325effbb35beeb47a6c to 0127eb4d4f1131758ef39f445eba783eaf7b240f
- f3d5e4c2 2024-07-05T14:50:19+01:00 debug: set required-scc annotation to privileged for node debug pods
- operator-framework-olm embedded-component ee44d6cb5c16633f9787fc1135d70bd8561da0b6 to f4eac4271317504fcdeaf45fcf30bb01b1cd8bb0
- ea03cd9a 2024-07-02T10:44:16-07:00 Unpack Job Creation Failure Test (#3297)
- 00690e8f 2024-07-02T10:44:02-07:00 Fix: Ensure jobs without unpack label are considered (#3262)

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 @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component aba1e8d781a8de14bd80a
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component 1ec936b6519a118ba05617efbe338e4961c71e7f
https://github.com/openshift/openshift-controller-manager embedded-component 1432fe0aa630ce83c0c3fd18c86e1fb9a47ae4cc
https://github.com/openshift/operator-framework-olm embedded-component ee44d6cb5c16633f9787fc1135d70bd8561da0b6
https://github.com/openshift/operator-framework-olm embedded-component f4eac4271317504fcdeaf45fcf30bb01b1cd8bb0
https://github.com/openshift/route-controller-manager embedded-component 3112b458983c6fca6f77d5a945fb0026186dace6
https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-amd64 0127eb4d4f1131758ef39f445eba783eaf7b240f
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.16.0-0.nightly-2024-07-09-215042" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-09-212638"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2024-07-10-162038" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-10-194635"