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=28
KUBE_GIT_VERSION=v1.28.12
KUBE_GIT_COMMIT=396c8817940d592049f2fcfdeae4a264c953ea8e
KUBE_GIT_COMMIT=bc3c7c5f9861b366d20e45bf5b696ed56d8e4964
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.15.0-0.nightly-arm64-2024-08-15-000745
OCP_VERSION := 4.15.0-0.nightly-arm64-2024-08-16-005250
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.15.0-0.nightly-2024-08-13-134622
OCP_VERSION := 4.15.0-0.nightly-2024-08-15-210543
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:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2
digest: sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa
digest: sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24
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:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d
- 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:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b
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:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae
digest: sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584
digest: sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748
digest: sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff

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:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893
- 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:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-08-15-000745"
"base": "4.15.0-0.nightly-arm64-2024-08-16-005250"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e109f7efe2bbcb40e0edc4df811f2a65b4415a78cbd92f7b1dea531eca8ea5f2",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cad146496cc72091ae4634d24e9d12542f9e628291a47c1f0dc3c0d1882932aa",
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ceb33386e28b8f6cb335acccee438678074b10ffdf3ef368ea712777471b54b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5354450ae3c02327c31daa0caa26553f50b86e4fc31dc7b6d3b77a394b25935d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:90f28c6db1bd814bfdf04d5d1f11de050c90629e03d3dc15aed668adf2b97e24"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-13-134622"
"base": "4.15.0-0.nightly-2024-08-15-210543"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04a4c299024c54b5e62266a9e998e7ed3890587a66a8f9ddfc15dff67bb9f4ae",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a0f21841de195922aa9fe725ad1bf482f23a3fad24a457cd2a3bc23ee2a6584",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c23e9c686c509d3908ce7ac5290fc57c5e2a8fb6575ec895409ef9eb88e0ae4f",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd22e85f04093d6f903092b4453a17998512e17c50cf77179dbb06f9b2cc6893",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff"
}
}
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2024-08-15-000745"
"base": "4.15.0-0.nightly-arm64-2024-08-16-005250"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efc54fd99b86fd49a6d02efd073aad9cda04ea8c985bd985f67cfabccdfdd7d7",
Expand Down
10 changes: 5 additions & 5 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"release": {
"base": "4.15.0-0.nightly-2024-08-13-134622"
"base": "4.15.0-0.nightly-2024-08-15-210543"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12cf2b77952d1eea164772ddf62ba4eb7c8c889e37b8177cd3ffc8aa33c2fddf",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bb60567d8656acb417e5c02c5ad2effde241e88803ff94ec73aed0e3f67c608",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f249e969fc8c39cef5641619573cb3dbfc3ef920d6617d7836830653e1d72fe",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3d31a920ed4de1a3d57287bfc4fc913bf77f29c30701cb393a682a0e6b19fb9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec0d6d14701ace9e6a6e5a4f4b27a652d9bcf7b6de7e5b1118ec5be4cd983748",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:46ecf2871f92e44b2ac4a28682c96a01863e291ffbbb4ba5fbde5f20e53de171",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:14ee3d54845231586c5b2dbeaf4f65aed0445552e3d8ddb9138277329030a6ff",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4d814e97131444982f18053125fc337d73a3117b1606052c417d34d9f5b01868",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:421c756e8d36fabd77e6f72681d098263628b81f24ded16ed47c9b042931fceb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aa70d58bc05e560d2cc66ee66877e11e73cc4377a2dfd2a3ad583b1e28572ebe",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e92f614e3053f7495e1ecd3c1d678c56b7c08a04a0228f349c5ba6d43d7b9b0",
"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 @@ -145,35 +145,35 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20240424135504-a7005ef1eae8 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240807041704-396c8817940d // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240807041704-396c8817940d // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240807041704-396c8817940d // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240813132429-bc3c7c5f9861 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
)

replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240807041704-396c8817940d // staging kubernetes
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240813132429-bc3c7c5f9861 // staging kubernetes
Loading