Skip to content

Commit f446eda

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-4.14.0-0.nightly-2023-10-10-084534_amd64-2023-10-10_arm64-2023-10-10 (#2462)
* update last_rebase.sh * update changelog * update microshift/go.mod * update microshift/vendor * update etcd/go.mod * update etcd/vendor * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 0800678 commit f446eda

17 files changed

+260
-253
lines changed

‎Makefile.kube_git.var

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
KUBE_GIT_MAJOR=1
22
KUBE_GIT_MINOR=27
33
KUBE_GIT_VERSION=v1.27.6
4-
KUBE_GIT_COMMIT=4e94a885307b87ee4650f4fa187128eb6cc219d1
4+
KUBE_GIT_COMMIT=98158f96f30cce46b1fca344fa2c87db7a9c4b4c
55
KUBE_GIT_TREE_STATE=clean

‎Makefile.version.aarch64.var

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-10-07-152258
1+
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-10-10-162827

‎Makefile.version.x86_64.var

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.14.0-0.nightly-2023-10-06-234925
1+
OCP_VERSION := 4.14.0-0.nightly-2023-10-10-084534

‎assets/release/release-aarch64.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-arm64-2023-10-07-152258"
3+
"base": "4.14.0-0.nightly-arm64-2023-10-10-162827"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:644feb4d40182c345e3202227e5fe78c4370f3ebefa4e02fb05130b9785567f5",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:facd24150bf10b987da2aef33fd4d4c5929370058d7bc5d24222fbd311c3972e",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea4ad91b281199148a7befbcac41d523d63bf50004dc05c398750a3440488519",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df323782209e88cc22b3caa42a3f4e0e4c979d3bc35e662fb4818dd1911ee81c",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2724fe4ad995464973e81d8b8ecfe834f5daf022e3bf899b12fbb689d51e3ddb",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac0ef5cab39f28f7945e6c31a97b7a90204cfda4a7d89e8949a50859aaca44cd",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8796e773ca84642f5a7a635413c538676eae7e9ab39cb7e951708bd39f524b9e",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f08e96fc74713135bd9454c1e12c4ce96220933f11a218032e97891dff28a2f",
1010
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
1111
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66a1fe528e2cc409a19a1099da1cdafb5f08fac3b7af0ae17e8e06f8bff1b92f",
12-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d3fd0f6db6c34cd5d6f0124d123de3d67f6b894a0ff21539bba73274e718d6",
13-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7a30ae0e17e6dcc7917abfb3f9778208b6d80fe8a565eee7864146a34c19ecb",
12+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77d83d2996f018afe9597f54ac1568e214a8fac7dd8ed66bfbaa09c4c84f1b28",
13+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9294bb828bf52a9ebe7da8c20ae8db871337517bf34e78cd894acd468d03a3a4",
1414
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e",
1515
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8",
1616
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4",
1717
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87",
1818
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504",
19-
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6c0075705fb009afa561817034c94230fa64eb79b24e1733829cd4c973c9db8",
20-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfb73d93b3cd15f0394c480c78b0daf021e406e4842ca6db7489f89d545eb3a8",
21-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ad3c2fccf705f4d7e1d1778e98f78c181aa2bf726238ec2941b357c0fcf8fc5"
19+
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47a47c4b268c8a9b4e2c8152909b7c800ad3af4cd44e92092ced45cffb25bd42",
20+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f5f76cbf7de600082457e854e20bc01b33c6ebaa4500ccc17531f43626c9315",
21+
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bd9239dd6ddf4254883db846be3868cacc2f170996c1e02ffc1cb27cca1b676"
2222
}
2323
}

‎assets/release/release-x86_64.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"release": {
3-
"base": "4.14.0-0.nightly-2023-10-06-234925"
3+
"base": "4.14.0-0.nightly-2023-10-10-084534"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61e8fa3d350528f7ea3c6ed8d65c0f3cecfc96354f0b1b6b50921362e22b7d45",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c0a4e3f1548a2e3fbe0d23fc95e6f2ee810430cb1dca6f253c9b890733d6b55",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a602f1b31cfc6ac8d6cfb84699f4c801aed8e39560e36c326c46bf7919c69abf",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f723da8de2a28f152f8a360c04f9e250a1a0a322553b01f3267f13fb708c166",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed7889e9c8f3d8cf6a22986cf741a4e24a0f88a80b1cc4947ce588c01770bc46",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:471556253f142874c9bdccfbd64a0e9e2fb343bcc0191278f5fceeb5b5a05960",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b989fc82f7e74ff838d4efa860c5342b55ee0591dc97c0dbf2c6e9c4fd681c1c",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f9ecc5038b9ba5a1830129feb3e72ecc37da49a3b8a79d26d4bdc27d5c527be",
1010
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
1111
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4db998f3128889c782b6da3f11a1ec428b20b616690a17fe35fbde51ca66414",
12-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1381f1be8194c9993acbff4518c59d691dcf9cd1b7c786c6d60fe7119a930fa",
13-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05cfeef67f19c299f539ddfd7a64830db03b15063e645b2e75c3f248ee3fa139",
12+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c0dbbb9aa840debe8b1ca17d79be8cdd3d7ab4f115551b4241dbaacc5cdbc21",
13+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19ce45dba692b67ca42b7274802d855867dc0d7d74d59d98bf571f017338bba2",
1414
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:f676e20b8ecdbe9f5fc994e2ff236a02d2afe666bf325e8ac02cd3a043df107e",
1515
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:71d42a2b26fca9690036c95e54aa3641702c4dc7ba1912f8804d777320f9fbf8",
1616
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:3c63c06561f20f5ead423946c6cc22030c397f0fe190004e6b5ccdb3bfaccdc4",
1717
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:837b32a0c432123e2605ad6d029e7f3b4489d9c52a9d272c7a133d41ad10db87",
1818
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:778aa6e5ea046bfcd865e665679c30362dc8c00cfb33a0cdcc56b2395e8ab504",
19-
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b9bc3d9e5159778ad137f05ad93b81dceefe37dd068d477cf2690fcbac40052",
20-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:634a7b5beb47be105f62d1422507c4aa8e2988ae7d9d1b17bfd0b6ca483752bc",
21-
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0b37dbaf168d4d4aa34315df484e745d7cea8746ffc07cc35200a542ceafe23"
19+
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bccc182123ea3aa2e41dd1cfb9d090cc97f2225771caffcc41cc6f778db28c33",
20+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2eca6cffef2938e9701c9a619c0b66bd0ac7c227aa1986c9f6d29807aca6f6dd",
21+
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a664adf043efbff16c3230a0cfd8a9b6e19140451f8fcdad040e33bcf3ef89d"
2222
}
2323
}

‎etcd/go.mod

+29-29
Original file line numberDiff line numberDiff line change
@@ -143,33 +143,33 @@ replace (
143143
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230926113132-ce96982907bd // from etcd
144144
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230926113132-ce96982907bd // from etcd
145145
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230926113132-ce96982907bd // from etcd
146-
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231007031848-4e94a885307b // staging kubernetes
147-
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20231007031848-4e94a885307b // staging kubernetes
148-
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231007031848-4e94a885307b // staging kubernetes
149-
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20231007031848-4e94a885307b // staging kubernetes
150-
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20231007031848-4e94a885307b // from kubernetes
151-
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20231007031848-4e94a885307b // staging kubernetes
152-
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20231007031848-4e94a885307b // staging kubernetes
153-
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20231007031848-4e94a885307b // staging kubernetes
154-
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20231007031848-4e94a885307b // staging kubernetes
155-
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20231007031848-4e94a885307b // staging kubernetes
156-
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20231007031848-4e94a885307b // staging kubernetes
157-
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20231007031848-4e94a885307b // staging kubernetes
158-
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20231007031848-4e94a885307b // staging kubernetes
159-
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20231007031848-4e94a885307b // staging kubernetes
160-
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20231007031848-4e94a885307b // staging kubernetes
161-
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20231007031848-4e94a885307b // staging kubernetes
162-
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20231007031848-4e94a885307b // staging kubernetes
163-
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20231007031848-4e94a885307b // staging kubernetes
164-
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20231007031848-4e94a885307b // staging kubernetes
165-
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20231007031848-4e94a885307b // staging kubernetes
166-
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20231007031848-4e94a885307b // from kubernetes
167-
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20231007031848-4e94a885307b // staging kubernetes
168-
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20231007031848-4e94a885307b // staging kubernetes
169-
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20231007031848-4e94a885307b // staging kubernetes
170-
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20231007031848-4e94a885307b // staging kubernetes
171-
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20231007031848-4e94a885307b // staging kubernetes
172-
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20231007031848-4e94a885307b // staging kubernetes
173-
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20231007031848-4e94a885307b // staging kubernetes
174-
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20231007031848-4e94a885307b // staging kubernetes
146+
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231009230557-98158f96f30c // staging kubernetes
147+
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20231009230557-98158f96f30c // staging kubernetes
148+
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231009230557-98158f96f30c // staging kubernetes
149+
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20231009230557-98158f96f30c // staging kubernetes
150+
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20231009230557-98158f96f30c // from kubernetes
151+
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20231009230557-98158f96f30c // staging kubernetes
152+
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20231009230557-98158f96f30c // staging kubernetes
153+
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20231009230557-98158f96f30c // staging kubernetes
154+
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20231009230557-98158f96f30c // staging kubernetes
155+
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20231009230557-98158f96f30c // staging kubernetes
156+
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20231009230557-98158f96f30c // staging kubernetes
157+
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20231009230557-98158f96f30c // staging kubernetes
158+
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20231009230557-98158f96f30c // staging kubernetes
159+
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20231009230557-98158f96f30c // staging kubernetes
160+
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20231009230557-98158f96f30c // staging kubernetes
161+
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20231009230557-98158f96f30c // staging kubernetes
162+
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20231009230557-98158f96f30c // staging kubernetes
163+
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20231009230557-98158f96f30c // staging kubernetes
164+
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20231009230557-98158f96f30c // staging kubernetes
165+
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20231009230557-98158f96f30c // staging kubernetes
166+
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20231009230557-98158f96f30c // from kubernetes
167+
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20231009230557-98158f96f30c // staging kubernetes
168+
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20231009230557-98158f96f30c // staging kubernetes
169+
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20231009230557-98158f96f30c // staging kubernetes
170+
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20231009230557-98158f96f30c // staging kubernetes
171+
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20231009230557-98158f96f30c // staging kubernetes
172+
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20231009230557-98158f96f30c // staging kubernetes
173+
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20231009230557-98158f96f30c // staging kubernetes
174+
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20231009230557-98158f96f30c // staging kubernetes
175175
)

0 commit comments

Comments
 (0)