Skip to content

Commit f140f7f

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #6243 from pacevedom/rebase-rebase-24190a5de-4.22.0-0.nightly-2026-02-17-112443_amd64-2026-02-17_arm64-2026-02-17-4.22.0-0.nightly-2026-02-17-112443_amd64-2026-02-17_arm64-2026-02-17
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-02-17-112443_amd64-2026-02-17_arm64-2026-02-17
2 parents 24190a5 + f5521ac commit f140f7f

243 files changed

Lines changed: 9727 additions & 2902 deletions

File tree

Some content is hidden

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

‎.golangci.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ linters:
3434
- nlreturn
3535
# Replaced by whitespace.
3636
- wsl
37+
# We do not enforce godoc comments.
38+
- godoclint
3739
# https://golangci-lint.run/usage/linters/
3840
enable:
3941
- asasalint
@@ -107,6 +109,14 @@ linters:
107109
text: 'G301: Expect directory permissions to be 0750 or less'
108110
- path: 'pkg/components/storage\.go'
109111
text: 'G302: Expect file permissions to be 0600 or less'
112+
- path: 'pkg/config/node\.go'
113+
text: 'G703: Path traversal via taint analysis'
114+
- path: 'pkg/controllers/kube-apiserver\.go'
115+
text: 'G703: Path traversal via taint analysis'
116+
- path: 'pkg/telemetry/telemetry\.go'
117+
text: 'G704: SSRF via taint analysis'
118+
- path: 'pkg/util/cryptomaterial/certchains/signers\.go'
119+
text: 'toBuilder returns interface'
110120
settings:
111121
cyclop:
112122
max-complexity: 20

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ GO_TEST_PACKAGES=./cmd/... ./pkg/...
104104
export CGO_ENABLED ?= 1
105105

106106
# Specify OCP build tools image tag when building rpm with podman
107-
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.24-openshift-4.20
107+
RPM_BUILDER_IMAGE_TAG := rhel-9-golang-1.25-openshift-4.22
108108

109109
all: generate-config microshift etcd
110110

‎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=34
33
KUBE_GIT_VERSION=v1.34.2
4-
KUBE_GIT_COMMIT=9d521311f5fb67dc43f49eeb728ee2c80976835a
4+
KUBE_GIT_COMMIT=047d96223dd843e9d54bed59bc212d2e9122c56a
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.22.0-0.nightly-arm64-2026-02-05-082424
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-17-232712

‎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.22.0-0.nightly-2026-02-05-115400
1+
OCP_VERSION := 4.22.0-0.nightly-2026-02-17-112443

‎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:18382b50036fed824eaa818406de54f31a19d506d84ba69076647709c0bebd0c
5+
digest: sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:476c31c3adc585ec503b0717bc8898fdaa0d5c51d4ad3acf80acfb8140cc182f
8+
digest: sha256:267c37338b0fddc68fd1b7657c722ee0238675ef85b0f274e69fdf96d9df26c6

‎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:0db85138bfe4a129e0b85a203ca0c8400145d8fa2e234c467d8496d89a0e66fb
5+
digest: sha256:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:31264e37769680f66240b51d02b4cbcf12565a9d0ce961a7c23bf90e9e463a99
8+
digest: sha256:474aa143fb27219d5be46488f70a56e0fdf25864276fbcfd48c64d10329ab341

‎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.22.0-0.nightly-arm64-2026-02-05-082424"
3+
"base": "4.22.0-0.nightly-arm64-2026-02-17-232712"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18382b50036fed824eaa818406de54f31a19d506d84ba69076647709c0bebd0c",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:476c31c3adc585ec503b0717bc8898fdaa0d5c51d4ad3acf80acfb8140cc182f"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5059097d17fbc06dbe7a9e7f0d61116eeb2750fcc2debc54842916cc35181a06",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:267c37338b0fddc68fd1b7657c722ee0238675ef85b0f274e69fdf96d9df26c6"
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.22.0-0.nightly-2026-02-05-115400"
3+
"base": "4.22.0-0.nightly-2026-02-17-112443"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0db85138bfe4a129e0b85a203ca0c8400145d8fa2e234c467d8496d89a0e66fb",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31264e37769680f66240b51d02b4cbcf12565a9d0ce961a7c23bf90e9e463a99"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9b425020d10f9f7ab0ddf27b082dd69e7b5c97f498608f9761f88b533d593d8",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:474aa143fb27219d5be46488f70a56e0fdf25864276fbcfd48c64d10329ab341"
88
}
99
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
kind: Service
22
apiVersion: v1
33
spec:
4+
trafficDistribution: PreferSameNode
45
ports:
56
- name: dns
67
port: 53

0 commit comments

Comments
 (0)