Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-13-182254_amd64-2024-11-13_arm64-2024-11-13 #4175

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

Closed
microshift-rebase-script wants to merge 9 commits into from
Closed

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-13-182254_amd64-2024-11-13_arm64-2024-11-13 #4175

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
f360e15
update last_rebase.sh
Nov 14, 2024
9494e3e
update changelog
Nov 14, 2024
3ced9d7
update microshift/go.mod
Nov 14, 2024
12bc02d
update microshift/vendor
Nov 14, 2024
a13f1be
update etcd/go.mod
Nov 14, 2024
4ba0fd5
update etcd/vendor
Nov 14, 2024
629019e
update component images
Nov 14, 2024
9ba73bd
update manifests
Nov 14, 2024
32045c0
update buildfiles
Nov 14, 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=31
KUBE_GIT_VERSION=v1.31.2
KUBE_GIT_COMMIT=e7a7a8d687079e02b36a459284a85cdb27f68e1e
KUBE_GIT_COMMIT=a3f31a4f2c587420f1ddb3bcdb161bf64a8c436b
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.18.0-0.nightly-arm64-2024-11-11-191251
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-13-191251
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.18.0-0.nightly-2024-11-11-144244
OCP_VERSION := 4.18.0-0.nightly-2024-11-13-182254
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.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-13-191251"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd",
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.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-13-182254"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902",
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:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
digest: sha256:eeec5ae41c7d9401e4f664db821657ed2dbcf57bf41053561b8ed26f027b89c8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
digest: sha256:1bc8c6b62db31af0c8cc3875e888d679cbfd1749dbd8c04291a2b75d5605e073
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4
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:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bc8c6b62db31af0c8cc3875e888d679cbfd1749dbd8c04291a2b75d5605e073
- 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:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eeec5ae41c7d9401e4f664db821657ed2dbcf57bf41053561b8ed26f027b89c8
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:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
digest: sha256:543fcf613f8f3452e15ff342d9b58afc4a83773d502b8d0d58580a0afde857db
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
digest: sha256:b2f6d4602c8de8991288ea58280153c28143857b5b9c6b192b11505f0762aadb
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81
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:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2f6d4602c8de8991288ea58280153c28143857b5b9c6b192b11505f0762aadb
- 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:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543fcf613f8f3452e15ff342d9b58afc4a83773d502b8d0d58580a0afde857db
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.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-13-191251"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1926294799aa17f3ece560201fa2a4e6646133bf98830d08c7edf2db9380e1b1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fc2bf2747495d73901c43d47e326a49ed295f2aaea31b2892f74cefc83902a9",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eeec5ae41c7d9401e4f664db821657ed2dbcf57bf41053561b8ed26f027b89c8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1bc8c6b62db31af0c8cc3875e888d679cbfd1749dbd8c04291a2b75d5605e073",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4"
}
}
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.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-13-182254"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4140b9d7a244770b1f779e133d07d70b6a09ff5022d62f7353bb4b892c9ece1b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c4aa85b907bdda169674ecf441690043967c623b9c3794f8f22185fbbf5143a",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:543fcf613f8f3452e15ff342d9b58afc4a83773d502b8d0d58580a0afde857db",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2f6d4602c8de8991288ea58280153c28143857b5b9c6b192b11505f0762aadb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81"
}
}
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-11-191251"
"base": "4.18.0-0.nightly-arm64-2024-11-13-191251"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50c645fde15c60d0738dc9c51c498ca0ca5032db57982f8c13f3bfbc42014021",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9f02e6b59b8669fe18a6357dfb3327a7433a7cfb6817a8216eeba6b3b4a183d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a812b4d6a977e4260edd57428c794c97c238e01abb08dd4f5bb37d3699513780",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15e2c43fcfccf553f1621f549b13ac9ae4248feb9f44bf0a93ce61b7e42f8574",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f17b19b818aebda04cdd6db74706aa8f3b1e4d6c3f033f6828b7266feaa99e88",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a47bf2b0a97a2cfea91bf8a25c723ce369c739832cc414537ec43407630e108",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91c80bc81bf03c04a4629c3cb570d88d5e11ced91ec5b84887bacf460b90717",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f937b24e7c2c8ba0af25c91ba4485ae6741e985ca02b5a52d47d48b23ea0c37a",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77e2de1850f4dd0d5c0f1881d6ab131b6dd561b41d399989199ef751cc823098",
Expand Down
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-11-144244"
"base": "4.18.0-0.nightly-2024-11-13-182254"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7186ff2cc5b5580a686b5f80389cbb9310088ab2036241236f2ff6dafcf3145",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40db1c2435c96f5e1dc32ee96b97280f654f3b8497c5871603fc633b0ca5982d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f76142c8f309b5e3794f88d052f3ccf271abdfee71f7cf64ed24909a5f7ef420",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ecdcbc49841a709d11cbdba31674a6378762adb8f6fdf61b7cdce245149b122e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff8eeae92e3bf32c38a60615ebabb35bc2a4ea7cd3de6952acba52942adf9447",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33d527054f8a6ee3731183d455d4b702dd54b5fef34a1b917f4427dedad2a93d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d60b66efe1e6242dd39f9d4de4f35cb8797d57609523185fb2d49b6c62819d1d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcdd004fcb3d3deaf0caaf007e6e690eb0406958290de8192838077af4227617",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d98127535263f9672d3eff5936f5f561ad4cf2b2040781ad9294144a4785efda",
Expand Down
Loading