Skip to content

Commit dee7226

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.19.0-0.nightly-2025-01-28-090833_amd64-2025-01-28_arm64-2025-01-28 (#4485)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 1a626f8 commit dee7226

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+101
-24106
lines changed

‎Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-27-130637
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-01-28-090828

‎Makefile.version.x86_64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.19.0-0.nightly-2025-01-25-021606
1+
OCP_VERSION := 4.19.0-0.nightly-2025-01-28-090833

‎assets/optional/multus/kustomization.x86_64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:592d773d7e799bc95a7372daabc2c23b32a296bf112cd54f0f141764df6a6206
5+
digest: sha256:e5fee20200bb81a79c523fc9456e3cd1dad5aa9f2f11df048692f9d3dd73cc17
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a972729ae9e3a915378104f47b0746e6753c1c39737894b1cb674122a120f42e
8+
digest: sha256:829408aa7e3e8398ab74815c5a5287e16262286be7add2a864a2cc3c25f434d5

‎assets/optional/multus/release-multus-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-27-130637"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-28-090828"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c540d189b0f243b6fa305c3644d844356d772237e75752dcde01fc31f58490c8",

‎assets/optional/multus/release-multus-x86_64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-25-021606"
3+
"base": "4.19.0-0.nightly-2025-01-28-090833"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:592d773d7e799bc95a7372daabc2c23b32a296bf112cd54f0f141764df6a6206",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a972729ae9e3a915378104f47b0746e6753c1c39737894b1cb674122a120f42e"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fee20200bb81a79c523fc9456e3cd1dad5aa9f2f11df048692f9d3dd73cc17",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:829408aa7e3e8398ab74815c5a5287e16262286be7add2a864a2cc3c25f434d5"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:16f392a11d50ca00eb1164523eb4e8822420372e57ebe0893f78e47a8dfe17b2
5+
digest: sha256:47e1c4cce14dc7955b7b1ed094d6fcad35de4a76186207bc28671a387228178e
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1a961e39e987c063dbe4030342406688607b46a2c37d309aa61197fc775dbe11
8+
digest: sha256:b5d7ccab245a769a0495e4750633d7510159d9cbeb5500b830b55a36a65da9d1
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:9bb48939f2918f3abf7bc5fc081260b08978f720a717a0391a7292d9a29554a7
11+
digest: sha256:f968fcb26574fedcd71befe2bbb533ffcf501bcf646ad42673519c05b87f8b07
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a961e39e987c063dbe4030342406688607b46a2c37d309aa61197fc775dbe11
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5d7ccab245a769a0495e4750633d7510159d9cbeb5500b830b55a36a65da9d1
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16f392a11d50ca00eb1164523eb4e8822420372e57ebe0893f78e47a8dfe17b2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47e1c4cce14dc7955b7b1ed094d6fcad35de4a76186207bc28671a387228178e
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-27-130637"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-28-090828"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfbc8c6027dffb3044a24dc9a0bc282152fa4494255421f1c9a70722249f7c12",

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-25-021606"
3+
"base": "4.19.0-0.nightly-2025-01-28-090833"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16f392a11d50ca00eb1164523eb4e8822420372e57ebe0893f78e47a8dfe17b2",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a961e39e987c063dbe4030342406688607b46a2c37d309aa61197fc775dbe11",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bb48939f2918f3abf7bc5fc081260b08978f720a717a0391a7292d9a29554a7"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47e1c4cce14dc7955b7b1ed094d6fcad35de4a76186207bc28671a387228178e",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b5d7ccab245a769a0495e4750633d7510159d9cbeb5500b830b55a36a65da9d1",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f968fcb26574fedcd71befe2bbb533ffcf501bcf646ad42673519c05b87f8b07"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-arm64-2025-01-27-130637"
3+
"base": "4.19.0-0.nightly-arm64-2025-01-28-090828"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:221fb92867cdb5b38603c05d3f00f52b3bddd0a0ffef184f88dabb6ffcf09b71",

‎assets/release/release-x86_64.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"release": {
3-
"base": "4.19.0-0.nightly-2025-01-25-021606"
3+
"base": "4.19.0-0.nightly-2025-01-28-090833"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8de71ba73f2f6e7b6786e489e10bd57fec0e0ac173c81df8019b9b2c27cc08d8",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ebde79958eca2af6deb3b8634e2449864d4c846ca708bef457040f54742e9f0",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc3e56a8c598567cddbf08e6a712d5334e894a17053953a37a6da17ee8891a6a",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bb48939f2918f3abf7bc5fc081260b08978f720a717a0391a7292d9a29554a7",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70b14dc9e199f3e27d56931748f1d140b36c90035b254b4fea71a848628b07c6",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0965bb7bb602f8d490fcbe44c77537eb856b9c4da8768179936add67e2d742c4",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae965c16546d3eaf61386c73dcf092be370bcf0e7b7908b81cfc63abbe512dc6",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef37a44c5258ccc79ebff53cb28e7f1d960ae9dda8b2717973335b78ed254d7a",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c99fc12c4e166d520f17296e8e335c73da5501179713d1252efa68bd499a6620",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2afbd63121afd56d2c0e9a7a9987124f47ef8bb49a71378dafe65acaa121c3f2",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f968fcb26574fedcd71befe2bbb533ffcf501bcf646ad42673519c05b87f8b07",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e57081a436372f3cc5ebe8bc325c29b2fefcda1e72edd8628fe949ed7a934e61",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47152ecb58d9a0363f4057f4bcaa90a7cf26b6fa80322df613d93e821f41ffdc",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c0fb44aad25b77c2e9f37efb864f1f5413307b867ad2f0908cc879bfe2269e2",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fafaa94c230a4fb50771f3f9aada289499b4b41e5469e6f8cdc00c3e4e99146a"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a34f57025406568d10fe9f73e8aa59ddb1037818478edb642c07fb68a4621d2"
1515
}
1616
}

0 commit comments

Comments
 (0)