Skip to content

Rebase main 4.19.0 0.nightly 2025 02 28 132549 amd64 2025 02 28 arm64 2025 03 02 #4625

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
openshift-merge-bot merged 10 commits into from
Mar 3, 2025
Merged

Rebase main 4.19.0 0.nightly 2025 02 28 132549 amd64 2025 02 28 arm64 2025 03 02 #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
beaf1bb
update last_rebase.sh
Mar 3, 2025
3b67c20
update changelog
Mar 3, 2025
3ed0dc9
update microshift/go.mod
Mar 3, 2025
742727c
update microshift/vendor
Mar 3, 2025
89f23b9
update etcd/go.mod
Mar 3, 2025
0afb6a5
update etcd/vendor
Mar 3, 2025
5b946bc
update component images
Mar 3, 2025
7da1090
update manifests
Mar 3, 2025
1156e3d
update buildfiles
Mar 3, 2025
00ae3ae
explicitly specify authorization-mode
eslutsky Mar 3, 2025
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=32
KUBE_GIT_VERSION=v1.32.2
KUBE_GIT_COMMIT=c44e83d45f377c079cebd613a6ad987168462cda
KUBE_GIT_COMMIT=c3a6a36c352ab7a0616fd1e6ffedaf872b4aba21
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-2025-02-27-211136
OCP_VERSION := 4.19.0-0.nightly-arm64-2025-03-02-211136
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-2025-02-26-050226
OCP_VERSION := 4.19.0-0.nightly-2025-02-28-132549
10 changes: 5 additions & 5 deletions assets/controllers/kube-apiserver/defaultconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ apiServerArguments:
- "true"
anonymous-auth:
- "true"
authorization-mode:
- Scope
- SystemMasters
- RBAC
- Node
audit-log-format:
- json
audit-log-maxbackup:
Expand Down Expand Up @@ -181,6 +176,11 @@ apiServerArguments:
# See issue: golang.org/issue/26162
strict-transport-security-directives:
- max-age=31536000,includeSubDomains,preload
authorization-mode:
- Scope
- SystemMasters
- RBAC
- Node
authConfig:
oauthMetadataFile: ""
consolePublicURL: ""
Expand Down
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:4832e5d37bcd14d5510025d96f3e1ac1022d4d8b5e69000cdcc06d19ec4b157b
digest: sha256:fbb7dbcb8f21f10d1c87a623271c635cdd6d3229ab671a8dbbd4b79f181a01ca
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:52ee0954fdbcd647a1d83efb048fd8f9bedcbcf53fc5d5512a971edfe386f21b
digest: sha256:79e04a5075395820dea09b42d72c8781f9b5b31f3dd07f415480dc138dd4b953
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-02-27-211136"
"base": "4.19.0-0.nightly-arm64-2025-03-02-211136"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17accae06c6875ea8c558b9b68ff0947033f63d0e5c7b45bf2220b14d961fa49",
Expand Down
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-2025-02-26-050226"
"base": "4.19.0-0.nightly-2025-02-28-132549"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4832e5d37bcd14d5510025d96f3e1ac1022d4d8b5e69000cdcc06d19ec4b157b",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52ee0954fdbcd647a1d83efb048fd8f9bedcbcf53fc5d5512a971edfe386f21b"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fbb7dbcb8f21f10d1c87a623271c635cdd6d3229ab671a8dbbd4b79f181a01ca",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79e04a5075395820dea09b42d72c8781f9b5b31f3dd07f415480dc138dd4b953"
}
}
8 changes: 4 additions & 4 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,10 +2,10 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5
digest: sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc
digest: sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6
Expand All @@ -16,12 +16,12 @@ patches:
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0
- 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:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7
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:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd
digest: sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c
digest: sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586
digest: sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87

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:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee
- 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:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9
target:
kind: Deployment
labelSelector: app=catalog-operator
6 changes: 3 additions & 3 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-2025-02-27-211136"
"base": "4.19.0-0.nightly-arm64-2025-03-02-211136"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fa458b1a5adf1d7b3cca8d976efaa37c25eaf8d5b7f4e16fdb7f8a22d8d9d4e5",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7ae9748a5620e543c7f8fa40594d8c6458d0bb5b4e1330dfe384e2301cbc5cc",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73613c7689e0c6b74c417f2d242dd648f4aa67dc8f13ec60a516dde3eb7e0ea7",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0fe8a297960837f41004fa4d99a632eb3fb8312775c50646d5ad46cbed09f0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6"
}
}
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-2025-02-26-050226"
"base": "4.19.0-0.nightly-2025-02-28-132549"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c147092264c034e2e9ad9b4a79892a3c56a1ec4890e3a530a50f8724ebedbfd",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:571767ce8bcd161dfe2a16f9dacf92686fca3d067327532a01291157b516258c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3b79be50434b0054318dfaa14dae5337e29c511223c7db19af5ed8c18a2c8e9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a069f181b8a53ebbabeaa701a4e0c90ec1b9bf61327a5cfac8beeaf03fc685ee",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87"
}
}
4 changes: 2 additions & 2 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.19.0-0.nightly-arm64-2025-02-27-211136"
"base": "4.19.0-0.nightly-arm64-2025-03-02-211136"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c258dc6115d77a23444ee554dc000f5ac0911798960633b849a2a07c519c72a8",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1534e5f4a8c276615266bebb67dbbfd96fdfa53b7b5e7e604ec82b34d4ed5bce",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cbcc4a5a74d0bc2044734fcc2696a8a6bdc6fa020e05226e771c815f78ecaf3",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f6aaee74e0a764b4813bbefe23ec07ea860dfa486dcfb61b0c52b39138a53e6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a88e5cff12d4024ced5b3a2047298bafe6d21f43bae9bc193102d26a7a2982",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f330a4d7e61176c25f6e8db53eb268b729f308658287847fc05ac4d0b0baaeef",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:91a38df15076858d769d31f6c287bb8722cf5c651d9bedb19f625ee5eb55a5bb",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:beefff29b6bdb51adbcc4513623979e87720ba73cd95382024ef5f1f594b8597",
"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:47d02aa98e0aa7e1cd26c4892571e6eedc953d25a77d03292c040adf54257488"
Expand Down
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.19.0-0.nightly-2025-02-26-050226"
"base": "4.19.0-0.nightly-2025-02-28-132549"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7557d9d4b6947c627745e877a78e86d75838ac075fc1bb1118ed747d3e2b4675",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85e75ada48bd1174fb86fbf65bb3e1f3960eca44444d7dd1888dc9af3804ff83",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:446c9e5d80e6cd5da615b4d2d6ce198b0a9f05e1477dfb49939010362ae1787b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d11250e25278f5f1bbdbeacd0e6592dd444e9f7472fc4c24acbf5cb12ae586",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:671f739b2a5e1ffabb6479f625c3c5e04b072762ef50e148c402de51da3af2a4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38579eee0c6105fb7b60b0833389e355c18e0af182f8cdef7643d472d8f3cb7e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c7757f9dc7df0eea5d235a6670c2edd9ddd2cc80d96ff5f523f3623bca50e82",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6ee3a3dae1c2cfd2cb5b40ec2aaf32e3892a440b169db0b2b02b8fd863d9cb3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:884d74ad9b58ba18ace986378356651225c0685e57658e93713bbb4002e11459",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8552682e94461d00458c5ec65ec884abbfdb7c10792b17abeb2073fc90f79295",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdd5bb4bd9cc887b93543b1e06b51467b1e03f601154fb68d084aa6e7b300e87",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bfc19f0a062a55a5ce920c6f8823a86e61aac939dadccb0f178c97b0267161c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5ff365113bc3bfccdcd04070eadeda38046e36d5560dc38f2e099eea1ee3dc5",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f29446b2b4d99b8aabd1d067eba73c81e240ed224c69609a77f39629a10697f",
"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:7af909568884422b400bc8f892f80236cc1ced1671a447dcf42c29aa43218041"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59d0cbda982b75259e9acccb856949994d567e00ea82a94a3906df48d3c2c77e"
}
}
Loading