diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index b577722feb..9069902bf2 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-25-223123 +OCP_VERSION := 4.15.0-0.nightly-arm64-2024-07-28-221643 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index e0b62258f4..e57951c550 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.15.0-0.nightly-2024-07-25-172725 +OCP_VERSION := 4.15.0-0.nightly-2024-07-28-170019 diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml index c698aede40..ebec29236f 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml @@ -21,6 +21,7 @@ spec: app: olm-operator annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' + openshift.io/required-scc: restricted-v2 spec: securityContext: runAsNonRoot: true diff --git a/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml b/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml index 876cb264d6..9b5370c81e 100644 --- a/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml +++ b/assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml @@ -21,6 +21,7 @@ spec: app: catalog-operator annotations: target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}' + openshift.io/required-scc: restricted-v2 spec: securityContext: runAsNonRoot: true diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 507609c949..6d5ad4201c 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe + digest: sha256:bdfafe7b4f38dee69b00d5b5d1dc3aa825e9d9241094b2fdba7247317fbd0553 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26 + digest: sha256:bfce04108b9b7027c27fa5785616d0e8926f79bf505438d31542e9c91d57c33e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4 @@ -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:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfce04108b9b7027c27fa5785616d0e8926f79bf505438d31542e9c91d57c33e - 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:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdfafe7b4f38dee69b00d5b5d1dc3aa825e9d9241094b2fdba7247317fbd0553 target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml index f8afd4c663..c8bc4a2ba3 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,10 +2,10 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925 + digest: sha256:e5cbf841eda56f28a22f7a4a7fe071192d42a776dbaa8b9cfd7aeb15dd83abcb - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da + digest: sha256:fec5b7895d20995743c046a0069c7b9cea4134dba709dc13465111770cbdcd13 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc @@ -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:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fec5b7895d20995743c046a0069c7b9cea4134dba709dc13465111770cbdcd13 - 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:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5cbf841eda56f28a22f7a4a7fe071192d42a776dbaa8b9cfd7aeb15dd83abcb target: kind: Deployment labelSelector: app=catalog-operator diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json index 73684c612d..1a12d06130 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-25-223123" + "base": "4.15.0-0.nightly-arm64-2024-07-28-221643" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3952ada86beaa57743331b8014beadac751ce1e4b3499f65b6bff20f0d2215fe", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ae849b54e1e3560e2a8ff5fa76cce15214c23f83aaca5f99e2332e375c97e26", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdfafe7b4f38dee69b00d5b5d1dc3aa825e9d9241094b2fdba7247317fbd0553", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfce04108b9b7027c27fa5785616d0e8926f79bf505438d31542e9c91d57c33e", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50d1a1036769a445f1fbeecd0e3c984824ac0c5ca1e53ef4c98df9cf3693b7c4" } } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index deedb9e881..50d8d4db4e 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-25-172725" + "base": "4.15.0-0.nightly-2024-07-28-170019" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567991b15bc4615590916c428aa9d1d835f4f076c5fd268eacb6cebddb17d925", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d00b50929f7a486fd4c91bc3c03d60e2b7e8cf9072564af5674834254115b3da", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5cbf841eda56f28a22f7a4a7fe071192d42a776dbaa8b9cfd7aeb15dd83abcb", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fec5b7895d20995743c046a0069c7b9cea4134dba709dc13465111770cbdcd13", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bf40df05a3599b6ef8706e78bb1914b9f988946543a685449110aaf8b59e8bc" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index e7ca205b06..f7b9b7720c 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-arm64-2024-07-25-223123" + "base": "4.15.0-0.nightly-arm64-2024-07-28-221643" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a6c7447aea28bc530d5688e0b61bffa3ab626f10f850fef7a495ddd6583047e", diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index db0d3528b1..74589914b7 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.15.0-0.nightly-2024-07-25-172725" + "base": "4.15.0-0.nightly-2024-07-28-170019" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b6e2497941cc22e6539224697c1e99eaa012d3dcdc96456800dd89f470bd86", diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 57435a6190..0ee5a6fce2 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,8 @@ -- cluster-network-operator embedded-component 3a06784187564c89dffbc0dd9378fb4feaa03005 to 6d9f739ffab69717b0ffee2bfb97d99118cc88a4 - - 0bed685 2024-07-17T14:35:55+00:00 Check every MachineConfigPool for IPsec plugin existence +- cluster-kube-apiserver-operator embedded-component 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c to aabc7863cdbd76f8909a10fbc1be53b032e4ec31 + - 9f52a49 2024-07-25T13:12:48+00:00 p/o/podsecurityreadinesscontroller: add disabled syncer + - 2178bbd 2024-07-25T13:12:48+00:00 p/o/psreadinesscontroller: make ctrl owner aware + - 11d242e 2024-07-25T13:12:48+00:00 p/o/psreadinesscontroller: minor refactoring + +- operator-framework-olm embedded-component f3f8de5d0caa7387630272260e9e4e0db1b8ef85 to 80dee4eb4c5ec643131052292313191e600e5d0c + - d209907e 2024-07-25T12:01:36+01:00 set required-scc for openshift workloads diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index a7ffe83edc..6f6da6fa02 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,7 +1,7 @@ https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 65dbb12b710b7126f662f5f7f2d8272f9f6868cc https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 https://github.com/openshift/cluster-ingress-operator embedded-component 0928822bf67774af6798b218bff54ff5d14594cd -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 62a9eff944bfbdc1b4e79332fe4d8ae2df053c8c +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component aabc7863cdbd76f8909a10fbc1be53b032e4ec31 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 https://github.com/openshift/cluster-network-operator embedded-component 6d9f739ffab69717b0ffee2bfb97d99118cc88a4 @@ -13,7 +13,7 @@ https://github.com/openshift/kubernetes embedded-component add48d0c4f679a95d1c06 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb https://github.com/openshift/machine-config-operator embedded-component b730129374d90da5a32235fd104fba6385f4b3a9 https://github.com/openshift/openshift-controller-manager embedded-component 104b9ece0feb24da89fa6b87d90d60dd27fce813 -https://github.com/openshift/operator-framework-olm embedded-component f3f8de5d0caa7387630272260e9e4e0db1b8ef85 +https://github.com/openshift/operator-framework-olm embedded-component 80dee4eb4c5ec643131052292313191e600e5d0c https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component 19f312e96bb4e5b7da9f61ea4cab202b227a60c6 https://github.com/openshift/oc image-amd64 1e41aa3e007fc60af9edfc77be1c610205943f4a diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 2ad4b99963..c5495e6527 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-25-172725" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-25-223123" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-07-28-170019" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-07-28-221643"