Skip to content
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

Jump to bottom

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-31-180021_amd64-2024-03-31_arm64-2024-03-31 #3201

Merged
merged 9 commits into from
Apr 1, 2024
Merged

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-03-31-180021_amd64-2024-03-31_arm64-2024-03-31 #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
467617a
update last_rebase.sh
Apr 1, 2024
f4bab7c
update changelog
Apr 1, 2024
c20b512
update microshift/go.mod
Apr 1, 2024
2660227
update microshift/vendor
Apr 1, 2024
e087063
update etcd/go.mod
Apr 1, 2024
1aaa2b1
update etcd/vendor
Apr 1, 2024
6a3f52a
update component images
Apr 1, 2024
8b803ba
update manifests
Apr 1, 2024
70e017e
update buildfiles
Apr 1, 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.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=29
KUBE_GIT_VERSION=v1.29.2
KUBE_GIT_COMMIT=5a51bd8afbb871ff9952c94788d368d6254cd500
KUBE_GIT_COMMIT=258f1d5fb6491ba65fd8201c827e179432430627
KUBE_GIT_TREE_STATE=clean
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-03-27-195820
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-03-31-234950
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-03-25-100907
OCP_VERSION := 4.16.0-0.nightly-2024-03-31-180021
1 change: 0 additions & 1 deletion assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: securitycontextconstraints.security.openshift.io
spec:
group: security.openshift.io
Expand Down
1 change: 0 additions & 1 deletion assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
api.openshift.io/merged-by-featuregates: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
include.release.openshift.io/single-node-developer: "true"
name: rangeallocations.security.internal.openshift.io
spec:
group: security.internal.openshift.io
Expand Down
974 changes: 611 additions & 363 deletions assets/crd/route.crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

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-03-27-195820"
"base": "4.16.0-0.nightly-arm64-2024-03-31-234950"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c58df323277e8b78e17e3a578b94625ec7bd56982af7efe78a4618ea0386c89",
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-03-25-100907"
"base": "4.16.0-0.nightly-2024-03-31-180021"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:016c149f95b194769cc62f6b8b64b86be520fe415d8f56828d864310a1904d23",
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:00d39d72aa108c3260ca5a5be6d876da53f9fe85001b7d3cfd53a5554c8d38b4
digest: sha256:6bd42a7940ee169a3a3915b105dae284ecab1a324530035ecff6b28d74fa6639
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:85e8deb66c867abc00cde43d84833ffed4d7ad88359ef3175a2f4fc8fb771ce7
digest: sha256:caba568e15cca8224d4ddc3e5486f2ac294852b9fd29c2784fe0160f6f45a0b3
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9ab208049a53ade7d06e8ea3f676331ab66255aa46cf535da84a5651c00a7e88
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:85e8deb66c867abc00cde43d84833ffed4d7ad88359ef3175a2f4fc8fb771ce7
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caba568e15cca8224d4ddc3e5486f2ac294852b9fd29c2784fe0160f6f45a0b3
- 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:00d39d72aa108c3260ca5a5be6d876da53f9fe85001b7d3cfd53a5554c8d38b4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd42a7940ee169a3a3915b105dae284ecab1a324530035ecff6b28d74fa6639
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:d8130ca61df1208511321f77285d8b37d9909ecd5179d9191046db978e53b305
digest: sha256:7edab7a8c0e73c61af387908c6187912d2dbb755ac0b20a9697829234061a340
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b7746cf8d8e9b07b266a540cc52c25ca925c7549c86a55fa61a2cfbdc5db3881
digest: sha256:c815ca22cfe6908000c9242680ae0c36607dda6dc91d84b5df19502e126821cf
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:97423459da8caa516c541a605ffc9aa89658b690ed8eb7c768bf3ad56cb6e4ed
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:b7746cf8d8e9b07b266a540cc52c25ca925c7549c86a55fa61a2cfbdc5db3881
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c815ca22cfe6908000c9242680ae0c36607dda6dc91d84b5df19502e126821cf
- 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:d8130ca61df1208511321f77285d8b37d9909ecd5179d9191046db978e53b305
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7edab7a8c0e73c61af387908c6187912d2dbb755ac0b20a9697829234061a340
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-03-27-195820"
"base": "4.16.0-0.nightly-arm64-2024-03-31-234950"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00d39d72aa108c3260ca5a5be6d876da53f9fe85001b7d3cfd53a5554c8d38b4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85e8deb66c867abc00cde43d84833ffed4d7ad88359ef3175a2f4fc8fb771ce7",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bd42a7940ee169a3a3915b105dae284ecab1a324530035ecff6b28d74fa6639",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:caba568e15cca8224d4ddc3e5486f2ac294852b9fd29c2784fe0160f6f45a0b3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ab208049a53ade7d06e8ea3f676331ab66255aa46cf535da84a5651c00a7e88"
}
}
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-03-25-100907"
"base": "4.16.0-0.nightly-2024-03-31-180021"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8130ca61df1208511321f77285d8b37d9909ecd5179d9191046db978e53b305",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7746cf8d8e9b07b266a540cc52c25ca925c7549c86a55fa61a2cfbdc5db3881",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7edab7a8c0e73c61af387908c6187912d2dbb755ac0b20a9697829234061a340",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c815ca22cfe6908000c9242680ae0c36607dda6dc91d84b5df19502e126821cf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97423459da8caa516c541a605ffc9aa89658b690ed8eb7c768bf3ad56cb6e4ed"
}
}
12 changes: 6 additions & 6 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-03-27-195820"
"base": "4.16.0-0.nightly-arm64-2024-03-31-234950"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9637362f0b25f6629e28a323cc39078618c509a111a1181c96e9febea9b573d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc61f974638fc8d34f34285e6df24d3902be920ac4799dd8cdcf2d7b45e0fdaa",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40c917caff0c3da4ecb5976d1dacc8aae2994a2dd99931864628bea5c0b3889c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efecb843407d15af0c867c22168344b616ff28888abd34c9d9b6ec0a516ac210",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ab208049a53ade7d06e8ea3f676331ab66255aa46cf535da84a5651c00a7e88",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:297a87dadabda7fbd9fe32c9d90cbb8f518763cbdf41f3d49fe023b6a7da8c02",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00e63380cc84d6805f1bf0859bd17eb2bd59b499ff84d4647d499d704b5ed103",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94e184c600ec64f832a5f88e1ca752f16a5790b29e8cd745fb5295db12a24fb9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f034eda7cb24f562cd4a18e8d316306f9d0a10750058042c52acde52631991f7",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d7e363e1a55df90150d38f14e000672a36178a4a3a57ef6bb1f7eb3152a2af",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8ad49c34fef410e0ae1caa3125883326f459a627f3748cb3752e9a654a2d168",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4305f9f2e97e390be0e5d99ad20b8815fd0e1d34907c2fd4e44364d6ce30a89c"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:063d66476fb2a64c12332c1173f90e29a875846cbcec5c6ba2baee4d5782db18",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b55f59fe98e8828dd3b54074b60f8695a81f3b37700d3cd9031e2f92105a082a",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0619ae5e7a0f47b704545e6fb98d06996db60a5da7d24358a95c05926e4cee00"
}
}
16 changes: 8 additions & 8 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-03-25-100907"
"base": "4.16.0-0.nightly-2024-03-31-180021"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3907faea2062c2199b4294bb1ad0471e12cfd02760067f92a4c333f0c521b53d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7797ae4dce9f401b018e70b8fa85c0249e06162216ddb3ce1f035fa32b84c923",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:adead4917f86068fd6271fe6ef2a941d6588ab3cbe10c40a64462b736f1a5d58",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f333bf53a7a7a4429911c6fff2fd7bbc382f84cc3a7b5c401065ec281d20acf",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da7b69a49a50a5335009d22c3b5bb68d1e19fcafc28a05a831867ec5e6afe5ad",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97423459da8caa516c541a605ffc9aa89658b690ed8eb7c768bf3ad56cb6e4ed",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d72fee03c6c2b221bec414dee119d77ff5f767fe4881a20a7add7a509e5dff75",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbe1dfc3f12ec1f7ba9cbbd4000e6e523f190771ce1143366da0d4af3e143a7e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06474295ca25c4d0e06bc2d471ad8d94645c6785cde75d4a0deb963268e4d572",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6134ca5fbcf8e4007de2d319758dcd7b4e5ded97a00c78a7ff490c1f56579d49",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f5e47da2ab19562c512dc99f1b47f5a44f12a54830bbe20be94ac57e214c9a2",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:98ad03919da81c910aaa8a4f12fcae3048f2119735aeb7ca5271f7c16cf5e4e6",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:94f4a9ad37891cfbf58ca7db58000e703ff4d9d7a7b207d50ec844c1610e2111",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:76a5646d4b8406ae9065a1605644ec641acc97aa471ebae744e8e06487cec765",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:abcb7d325535405c86be57b2ff40d02bf2d4fb73a1568b8ab704bf0b859fe682",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8321c86cf35a2d80f3fd4148d58db7b2aa381639455f3d2c42e7d8977d74594",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:68ac2064070a491df2942cd2da1c65969f2d87d0e8335a6f57b7c5eeb519d0b9"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e7a96eb3fe35c805608c676edefc5052c83d284404b877330ee504301f80cac",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c25e06f7328bd28d0bc44320a1ff817f15e2718be22be048866850f14e0d47d",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:818ee3e8248402c074834279a43436216795c08e2cd77dd18da84c38652bf978"
}
}
Loading