Skip to content

NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-13-083421_amd64-2024-12-13_arm64-2024-12-13 #4320

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
Dec 16, 2024
Merged

NO-ISSUE: rebase-main-4.19.0-0.nightly-2024-12-13-083421_amd64-2024-12-13_arm64-2024-12-13 #4320

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
fca2feb
update last_rebase.sh
Dec 16, 2024
ec27735
update changelog
Dec 16, 2024
fd3b001
update microshift/go.mod
Dec 16, 2024
e045f31
update microshift/vendor
Dec 16, 2024
4cb3ee8
update etcd/go.mod
Dec 16, 2024
971bf1a
update etcd/vendor
Dec 16, 2024
04a8d9c
update component images
Dec 16, 2024
974e18f
update manifests
Dec 16, 2024
ec23cce
update buildfiles
Dec 16, 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.3
KUBE_GIT_COMMIT=8ac36bf977d93ee5db979a4bda774d4a0f3b3367
KUBE_GIT_COMMIT=3c62f738ce74a624d46b4f73f25d6c15b3a80a2b
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.19.0-0.nightly-arm64-2024-12-12-185745
OCP_VERSION := 4.19.0-0.nightly-arm64-2024-12-13-065745
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.19.0-0.nightly-2024-12-10-040415
OCP_VERSION := 4.19.0-0.nightly-2024-12-13-083421
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:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85
digest: sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130
digest: sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd
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:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f
digest: sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c
digest: sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8
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.19.0-0.nightly-arm64-2024-12-12-185745"
"base": "4.19.0-0.nightly-arm64-2024-12-13-065745"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5fea7fd6042dba42a639ca092a2155cb2ad1907e7a3ea9377d35e130d74dc85",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:758200f8625fc59a65a2e080a296af8ca34caa66e5828f725eb3798013d03130"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:698625db18424b50454c138d352ac708900968441c19128a36d1ae8dad391c17",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b41c0a434aa18c6c8d117c37e3423750d7d7df065add3f1361c1d774929f2cd"
}
}
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.19.0-0.nightly-2024-12-10-040415"
"base": "4.19.0-0.nightly-2024-12-13-083421"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75f534782567b2c9858382e383a02518477ee699c2d510eef3f67862f8bd885f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0cdee341181aeee5a0fdb899f3adc003d081ff09550baba66ebfbbd88f80a9c"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1cb7164595d0278043b2312bb405085d0a52aa8887f04e3b45b71ceb03e35963",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30044805706b248c6388313261fa956b4a8078651e042c829764b2b22b500f8"
}
}
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:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
digest: sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
digest: sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754
digest: sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8

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:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c
- 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:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b
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:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14
digest: sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78
digest: sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a
digest: sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de

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:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d
- 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:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa
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.19.0-0.nightly-arm64-2024-12-12-185745"
"base": "4.19.0-0.nightly-arm64-2024-12-13-065745"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15565228f57edc3755a3b8e47cfee054892cabe9ae23c6e18eba9180e553afa5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1b421438373ad5af6365e84a18901a152dd6785d18628c39035647285d573bb",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbed06d895da4c2f5a798fc8a4f8b4703b9cd97c4d77e0f4c26e16374332755b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ffe3cd25c2038eb5bfb64b6baca158e9e41637cbd76445db4acc5b0b4fac6c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8"
}
}
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.19.0-0.nightly-2024-12-10-040415"
"base": "4.19.0-0.nightly-2024-12-13-083421"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff7f3e157684126f532c011ea6c1c4e10691a0bc0dda834778a77b3464061e14",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4727c291f444adc54745e7ff508a4819cb8627bcbd4a3a06702c45aca55ec78",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10fa045f3618bbd2382cb9075b8ae5b0786b55e5439ff9464d01c7e62c9af4fa",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:279dbfceedb880413e3480a34c2bf743da653d0a3b05af46c629822b2f6c2e1d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de"
}
}
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.19.0-0.nightly-arm64-2024-12-12-185745"
"base": "4.19.0-0.nightly-arm64-2024-12-13-065745"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ada8d538316c64e697fdc001191eff9dbaada5e27277521722b74983380f8a62",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac7c46e0acb811055792719a0b1b962912b35ebff52cda8269104f7e928c777b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:616d02742849576aee0150c394ac45383d5c7f5de5ba1897b64d27f5ca922bd3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12f1b9eedd9597d984944af10116331be505e04dadbb644b72841e144b167754",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c143ac06857ec6c977abf31f6ddc98197671501b78fad92bbc18f298324bb5a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95400aeea06aabf48ec24cb9fc7d048d7b6b5d97f276613d2878821d7095ef35",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26ce9277d590307a1b4013882ca1f96f0c049eade459c469fbf34e2c2cb96ef5",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c831570821f098fcb3ca7161decafd3080d85de6f792c01590deb6ab38815217",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9526d4ca032cd86a478640a33cebebc61985ff8f48c90c9b23192bce79416b84",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8652468d066450a098f2f2f705ac4c088740c3007f42ce84f976c9eb8bbe9d8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b4f8dde1906f5daa20f46251d25a4c4b7529231fc2e6b715913910e6082ba8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:644a9bfea4326b227e21d40ccbfbb3c0c4c308249a1462d9eb3776637db49c92",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:618a701c092403624182c4969c1a6a2f4aadd26c7b50e46c7fbe7175da0f3575",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbe4e12785990a4764abb85ef5c5c64bdaafa83c29e35beb77e03d995f0b256",
"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:bb7d94e9197a4fc5048fd8ba3f5ce0f499b0b9969674eed87651f4a023d7d827",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1794da2d90e4f222aa69fe2ee92ea945e40dfb2b27de34177d2e4258b6eb76b"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7c79ee759c3bb9ae50d27d7487c9dc9de5224c9175ac9636f500ab0fd46e90b",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30ca243687727c62df5c0f952105a52c6e587c1ec0f348ae91bf8e09de7f2494"
}
}
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.19.0-0.nightly-2024-12-10-040415"
"base": "4.19.0-0.nightly-2024-12-13-083421"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:11dcd216400a9a348fd17d4dc655d722366cefa6793772fb05570f514d19c60c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e2d35374ebdd21a5b2099a81f2b685f6c2c40fe206ea2ff791fec48aa2db55b",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fc2ebfa9b56c717b132f17c9e5e6cdf56bbc1a86aa0dae877174f073d90f6d4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15939a25f4893e3ef43e340e9742bf5f60facb47b2537c579e266c1026bc746a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a93b770eaab502d63f7a9048d7d249503c5e345d2a58abeaf29658ee38c31ae6",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce8be7e248742136892ccadc709209868b5c370eecca036798e5be9742f6edb1",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd0fc0973a3f3fe3562bac1412549f339b18db4203f407d110d83b60c8cb2b96",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce20e9d00b53b9df84182f668cc865f6f2f3bbaad4cd1d920856e246ec19376d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e24f7193a6269796d7a005febb7f648248c2f9cc7954eba091d50d9bc9d983aa",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffee8631d4a81b4a9bed4b642177f02e37dd0b1b22110fd04bce0a4d20d821e6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fecb0048c9c7f250496781179cae0a84b03809cd28b23fc7dd5a39cc245ce1de",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8665919370d3aee9d9a1dc7fbbdaf41ae5d5d905dfbd39b52e5d3d3d07270b9f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9baab801b7c1371ecebdbb4570228756e056689e7f834fbfc597df4c8eb1e3fd",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e91a5da769452f47bb5c2518174474b08d466344cd9a46f49d386f0562e88acd",
"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:3354e29f3c1124db7e5f4de0a4130539f7c3db1eb15b98b38318fa8d9bb72174",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26b13adf0c15c49fdf24c4091cbbe1e692c2303c8c6558a271858c2f31f7e0cf"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d49a8e92e26b4e27adbb1d37cf15a2ea2ae0501054ff9db1a355c80802fdc9ba",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41c28bd33107bba44960076491be57572c782b1275ae5519b0bcd04853efbdb8"
}
}
Loading