Skip to content

Commit 51d4254

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #5353 from pmtk/rebase-r420-4.20.0-0.nightly-2025-08-18-192426_amd64-2025-08-18_arm64-2025-08-20
NO-ISSUE: Rebase r420 4.20.0 0.nightly 2025 08 18 192426 amd64 2025 08 18 arm64 2025 08 20
2 parents f2e684c + c3c7492 commit 51d4254

File tree

100 files changed

+3655
-399
lines changed

Some content is hidden

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

100 files changed

+3655
-399
lines changed

‎Makefile.kube_git.var

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=33
3-
KUBE_GIT_VERSION=v1.33.2
4-
KUBE_GIT_COMMIT=80b82ba5ae030c3e2b7d7752a204ddf71139842c
3+
KUBE_GIT_VERSION=v1.33.3
4+
KUBE_GIT_COMMIT=7b25b18c196a8b62a1f7d3c4b6399464974de625
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.20.0-0.nightly-arm64-2025-08-12-153531
1+
OCP_VERSION := 4.20.0-0.nightly-arm64-2025-08-20-095829

‎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.20.0-0.nightly-2025-07-31-063120
1+
OCP_VERSION := 4.20.0-0.nightly-2025-08-18-192426

‎assets/components/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:98406cac2d032ec6107fe829a5dacdcdee53919635c23ec0cd8136f0faf2e505
5+
digest: sha256:c937857a3d89becc09e487de8012a7904f484603e0c38d7df13e8622a895b3b0
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:762b4fc977379ebb47baa7790ea0f1638c8fb6863752d1ab6fea78b8991f408f
8+
digest: sha256:84cedd7433d74d5c03a0503028e2b4b57ee73e3a46baf92d745f1b8f8bad299a

‎assets/components/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:5a64d2b1a142fc6af09a42314b596edd4134742b92fea7499f1cc0db31143423
5+
digest: sha256:6abed6915831ad11c46d5318fc7e8c299c514a1ac15593dd1ce6fb52e9070178
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:b2970007f884f13b5b22a93050f09440a057fd6d290af4eb9e67dff0c70d95c4
8+
digest: sha256:352aa0e9ef0280aeaba4cfac34beba63fc44fbe17b8e5939095640d20254a825

‎assets/components/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.20.0-0.nightly-arm64-2025-08-12-153531"
3+
"base": "4.20.0-0.nightly-arm64-2025-08-20-095829"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98406cac2d032ec6107fe829a5dacdcdee53919635c23ec0cd8136f0faf2e505",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:762b4fc977379ebb47baa7790ea0f1638c8fb6863752d1ab6fea78b8991f408f"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c937857a3d89becc09e487de8012a7904f484603e0c38d7df13e8622a895b3b0",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84cedd7433d74d5c03a0503028e2b4b57ee73e3a46baf92d745f1b8f8bad299a"
88
}
99
}

‎assets/components/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.20.0-0.nightly-2025-07-31-063120"
3+
"base": "4.20.0-0.nightly-2025-08-18-192426"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a64d2b1a142fc6af09a42314b596edd4134742b92fea7499f1cc0db31143423",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2970007f884f13b5b22a93050f09440a057fd6d290af4eb9e67dff0c70d95c4"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6abed6915831ad11c46d5318fc7e8c299c514a1ac15593dd1ce6fb52e9070178",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:352aa0e9ef0280aeaba4cfac34beba63fc44fbe17b8e5939095640d20254a825"
88
}
99
}

‎assets/components/openshift-dns/dns/daemonset.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ spec:
2222
- name: config-volume
2323
mountPath: /etc/coredns
2424
readOnly: true
25+
- mountPath: /tmp
26+
name: tmp-dir
2527
ports:
2628
- containerPort: 5353
2729
name: dns
@@ -52,6 +54,8 @@ spec:
5254
requests:
5355
cpu: 50m
5456
memory: 70Mi
57+
securityContext:
58+
readOnlyRootFilesystem: true
5559
image: '{{ .ReleaseImage.coredns }}'
5660
- name: kube-rbac-proxy
5761
args:
@@ -73,6 +77,8 @@ spec:
7377
- mountPath: /etc/tls/private
7478
name: metrics-tls
7579
readOnly: true
80+
- mountPath: /tmp
81+
name: tmp-dir
7682
image: '{{ .ReleaseImage.kube_rbac_proxy }}'
7783
imagePullPolicy: IfNotPresent
7884
dnsPolicy: Default
@@ -87,6 +93,8 @@ spec:
8793
secret:
8894
defaultMode: 420
8995
secretName: dns-default-metrics-tls
96+
- name: tmp-dir
97+
emptyDir: {}
9098
nodeSelector:
9199
kubernetes.io/os: linux
92100
tolerations:

‎assets/components/openshift-dns/node-resolver/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
NAMESERVER=${DNS_DEFAULT_SERVICE_HOST}
2929
OPENSHIFT_MARKER="openshift-generated-node-resolver"
3030
HOSTS_FILE="/etc/hosts"
31-
TEMP_FILE="/etc/hosts.tmp"
31+
TEMP_FILE="/tmp/hosts.tmp"
3232
3333
IFS=', ' read -r -a services <<< "${SERVICES}"
3434

‎assets/components/openshift-dns/node-resolver/update-node-resolver.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trap 'jobs -p | xargs kill || true; wait; exit 0' TERM
55

66
OPENSHIFT_MARKER="openshift-generated-node-resolver"
77
HOSTS_FILE="/etc/hosts"
8-
TEMP_FILE="/etc/hosts.tmp"
8+
TEMP_FILE="/tmp/hosts.tmp"
99

1010
IFS=', ' read -r -a services <<< "${SERVICES}"
1111

0 commit comments

Comments
 (0)