Skip to content

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-01-09-085011_amd64-2024-01-09_arm64-2024-01-09 #2869

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 9 commits into from
Jan 11, 2024
Merged

NO-ISSUE: rebase-main-4.16.0-0.nightly-2024-01-09-085011_amd64-2024-01-09_arm64-2024-01-09 #2869

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
637fbb7
update last_rebase.sh
Jan 11, 2024
c7007b7
update changelog
Jan 11, 2024
a9ddbaa
update microshift/go.mod
Jan 11, 2024
4fa36f0
update microshift/vendor
Jan 11, 2024
793b3e6
update etcd/go.mod
Jan 11, 2024
6ab07bb
update etcd/vendor
Jan 11, 2024
d4c78da
update component images
Jan 11, 2024
b8af2ba
update manifests
Jan 11, 2024
96ebf9f
update buildfiles
Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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.0
KUBE_GIT_COMMIT=1de6a149075761f852d856f48dfb3663a6575751
KUBE_GIT_COMMIT=e58658f67791cc808b5218b87423035e18045d39
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-01-08-235909
OCP_VERSION := 4.16.0-0.nightly-arm64-2024-01-09-085007
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-01-05-154400
OCP_VERSION := 4.16.0-0.nightly-2024-01-09-085011
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:12a1ce8d63a3b2bb08d9b1789f44492c9ad7602fd29c189ec86197a1bf95e56a
digest: sha256:b0075c67465e698b0d3b9e1dee8f6db4150f2fdcafed63331bd8684c53fbc164
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9c42cdef938216acd1846ac9f7924202cec22b20efa2ab4a261aec11f20ea8dc
digest: sha256:38c7cc73614230013a7b2e14b2f748f080999ed7f51e290b099aa2f0fc6a230a
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0f39143624a96fb3558f74e89c727f04cad276429b81ca0c66fa877e6b35ce9e
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:9c42cdef938216acd1846ac9f7924202cec22b20efa2ab4a261aec11f20ea8dc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38c7cc73614230013a7b2e14b2f748f080999ed7f51e290b099aa2f0fc6a230a
- 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:12a1ce8d63a3b2bb08d9b1789f44492c9ad7602fd29c189ec86197a1bf95e56a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0075c67465e698b0d3b9e1dee8f6db4150f2fdcafed63331bd8684c53fbc164
target:
kind: Deployment
labelSelector: app=catalog-operator
2 changes: 1 addition & 1 deletion 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,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-01-08-235909"
"base": "4.16.0-0.nightly-arm64-2024-01-09-085007"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c8766eaaa420feed2de81e3966f98776240eb9b1b2ab430bb56f03e9d89f233",
Expand Down
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-01-05-154400"
"base": "4.16.0-0.nightly-2024-01-09-085011"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12a1ce8d63a3b2bb08d9b1789f44492c9ad7602fd29c189ec86197a1bf95e56a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c42cdef938216acd1846ac9f7924202cec22b20efa2ab4a261aec11f20ea8dc",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0075c67465e698b0d3b9e1dee8f6db4150f2fdcafed63331bd8684c53fbc164",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38c7cc73614230013a7b2e14b2f748f080999ed7f51e290b099aa2f0fc6a230a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f39143624a96fb3558f74e89c727f04cad276429b81ca0c66fa877e6b35ce9e"
}
}
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,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2024-01-08-235909"
"base": "4.16.0-0.nightly-arm64-2024-01-09-085007"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cb83c236c37774df2ae9add0b4dd5b19ecb5cc60931f4a0b0ee460f148e072ed",
Expand All @@ -9,7 +9,7 @@
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21ea815e5af3e80df6f593131ef72ecef7b3746b4373fc09f69dfd362dced046",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b0664d14f0e5e5603b86cc9d666280d73ac7f11f9dfe4c0a4b659b4280358547",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:34928f044d8b8e46844eb177eb82f607d6a4b16104ea6381e0de203986960b08",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59db01824fed6b3872049c2accc10b67c0306c8e2611f3b16e4830ecc02ea601",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e931ca29ef143a96c56dc49ed4f7891133649dbeed5c9b6276fa03dbbb4309b0",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-01-05-154400"
"base": "4.16.0-0.nightly-2024-01-09-085011"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f41e79c17e8b41f1b0a5a32c3e2dd7cd15b8274554d3f1ba12b2598a347475f4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbc65f1fba7d92b36cf7514cd130fe83a9bd211005ddb23a8dc479e0eea645fd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2591e2ae7f6e84bbfa360aec2c639045887cc541bd2647cbae29db313b6e7c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fd014edb6a778f6c1b0c09b613e7089e3a3b4b81603b84f6ef5307c1500aadd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f39143624a96fb3558f74e89c727f04cad276429b81ca0c66fa877e6b35ce9e",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28f386c6993f992032ed300876d7f76fb92dbc6e8376cbb780d1b52ff98f4f51",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c2e74680e9d9b443a26f6cf361c2d260466ac372187e490c38cddb77d9e30a4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d57d9fd754216a2e6173078a107ef4b9d196fc733b155d8691abd021ceff923b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d0024c3460a985a20f33b843e8e9d69d976e0aeb790d13ed55d91963f800be87",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7b4666917195445c84b78c55139614574ba57cf813a67a8652820e28c0d4817",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:d0c039eba8157965b0a7971ad4e01576d2c1e31b09fe938554163b324cc4dc73",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:caa0bbab808d8cbed476e8fa3e296ceb90f8d7d253e36588fa77e639ea389d55",
Expand Down
Loading