Skip to content

Commit 1caeae3

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-2024-12-13-083421_amd64-2024-12-13_arm64-2024-12-13 (#4320)
* 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 0703474 commit 1caeae3

30 files changed

+678
-339
lines changed

‎Makefile.kube_git.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=31
33
KUBE_GIT_VERSION=v1.31.3
4-
KUBE_GIT_COMMIT=8ac36bf977d93ee5db979a4bda774d4a0f3b3367
4+
KUBE_GIT_COMMIT=3c62f738ce74a624d46b4f73f25d6c15b3a80a2b
55
KUBE_GIT_TREE_STATE=clean

‎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-2024-12-12-185745
1+
OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-13-065745

‎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-2024-12-10-040415
1+
OCP_VERSION := 4.19.0-0.nightly-2024-12-13-083421

‎assets/optional/multus/kustomization.aarch64.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:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85
5+
digest: sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130
8+
digest: sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd

‎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:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f
5+
digest: sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c
8+
digest: sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8

‎assets/optional/multus/release-multus-aarch64.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-arm64-2024-12-12-185745"
3+
"base": "4.19.0-0.nightly-arm64-2024-12-13-065745"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd"
88
}
99
}

‎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-2024-12-10-040415"
3+
"base": "4.19.0-0.nightly-2024-12-13-083421"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8"
88
}
99
}

‎assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
5+
digest: sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
8+
digest: sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754
11+
digest: sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8
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:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c
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:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎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:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14
5+
digest: sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78
8+
digest: sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a
11+
digest: sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de
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:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d
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:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/release-olm-aarch64.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-arm64-2024-12-12-185745"
3+
"base": "4.19.0-0.nightly-arm64-2024-12-13-065745"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8"
99
}
1010
}

0 commit comments

Comments
 (0)