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=29
KUBE_GIT_VERSION=v1.29.2
KUBE_GIT_COMMIT=2eba5a9a34b4e3ac7f3cb5f03cf04282f7464356
KUBE_GIT_COMMIT=6116860ab8000581009cd889e4cc1a1985207ddf
KUBE_GIT_TREE_STATE=clean
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.16.0-0.nightly-2024-02-26-013420
OCP_VERSION := 4.16.0-0.nightly-2024-02-29-062601
1 change: 1 addition & 0 deletions assets/crd/storage_version_migration.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ metadata:
name: storageversionmigrations.migration.k8s.io
annotations:
"api-approved.kubernetes.io": "https://github.com/kubernetes/community/pull/2524"
include.release.openshift.io/hypershift: "true"
include.release.openshift.io/ibm-cloud-managed: "true"
include.release.openshift.io/self-managed-high-availability: "true"
spec:
Expand Down
4 changes: 2 additions & 2 deletions assets/optional/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
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:275b63c29ce7277987dee130a6169a8baf12ec8493ac97f568a7587bd860855e
digest: sha256:088bb86bb7bbc572c6064cdd9758c86a8ae444ffda6f018ec3229f1ae1f6dfc6
- name: container-networking-plugins
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e795c393747d05157900ea1b718e7f84d4196858542d96c7086d1d31fd0f16e4
digest: sha256:3d9ace53fe4f3e85bfad705ca2522d6a62da0d2b35fd3b7d0596ef3e16e6ec15
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-02-26-013420"
"base": "4.16.0-0.nightly-2024-02-29-062601"
},
"images": {
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:275b63c29ce7277987dee130a6169a8baf12ec8493ac97f568a7587bd860855e",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e795c393747d05157900ea1b718e7f84d4196858542d96c7086d1d31fd0f16e4"
"multus-cni": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:088bb86bb7bbc572c6064cdd9758c86a8ae444ffda6f018ec3229f1ae1f6dfc6",
"container-networking-plugins": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d9ace53fe4f3e85bfad705ca2522d6a62da0d2b35fd3b7d0596ef3e16e6ec15"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ spec:
- type
x-kubernetes-list-type: map
configMapReference:
description: ConfigMapReference (deprecated) is the reference to the ConfigMap containing the catalog source's configuration, when the catalog source is a ConfigMap
type: object
required:
- name
Expand All @@ -702,6 +703,7 @@ spec:
description: UID is a type that holds unique ID values, including UUIDs. Because we don't ONLY use UUIDs, this is an alias to string. Being a type captures intent and helps make sure that UIDs and names do not get conflated.
type: string
connectionState:
description: ConnectionState represents the current state of the CatalogSource's connection to the registry
type: object
required:
- lastObservedState
Expand All @@ -724,6 +726,7 @@ spec:
description: Reason is the reason the CatalogSource was transitioned to its current state.
type: string
registryService:
description: RegistryService represents the current state of the GRPC service used to serve the catalog
type: object
properties:
createdAt:
Expand Down
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:0ab8346236eaf8eb7ac27792dc2cd10849b0bbcd8317c4bf863a11be6ffcfb64
digest: sha256:98a5d28675dd1389a3b6a99c636580b6e7401b1d7236cd7026117dad560fc557
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:631d1207b9d0cb8a8e235440713231ef2f1f8e3ab6fde2ddb5073e94f8935afd
digest: sha256:7507c3b9829d10ca9a06174f2203ac8e7c0f0e84b1506d9371c2d8d4845cdfb5
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bc6a1f4b7cc183df40a9e78b9bc37523257647daa0125cde9b943105a46fb3c6
digest: sha256:35bd095d990732777a48d2d8ce1a3dc3c6326edbbbab549761f8ad48c016df39

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:631d1207b9d0cb8a8e235440713231ef2f1f8e3ab6fde2ddb5073e94f8935afd
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7507c3b9829d10ca9a06174f2203ac8e7c0f0e84b1506d9371c2d8d4845cdfb5
- 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:0ab8346236eaf8eb7ac27792dc2cd10849b0bbcd8317c4bf863a11be6ffcfb64
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98a5d28675dd1389a3b6a99c636580b6e7401b1d7236cd7026117dad560fc557
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-02-26-013420"
"base": "4.16.0-0.nightly-2024-02-29-062601"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0ab8346236eaf8eb7ac27792dc2cd10849b0bbcd8317c4bf863a11be6ffcfb64",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:631d1207b9d0cb8a8e235440713231ef2f1f8e3ab6fde2ddb5073e94f8935afd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc6a1f4b7cc183df40a9e78b9bc37523257647daa0125cde9b943105a46fb3c6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98a5d28675dd1389a3b6a99c636580b6e7401b1d7236cd7026117dad560fc557",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7507c3b9829d10ca9a06174f2203ac8e7c0f0e84b1506d9371c2d8d4845cdfb5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35bd095d990732777a48d2d8ce1a3dc3c6326edbbbab549761f8ad48c016df39"
}
}
12 changes: 6 additions & 6 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.16.0-0.nightly-2024-02-26-013420"
"base": "4.16.0-0.nightly-2024-02-29-062601"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6986991ad080bee63064408172bd2efdcb6c3e08e0fdf07ce0ec0508706ce848",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9849fe8e75fb2ed19343694205963d2ed526d964221a783c2910df4bcc654b30",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ee06d233ba79f8c89d79b849c0f4406d743039d013ad1dbd4fb077339780e85",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29358358d25e29156c97583f1c02b31ac18f85e0c2aa77de8f148faccadced6d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc6a1f4b7cc183df40a9e78b9bc37523257647daa0125cde9b943105a46fb3c6",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ff9ca9ca6ce7388aedd1e8ce7f19f09b055af8c6127f37ad8cf06533629d8f1",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35bd095d990732777a48d2d8ce1a3dc3c6326edbbbab549761f8ad48c016df39",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62c441126f553e3b66e49c41974c665193569b8d681acbb4d9473a9228acabe0",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a07134dfacb10e86084e2d4ff457424bb175402a0cf0eaffad6963edb419e3cc",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4047a25d09a8f5afd16dc47cd4d61b74698c559900b798b9f12786cf710016a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f4b9a56a5035267df61ced5018d8ce9daaaeee76a14d97519e0c9b85aff29431",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61adc07616d830d6c50e49d6dd4c4002bcdcd7cbc0f785affeb7d43272af5f57",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:95691c21198e20d11777d592806fa00c018c17443d9b3aee853891dac6090470",
Expand Down
60 changes: 30 additions & 30 deletions etcd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -148,35 +148,35 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240216174859-c205b668c1fb // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240216174859-c205b668c1fb // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240216174859-c205b668c1fb // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240221205344-2eba5a9a34b4 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240221205344-2eba5a9a34b4 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240227215554-6116860ab800 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240227215554-6116860ab800 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240227215554-6116860ab800 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240227215554-6116860ab800 // staging kubernetes
)

replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240221205344-2eba5a9a34b4 // staging kubernetes
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240227215554-6116860ab800 // staging kubernetes
Loading