Skip to content

Commit

Permalink
rebase-4.14.0-0.nightly-2023-07-16-230237_amd64-2023-07-16_arm64-2023…
Browse files Browse the repository at this point in the history 
…-07-16 (openshift#2079)

* 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]>
  • Loading branch information
@microshift-rebase-script
microshift-rebase-script[bot] and ci-robot authored Jul 17, 2023
1 parent ed3c4cb commit 928d4f3
Show file tree
Hide file tree
Showing 18 changed files with 407 additions and 414 deletions.
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=27
KUBE_GIT_VERSION=v1.27.1
KUBE_GIT_COMMIT=af29f64acbf9e6d33cde7f3194cf858f54058d3b
KUBE_GIT_COMMIT=4aaeaec06c95e0a1a868695792c256d8f0158075
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-11-192215
OCP_VERSION := 4.14.0-0.nightly-arm64-2023-07-16-230238
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.14.0-0.nightly-2023-07-11-092038
OCP_VERSION := 4.14.0-0.nightly-2023-07-16-230237
22 changes: 11 additions & 11 deletions assets/release/release-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.14.0-ec.3"
"base": "4.14.0-0.nightly-arm64-2023-07-16-230238"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e3e95e89bbc32efe2ca0253fbbafb9b02bb7384782799c2fbc87ec5b33f9d84",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47ef55da0c18b3063edae922ddb39c2d34375290f1542d41f58253f71d5e0bbd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:508b01522dcef574aa45a95ba291333132c1fa9dc4d4af3d20cbf9c90eb8bed6",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a116430e53f864ec6263643e0c37f4deea2068a779bec50d64930e8de6c69f5b",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77dc55600ba7b84241bc652d1108952916caaae1995e5ba24017808d2e9328f4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5bf031cef266a2c63154176482ef6926ee0464daa2788084f7855dc26eab7023",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38913a85e13248e12fddc82e7218e5762dcb770d899e6b4b781a2adf76a12494",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:712c51bff1a2afb744813715f89b140b6e3cad2a25e0f6e42b370d9e17ddf83b",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e3cdebb977ab0785ad5b5ed098d2fdf6bdb0096d5069a773e5d34be705307a7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c677ae0c4288d66f69a25920c549ba481a0d10f892a18d920976a7b1b75685c8",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a84564944e6dfaba3fb9edeb28ee8dc953f4005d558ff063c36dd8b2aa72ca46",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:da434d27f4257419a0deb3b2c38ec3251029bf475c427c349a8e3bacf117f969",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:809c4a92c3092607dd5ee0dab1a8848086976f1f7c338d3adacf9a16b525efdc",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:145004920fed4df064dc9b7472898422e81b7d6193fdd2252ad0bcfcc7d00e91",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:9d486daffd348664c00d8b80bd0da973b902f3650acdef37e1b813278ed6c107",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:199eac2ba4c8390daa511b040315e415cfbcfa80aa7af978a33624445b96c17c",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e3d57f040f710d0793648fcd51acde2c539a9c4705e6f7fef5897089e2a1886",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9a7e73417e6eaf5298629f60c294bef4400db2b988e8ba337a2f14b670477755",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f80cd300431146771ad0dfb3f2183287a657dbeca46cd2a89c3baafc30c23aef"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0277bcd74464b1c2023de8a5db64cde05b044a44e7a27d342c4ccd74b82654bd",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:872b19bc047db5c2624ac35491910660685665fc122b59ad9480c13829982208",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:10815ea1edb3bd1bd78055b936aa61f7c847abe1e11137f8ab5019653032deaf"
}
}
22 changes: 11 additions & 11 deletions assets/release/release-x86_64.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"release": {
"base": "4.14.0-ec.3"
"base": "4.14.0-0.nightly-2023-07-16-230237"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1abb654a4f76a52b1b77eb910ca59cc66174d440fa323ba73f3986d2e713269",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a17c771c1fee3acd6ae8a5c36db812223e7f893878978b88570cef43747ab3a0",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5a71e7c3fe4f9a3a14dff11dcb85fa3a022c983140d056b3074d8cf9f0ae6fd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac387699e75eb00d9b9f1e6785e34f68bc8ea21c09767d3d20b98cee6b0a00be",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:870f42867467371111631a56c7bf2724f246321014e12ad7c72034dc19a4d9b0",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:83caf11b71e117fd2846ae331d1265213010c03a3d29a55139ce8ddf7f8052ac",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e74e369818bdc51b6681c62257c9606c86a2c0276583eec136f04e017bc2086f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce89585b5e18a8b56be31985fd01c8682a7c219fab75044e62a5b38f27c92f04",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9080531202d8c73b234ee319817ce270dd700649bdb92ef0b47fda9657efa544",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feeaef0266fa83a74beef855b05eef4e6f3d87e19e45ffa0bcff79fc747e2bba",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4898709c60e0cc037d14b61be8b2093be9941933e2bbf4e1fd92422e92f598a2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01287e6feab921533ceeb14b76ef877bf0768a3b8d88a63f156987cb9bd208bb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:428d4bdc0a8ded93f04cc1bcfb1b29411ecdf86905ea379ecba037e0b208887c",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0371c930094524ccc22af6ab78dc87f2145d853d8ab98cf6977aa51be5849879",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:a4319ff7c736ca9fe20500dc3e5862d6bb446f2428ea2eadfb5f042195f4f860",
"topolvm_csi_livenessprobe": "registry.redhat.io/openshift4/ose-csi-livenessprobe@sha256:9df24be671271f5ea9414bfd08e58bc2fa3dc4bc68075002f3db0fd020b58be0",
"topolvm_csi_resizer": "registry.redhat.io/openshift4/ose-csi-external-resizer@sha256:9d486daffd348664c00d8b80bd0da973b902f3650acdef37e1b813278ed6c107",
"topolvm_csi_provisioner": "registry.redhat.io/openshift4/ose-csi-external-provisioner@sha256:199eac2ba4c8390daa511b040315e415cfbcfa80aa7af978a33624445b96c17c",
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6eabee4c308c8285a87de9906f3a9eb9d1a4bc3f16db9870e5554326b0ad4910",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f40aa375d2ec9c0aaaba7d4bd8c5bf5a378d93ad41645c4e6f67522ed012b664",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6587bc9382d14b1d1d9b684fa2ffbb3fbbcc2ad86016ffd3bf6e770f05c03be6"
"csi-external-snapshotter": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b6c1d82eca71103c58242173249ba34ca561f2d6d18e2c96add1910a8d2b33f",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e54f09524c4be2ba7c2c69a435bcefe12c912cdc6be81bf2a58080e8581f87b",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5811a398bf4aaadde9aee6c7d302ade46868fa8566fb8bf336df0ae6ad81c241"
}
}
58 changes: 29 additions & 29 deletions etcd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,33 +143,33 @@ replace (
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230706085316-5a36b9b6b329 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230706085316-5a36b9b6b329 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230706085316-5a36b9b6b329 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230707162244-af29f64acbf9 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230707162244-af29f64acbf9 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230707162244-af29f64acbf9 // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230714130253-4aaeaec06c95 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230714130253-4aaeaec06c95 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230714130253-4aaeaec06c95 // staging kubernetes
)
Loading

0 comments on commit 928d4f3

Please sign in to comment.