Skip to content

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-09-215042_amd64-2024-07-09_arm64-2024-07-09 #3613

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 10, 2024
Merged

NO-ISSUE: rebase-release-4.16-4.16.0-0.nightly-2024-07-09-215042_amd64-2024-07-09_arm64-2024-07-09 #3613

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
5a8ac36
update last_rebase.sh
Jul 10, 2024
7add5e3
update changelog
Jul 10, 2024
8be6788
update manifests
Jul 10, 2024
93eae31
update buildfiles
Jul 10, 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-08-011919
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-07-09-212638
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-07-171226
OCP_VERSION := 4.16.0-0.nightly-2024-07-09-215042
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-08-011919"
"base": "4.16.0-0.nightly-arm64-2024-07-09-212638"
},
"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-07-171226"
"base": "4.16.0-0.nightly-2024-07-09-215042"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:897f93d7062d3adcebaffdb4e11f7873d87fbb3a9ade8cc613e3a3c3926f5ccb",
Expand Down
3 changes: 1 addition & 2 deletions assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,9 +613,8 @@ spec:
description: If specified, indicates the pod's priority. If not specified, the pod priority will be default or zero if there is no default.
type: string
securityContextConfig:
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. Currently if the SecurityContextConfig is unspecified, the default value of `legacy` is used. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which could not be run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n In a future version will the default will be set to `restricted`, catalog maintainers should rebuild their catalogs with a version of opm that supports running catalogSource pods in `restricted` mode to prepare for these changes. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
description: "SecurityContextConfig can be one of `legacy` or `restricted`. The CatalogSource's pod is either injected with the right pod.spec.securityContext and pod.spec.container[*].securityContext values to allow the pod to run in Pod Security Admission (PSA) `restricted` mode, or doesn't set these values at all, in which case the pod can only be run in PSA `baseline` or `privileged` namespaces. If the SecurityContextConfig is unspecified, the mode will be determined by the namespace's PSA configuration. If the namespace is enforcing `restricted` mode, then the pod will be configured as if `restricted` was specified. Otherwise, it will be configured as if `legacy` was specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`. \n More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'"
type: string
default: legacy
enum:
- legacy
- restricted
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:ed815991affb81baae0c368cf44104301d427449eb9fbd9326f5fb5330db9214
digest: sha256:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:284d9c1cde7cf6d74d679ab3bef1bcdd5585d22fa49774cdf134e2ee20ecbf83
digest: sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d
- 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:284d9c1cde7cf6d74d679ab3bef1bcdd5585d22fa49774cdf134e2ee20ecbf83
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01f531a75aba6c8e72e5aae0e0b5e882f678ff487cda7c5e0e940301cfc44c6d
- 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:ed815991affb81baae0c368cf44104301d427449eb9fbd9326f5fb5330db9214
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47c01c98d44dae1a65bcacb06b7b083e5ab4b53902daab4ba0233144bab149a8
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:a15e18d55c09786fa759b8483ca463b98b8bbcf396dc9ffa41e9826224f43432
digest: sha256:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f1e8bfce289d8aa022101177fbd6f28626d814d6c453a22892c4cd9601103308
digest: sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286
- 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:f1e8bfce289d8aa022101177fbd6f28626d814d6c453a22892c4cd9601103308
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:faa0b7d94827569ad06b7797fb02c9314d98abaf730b2aec2fe2e471137ef286
- 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:a15e18d55c09786fa759b8483ca463b98b8bbcf396dc9ffa41e9826224f43432
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b188518fbbe8fa91dc4ce2a05f00ff93a73025e14dd0ae5621f39d2854ec00c9
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-08-011919"
"base": "4.16.0-0.nightly-arm64-2024-07-09-212638"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed815991affb81baae0c368cf44104301d427449eb9fbd9326f5fb5330db9214",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:284d9c1cde7cf6d74d679ab3bef1bcdd5585d22fa49774cdf134e2ee20ecbf83",
"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",
"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-07-171226"
"base": "4.16.0-0.nightly-2024-07-09-215042"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a15e18d55c09786fa759b8483ca463b98b8bbcf396dc9ffa41e9826224f43432",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1e8bfce289d8aa022101177fbd6f28626d814d6c453a22892c4cd9601103308",
"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",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-07-08-011919"
"base": "4.16.0-0.nightly-arm64-2024-07-09-212638"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f51acbc42990f9d72cfdd91d26ca00a50d89ede15220cba52cc58e8141a630d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0288db3549e7d7278cd26c2bdf14681cafc2af9d566d2df9387f2dec73beddde",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:120c6288a3bf87628dd545e3d92835dcfd3ca9496d2a040151f9b9cd436e22fd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c228d04f2e4bc9f6d1713b69da37ba154e40f98ad6b9957c016a539bf93bfa6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb30381dd33d379218906ad8c1291a8bc54a0f4505ca07d1447048d61c670c85",
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.16.0-0.nightly-2024-07-07-171226"
"base": "4.16.0-0.nightly-2024-07-09-215042"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:294aac4861c29fc80a865ba2d6a7bd59958cc4cb80103c359c66282e1a8613bf",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c8b7ff02b12c67468f34f9b3f3fccb450797971dab5ab83ae28077e26e05669",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e46bf4c5952793b5bd9aee06280e57eb07a61cd6be3dc411c4c2242e62dd151",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37b7a73669052d17e6daaf245cc3490e0faabaff994ef075682dee6b79d5c530",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3efbfad53f80bd8988582c9047caf18ba8f184cb8d7afaecbac1b78d38ae4b9a",
Expand Down
32 changes: 15 additions & 17 deletions scripts/auto-rebase/changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
- machine-config-operator embedded-component 8c4afe087d64b028fdc16df24204fe4f7f7e6127 to 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c
- 4b0db3fb 2024-07-04T03:32:50+00:00 MCD-pull: run after network-online.target in Azure
- 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

- oc image-amd64 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 to 8c491baf99f880bd767cb325effbb35beeb47a6c
- 02ca8d32 2024-07-04T08:08:33+02:00 bump k8s version in the Makefile and Dockerfiles
- 2f3e536d 2024-07-03T14:37:55+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed
- 4bcd2670 2024-07-03T14:37:14+02:00 Lower case command value before comparision
- 1f27c7ef 2024-07-02T15:08:41+02:00 bump(k8s)=1.29.6
- 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)

- ovn-kubernetes image-amd64 f80acd01c9a4106b0f9681181ed43f059986f4d9 to 7f412836bd26c3d6e9735552a7fd615e7e7e9695
- 147d4eee 2024-07-03T10:02:05+00:00 Fix race condition when creating/deleting namespace address set
- 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 e4cacc0be012b75a230f07e3902a1ede9a2ecba9 to 8c491baf99f880bd767cb325effbb35beeb47a6c
- 02ca8d32 2024-07-04T08:08:33+02:00 bump k8s version in the Makefile and Dockerfiles
- 2f3e536d 2024-07-03T14:37:55+02:00 Remove invalid test cases: empty dockerfiles are no longer allowed
- 4bcd2670 2024-07-03T14:37:14+02:00 Lower case command value before comparision
- 1f27c7ef 2024-07-02T15:08:41+02:00 bump(k8s)=1.29.6

- ovn-kubernetes image-arm64 f80acd01c9a4106b0f9681181ed43f059986f4d9 to 7f412836bd26c3d6e9735552a7fd615e7e7e9695
- 147d4eee 2024-07-03T10:02:05+00:00 Fix race condition when creating/deleting namespace address set
- 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

8 changes: 4 additions & 4 deletions scripts/auto-rebase/commits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 5315d37
https://github.com/openshift/etcd embedded-component bc2fec27ff5b086436d438157c24396f280e0305
https://github.com/openshift/kubernetes embedded-component aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 969a60e9e2466c44f5b3ffd43fe3ecab11bf1e51
https://github.com/openshift/machine-config-operator embedded-component 73d5f16fdc96f3d7a4bc87edc77d394e53a8bb9c
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 555e529c944f9b8b93d2e4d9626e12de51f59854
https://github.com/openshift/operator-framework-olm embedded-component ee44d6cb5c16633f9787fc1135d70bd8561da0b6
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 8c491baf99f880bd767cb325effbb35beeb47a6c
https://github.com/openshift/oc image-amd64 0127eb4d4f1131758ef39f445eba783eaf7b240f
https://github.com/openshift/coredns image-amd64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-amd64 5315d37a1e5415e8b6870f23e50238681979cc28
Expand All @@ -26,7 +26,7 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 8ea2c994df4296ec161023d
https://github.com/openshift/ovn-kubernetes image-amd64 7f412836bd26c3d6e9735552a7fd615e7e7e9695
https://github.com/openshift/kubernetes image-amd64 aba1e8d781a8de14bd80a3e4ea0f9a29c5a8530d
https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-arm64 8c491baf99f880bd767cb325effbb35beeb47a6c
https://github.com/openshift/oc image-arm64 0127eb4d4f1131758ef39f445eba783eaf7b240f
https://github.com/openshift/coredns image-arm64 04d84f7f2e17ff464fad3f2841e7b29a43c8382f
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
https://github.com/openshift/csi-external-snapshotter image-arm64 5315d37a1e5415e8b6870f23e50238681979cc28
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-07-171226" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2024-07-08-011919"
./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"