Skip to content

Commit a89ecf5

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-10-133523_amd64-2024-11-10_arm64-2024-11-10 (#4165)
* 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 cabe938 commit a89ecf5

File tree

43 files changed

+737
-599
lines changed

Some content is hidden

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

43 files changed

+737
-599
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.2
4-
KUBE_GIT_COMMIT=b903dd22e38b8e6d3eefac0798cfb86295d26fab
4+
KUBE_GIT_COMMIT=e7a7a8d687079e02b36a459284a85cdb27f68e1e
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.18.0-0.nightly-arm64-2024-11-06-231902
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-10-184114

‎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.18.0-0.nightly-2024-11-06-051814
1+
OCP_VERSION := 4.18.0-0.nightly-2024-11-10-133523

‎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:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd
5+
digest: sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:51a6da4314aaa5e45fd1d551c2362c0278d06c29fd0ab5b1352488d0afaf7dd6
8+
digest: sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84

‎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:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024
5+
digest: sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:36779731333bafff2224bb40befc40d0cfbdcaca79128fae4d5f10cbb5f4bdcd
8+
digest: sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed

‎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.18.0-0.nightly-arm64-2024-11-06-231902"
3+
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51a6da4314aaa5e45fd1d551c2362c0278d06c29fd0ab5b1352488d0afaf7dd6"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84"
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.18.0-0.nightly-2024-11-06-051814"
3+
"base": "4.18.0-0.nightly-2024-11-10-133523"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36779731333bafff2224bb40befc40d0cfbdcaca79128fae4d5f10cbb5f4bdcd"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed"
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:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2
5+
digest: sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0
8+
digest: sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb
11+
digest: sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4
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:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
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:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
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:201f19cd76395e9492deb63c1a081de467448407686080e92132d784528e0299
5+
digest: sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a852280ecb45457f34e6cbd189316e7fa35abda050265167231561450b4ae251
8+
digest: sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6
11+
digest: sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81
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:a852280ecb45457f34e6cbd189316e7fa35abda050265167231561450b4ae251
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
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:201f19cd76395e9492deb63c1a081de467448407686080e92132d784528e0299
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
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.18.0-0.nightly-arm64-2024-11-06-231902"
3+
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4"
99
}
1010
}

0 commit comments

Comments
 (0)