Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=34
KUBE_GIT_VERSION=v1.34.2
KUBE_GIT_COMMIT=e4a4167c40c9ed543c5a80f2e08cc73696f7a4f6
KUBE_GIT_COMMIT=9d521311f5fb67dc43f49eeb728ee2c80976835a
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-01-29-154414
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-02-05-082424
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.22.0-0.nightly-2026-01-28-225830
OCP_VERSION := 4.22.0-0.nightly-2026-02-05-115400
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ apiVersion: apps/v1
metadata:
name: csi-snapshot-controller
namespace: kube-system
annotations:
release.openshift.io/desired-version: ${RELEASE_VERSION}
labels:
hypershift.openshift.io/managed-by: csi-snapshot-controller-operator
spec:
Expand Down
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.aarch64.yaml
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:c5177a8b25a6386ba8d8752776afe15e88ab5203a182722f35c9143d01e9ce54
digest: sha256:18382b50036fed824eaa818406de54f31a19d506d84ba69076647709c0bebd0c
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e800676cabd3382ba9668280ba7959825863a9f71f6fc08fadeadad09515ea61
digest: sha256:476c31c3adc585ec503b0717bc8898fdaa0d5c51d4ad3acf80acfb8140cc182f
4 changes: 2 additions & 2 deletions assets/components/multus/kustomization.x86_64.yaml
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:2c3c943e17559e8d4d4450a7381cc46d2778f0c706f60cba63156d8cce64f2ed
digest: sha256:0db85138bfe4a129e0b85a203ca0c8400145d8fa2e234c467d8496d89a0e66fb
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7a0841258b539f5ffaf614f6acceef7244348b0ca69dc7e29b28a262d3c2f01e
digest: sha256:31264e37769680f66240b51d02b4cbcf12565a9d0ce961a7c23bf90e9e463a99
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-29-154414"
"base": "4.22.0-0.nightly-arm64-2026-02-05-082424"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5177a8b25a6386ba8d8752776afe15e88ab5203a182722f35c9143d01e9ce54",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e800676cabd3382ba9668280ba7959825863a9f71f6fc08fadeadad09515ea61"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18382b50036fed824eaa818406de54f31a19d506d84ba69076647709c0bebd0c",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:476c31c3adc585ec503b0717bc8898fdaa0d5c51d4ad3acf80acfb8140cc182f"
}
}
6 changes: 3 additions & 3 deletions assets/components/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-01-28-225830"
"base": "4.22.0-0.nightly-2026-02-05-115400"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c3c943e17559e8d4d4450a7381cc46d2778f0c706f60cba63156d8cce64f2ed",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a0841258b539f5ffaf614f6acceef7244348b0ca69dc7e29b28a262d3c2f01e"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0db85138bfe4a129e0b85a203ca0c8400145d8fa2e234c467d8496d89a0e66fb",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31264e37769680f66240b51d02b4cbcf12565a9d0ce961a7c23bf90e9e463a99"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

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:38f7ae25dffb022c961cee8b7000ddf40bb2e461a9005e616898936b00181107
digest: sha256:9d3d8d0887ab9d994634f902885f362e1140cc206e47198d1ca593a60fc6f161
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:37929e68521fb52fb9d1dc3136a28035366624fa213907143cd1d907649ca107
digest: sha256:cdf1049fa246fa36a79e0e4d4baaf5c97a0576002218f2fc10b6448b9260e61f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:5082c420ae24f5cf158d62539286604a49f2787999b1400f7e0cb764ce4f8c09
digest: sha256:9393b7488ecc8616f74897f4b23f7f5aad1a3aa1201d231251ccb3a2036b9ef6

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:37929e68521fb52fb9d1dc3136a28035366624fa213907143cd1d907649ca107
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdf1049fa246fa36a79e0e4d4baaf5c97a0576002218f2fc10b6448b9260e61f
- 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:38f7ae25dffb022c961cee8b7000ddf40bb2e461a9005e616898936b00181107
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d3d8d0887ab9d994634f902885f362e1140cc206e47198d1ca593a60fc6f161
target:
kind: Deployment
labelSelector: app=catalog-operator
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:d25cf798d1b6c17b4137c8eafaa432235307a850ae5208afb6ea5e77d68c94ff
digest: sha256:a7cf23b5d9ec933b8ae281acf568521ea54816c57baddcdeda1df3aa85171a02
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:7b78702b0296c10cddabd887d9b3d1c7d73af828a423ef4e565bdff15f00c121
digest: sha256:a2f2eaae95ddbd87b1c20a58edf725c515ccee4befe7aa78f69fefec2289f87f
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:96e61966a60f0a48d7d721973b2a551a8fbac6b80ead9cbf49e3011a3440980a
digest: sha256:024a086dee9aed18b6e0348e728b06711853061962fe042a9f89b91f53d1bf8c

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:7b78702b0296c10cddabd887d9b3d1c7d73af828a423ef4e565bdff15f00c121
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2f2eaae95ddbd87b1c20a58edf725c515ccee4befe7aa78f69fefec2289f87f
- 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:d25cf798d1b6c17b4137c8eafaa432235307a850ae5208afb6ea5e77d68c94ff
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7cf23b5d9ec933b8ae281acf568521ea54816c57baddcdeda1df3aa85171a02
target:
kind: Deployment
labelSelector: app=catalog-operator
3 changes: 0 additions & 3 deletions assets/optional/operator-lifecycle-manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ resources:
- 0000_50_olm_00-operatorgroups.crd.yaml
- 0000_50_olm_00-operators.crd.yaml
- 0000_50_olm_00-packageserver.pdb.yaml
- 0000_50_olm_00-pprof-config.yaml
- 0000_50_olm_00-pprof-rbac.yaml
- 0000_50_olm_00-pprof-secret.yaml
- 0000_50_olm_00-subscriptions.crd.yaml
- 0000_50_olm_01-networkpolicies.yaml
- 0000_50_olm_02-olm-operator.serviceaccount.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-29-154414"
"base": "4.22.0-0.nightly-arm64-2026-02-05-082424"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38f7ae25dffb022c961cee8b7000ddf40bb2e461a9005e616898936b00181107",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37929e68521fb52fb9d1dc3136a28035366624fa213907143cd1d907649ca107",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5082c420ae24f5cf158d62539286604a49f2787999b1400f7e0cb764ce4f8c09"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d3d8d0887ab9d994634f902885f362e1140cc206e47198d1ca593a60fc6f161",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cdf1049fa246fa36a79e0e4d4baaf5c97a0576002218f2fc10b6448b9260e61f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9393b7488ecc8616f74897f4b23f7f5aad1a3aa1201d231251ccb3a2036b9ef6"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-01-28-225830"
"base": "4.22.0-0.nightly-2026-02-05-115400"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d25cf798d1b6c17b4137c8eafaa432235307a850ae5208afb6ea5e77d68c94ff",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b78702b0296c10cddabd887d9b3d1c7d73af828a423ef4e565bdff15f00c121",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96e61966a60f0a48d7d721973b2a551a8fbac6b80ead9cbf49e3011a3440980a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7cf23b5d9ec933b8ae281acf568521ea54816c57baddcdeda1df3aa85171a02",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2f2eaae95ddbd87b1c20a58edf725c515ccee4befe7aa78f69fefec2289f87f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:024a086dee9aed18b6e0348e728b06711853061962fe042a9f89b91f53d1bf8c"
}
}
16 changes: 8 additions & 8 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-arm64-2026-01-29-154414"
"base": "4.22.0-0.nightly-arm64-2026-02-05-082424"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7756653321564844d388ac953ec99d36899b52bd51c5693124e345b68c87a273",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:523b9448175d322b9a9b7027c72b2cdf14ef176b494f19517cf6e58f73b69f6a",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:299a786ef7c13b10ab96ebaa1ca47813196b851f5b22bab46e3fff64aca35676",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5082c420ae24f5cf158d62539286604a49f2787999b1400f7e0cb764ce4f8c09",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a6af2b68b2eec4026080790521abcd5b1ba599e59caf42d053f8a18d8bec09a7",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8ee3f8034bf2d07aefcb75b1ffe5c7222290f324aa7234895aa87e6bdd09e237",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3436721bfc2a010877c4476e450e283820d7dd53777ed1be9a78b969a913f179",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9393b7488ecc8616f74897f4b23f7f5aad1a3aa1201d231251ccb3a2036b9ef6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3b010cb1c627955c37942bbb35323f631ac4c827329d410a8f7f868d6998083",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61a299045141bb58acf26e0a06470b58cbbebfecdeddc2d6d5c2bceb706c5579",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3855b6870395257f8026a276304f063d2d1e1811add996ff50af63b40919d734",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e95d5626e35158343ffe994f18588fb91a6baa7ce513b8a17e095d16e6b0293c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:774023f17193a125c5e6e8a6bba53ca21ea19c80e840a7110c94ba3f5c4ecb02",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d80e91235936ed3ab0fe960ab4ea2db61dc5c3a34b7ffdc1e3ae74d12bf879a"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fca9e70ea3d71025d969a5e14fc0272f4bd0c25012db2bd86f5fd5e5bd917d7d"
}
}
16 changes: 8 additions & 8 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.22.0-0.nightly-2026-01-28-225830"
"base": "4.22.0-0.nightly-2026-02-05-115400"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:311275358889230527eeb0be9e9d1ebc998c50bdbdd34444bc18494aed1c3234",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bbe16cece344e693656f6f88c79deb0337663cf4b5806f29cfc3ecab2c61fb8",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:622e3eaaf8d1bdc38cde96f3ae5948bcd6f282cd7313cd2b4107230e71ba7d01",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96e61966a60f0a48d7d721973b2a551a8fbac6b80ead9cbf49e3011a3440980a",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:191385c8b2fdab6b1bdbbf8bc7eca917d70e5e8d60019f304de6c46fbdcccf6d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1d83a353d3f75275640cc6b9c613d8d8eb99f18e4b8ffa79b83728b7dfbecaca",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c9ef4de05d8cfe9799f9134856dca64adb00fb2d8757ae4fcf42f6abefecec8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:024a086dee9aed18b6e0348e728b06711853061962fe042a9f89b91f53d1bf8c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02a5485f93b3c117a165caf5057886cc30bf11ba4fa2a8250c21b4694ae4c9ab",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f553fd309c7b0f0165377cc72c5860c55226679875534a50f3c9871be0b77d4b",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a96d0d773a8fe618cc2aff0d5d4c3858a169c139dfec45a88d7ccf034e8acae7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89d38d074f3fefeafe47171f755345c5ef521324af0f32683bf9a69068ee6d90",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47e2e3c31c7955bafff142e64fb4810a02d40ed6d8e63552410cce04ed1484a2",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47725de88683ef1214b7cd23d36304bbcfd2e29294e5b04377f947dadf4a2ade"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f390128b70d502c35ae3f34f0acc6a57398ebf9d17490a83bc2bc942f75cf88a"
}
}
5 changes: 5 additions & 0 deletions deps/github.com/openshift/kubernetes/build/root/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ PRINT_HELP ?=
WHAT ?=
TESTS ?=
BRANCH ?=
TAGS ?=
GO_BUILD_FLAGS := $(if ${TAGS},-tags=${TAGS},)

# We don't need make's built-in rules.
MAKEFLAGS += --no-builtin-rules
Expand All @@ -61,6 +63,9 @@ $(error Both KUBE_GOFLAGS and GOFLAGS are set. Please use just GOFLAGS)
endif
endif

# Add build tags to GOFLAGS
GOFLAGS := $(GOFLAGS) $(GO_BUILD_FLAGS)

# This controls the verbosity of the build. Higher numbers mean more output.
KUBE_VERBOSE ?= 1

Expand Down
4 changes: 2 additions & 2 deletions deps/github.com/openshift/kubernetes/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ require (
github.com/opencontainers/runc v1.2.5
github.com/opencontainers/selinux v1.11.1
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
github.com/openshift/api v0.0.0-20251214014457-bfa868a22401
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
github.com/openshift/client-go v0.0.0-20251205093018-96a6cbc1420c
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
github.com/prometheus/client_golang v1.22.0
Expand Down
Loading