Skip to content

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-10-133523_amd64-2024-11-10_arm64-2024-11-10 #4165

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

NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-11-10-133523_amd64-2024-11-10_arm64-2024-11-10 #4165

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
4208bbb
update last_rebase.sh
Nov 11, 2024
464445e
update changelog
Nov 11, 2024
529b484
update microshift/go.mod
Nov 11, 2024
477ef97
update microshift/vendor
Nov 11, 2024
7fd35fe
update etcd/go.mod
Nov 11, 2024
1012d70
update etcd/vendor
Nov 11, 2024
d409d0e
update component images
Nov 11, 2024
11c1d15
update manifests
Nov 11, 2024
3706996
update buildfiles
Nov 11, 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=b903dd22e38b8e6d3eefac0798cfb86295d26fab
KUBE_GIT_COMMIT=e7a7a8d687079e02b36a459284a85cdb27f68e1e
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-06-231902
OCP_VERSION := 4.18.0-0.nightly-arm64-2024-11-10-184114
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-06-051814
OCP_VERSION := 4.18.0-0.nightly-2024-11-10-133523
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd
digest: sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:51a6da4314aaa5e45fd1d551c2362c0278d06c29fd0ab5b1352488d0afaf7dd6
digest: sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024
digest: sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:36779731333bafff2224bb40befc40d0cfbdcaca79128fae4d5f10cbb5f4bdcd
digest: sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-06-231902"
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fed16f6fca30c2bdf59dffe7d02110be21ded32eabe2b1d96220d3838c0857fd",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51a6da4314aaa5e45fd1d551c2362c0278d06c29fd0ab5b1352488d0afaf7dd6"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f800e72519d74816bbbaa0ab104e5fde7c373de0fd2db365fd4f5c9ebe7b04dd",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bb0180dd0c4b2758082dc7d998e7e0c3bc1749b859fc1ec3a2b6decbdb4d3a84"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-06-051814"
"base": "4.18.0-0.nightly-2024-11-10-133523"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6a863d5beff574d72bdcd1c48e6a441d875f878eaca203dd3702988293e7024",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36779731333bafff2224bb40befc40d0cfbdcaca79128fae4d5f10cbb5f4bdcd"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:091415b6290dc56316e72572de16d6c88c9108f784ea9968e047f5ca19735902",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d43ff04149f27eb50354e424cf99fb62ac9050edc2f93cc702b061aa2c71bed"
}
}
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2
digest: sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0
digest: sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb
digest: sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1
- 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:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 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,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:201f19cd76395e9492deb63c1a081de467448407686080e92132d784528e0299
digest: sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a852280ecb45457f34e6cbd189316e7fa35abda050265167231561450b4ae251
digest: sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6
digest: sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a852280ecb45457f34e6cbd189316e7fa35abda050265167231561450b4ae251
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf
- 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:201f19cd76395e9492deb63c1a081de467448407686080e92132d784528e0299
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 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-06-231902"
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6048e24db01ac0fc2b5f3c6439eaeb2506063acf4d2075f2be30b2b99ba636a2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec4672654997c23126e2d1fd5b85152705f7f1f061c54373e50547ada046acd0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493e5ca5ab8fb1f72022fa69abfb82de14ce938212e5d23abd80d8d72c54fcab",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:178f77c389f3420a0f1f03878caeb7a7ba88ebd641a8705ec53e24cafff7b6b1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ba43643b7a09efc175e233a07df8e3cee748f6921c3b16fe979925d89b9f8e4"
}
}
8 changes: 4 additions & 4 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-06-051814"
"base": "4.18.0-0.nightly-2024-11-10-133523"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:201f19cd76395e9492deb63c1a081de467448407686080e92132d784528e0299",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a852280ecb45457f34e6cbd189316e7fa35abda050265167231561450b4ae251",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:133ee5367f5b23043db0fb1d70ece6f5d0550d46695f18aa1c88e45695d6d4c4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cfee23f05784246578206fced8c8c9f734ee8c8f5851a94b4ce0bdf596476caf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f0988a3ca560c93ae2b901702b8ccc23168c998abe6a46ff8e11bf7a003fac81"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2024-11-06-231902"
"base": "4.18.0-0.nightly-arm64-2024-11-10-184114"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:67895d042821f254a13d03257501ca0b3f6d1706cfab06301bc153e01c8eff54",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08d70c98fd079964f5be126cb62edece672f86c0a1ce191c8e1b0cd594e36aa6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65592de5dd75bcddde7b0aaad57ee13dcf1609ee10f93e3f5c13297ccb02a623",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a89ae2513ce7969f0afb7d4f2ce754cd81ab2c1e0bb4d5674bc4c8f3cc9beb",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13d25db8e73ef1051e72801e1303322c18a63288e279b98acfbb9797b80e52d7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09f6dcc88e217c0ba5c59ba5d294b0f4dfa784ac558e4c296049859c9e5d429f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ab066fd06426a603df78265fff782bc85ad16b16b51fdf1e0b7fe1f6fc2d3f83",
"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",
"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:4d8cc5c22805eb7a74e3052514b5120bab1184b5a2af5beb095d96bcbbabd91e",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d732bcde9f9f89729fedf141e4b4ada77de8ef8cf83ed78721ad1f256260bf8"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77e2de1850f4dd0d5c0f1881d6ab131b6dd561b41d399989199ef751cc823098",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76db0e261777098be531ac242ce3076e4c82ab421cc5f7cbc12d81325907b144"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.18.0-0.nightly-2024-11-06-051814"
"base": "4.18.0-0.nightly-2024-11-10-133523"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5868c58d08603d8aa72e41d930971e500ac10da20ed6a77e9baa6f3737d1e176",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4a1372b849882dd2da0127cbd5068a4e3076db82ca9ae641b9b7189d3dcc8b5",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4bc36ea2942f3c3aeb402f375bd3a29cd5f45ec755ac38a088e14c151de6619c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c0c2e423c4481a1e5ecd844aa6a62c3ee3f26edb40642056d802a14d2fd46f6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38a27ed6ee33fc4b788d9f1fd9ac67afd365f446a5216a1319b13bbbeaeb3230",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51422956f532f5c80f89bdc51f0d32bd6affc99a802176982dba8ea95b214755",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:94cfcb0bee376098dbc504974a79db0c3a747f5cb5f7a4cab9a4c527f9dc9fff",
"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",
"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:06e3e6ff47cedfa72869627be0a7a42cb06b74289a88b179d4f65e66a9e3c031",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5ee9d4bb300d384f628d6ff69c7493727e2720a9a0cfdde4588f6bc7c2f20e5e"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d98127535263f9672d3eff5936f5f561ad4cf2b2040781ad9294144a4785efda",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c054e384a82f0f7d83f1642e2831a9c94cf5046663dd64090be095fcd3f1f07a"
}
}
Loading