Skip to content

rebase-4.12.0-0.nightly_amd64-2023-06-25-204934_arm64-2023-06-25-204935 #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 7 commits into from
Jun 26, 2023
Merged

rebase-4.12.0-0.nightly_amd64-2023-06-25-204934_arm64-2023-06-25-204935 #1959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2159521
update last_rebase.sh
Jun 26, 2023
c3dc1b7
update changelog
Jun 26, 2023
b43c62b
update go.mod
Jun 26, 2023
70668fe
update vendoring
Jun 26, 2023
132ba6f
update component images
Jun 26, 2023
29a6ce0
update manifests
Jun 26, 2023
a358feb
update buildfiles
Jun 26, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=25
KUBE_GIT_VERSION=v1.25.9
KUBE_GIT_COMMIT=8c210201e58450becf3834a4fb9dcd520ab54679
KUBE_GIT_COMMIT=c43ddea5eec2220b3e691afe6a2f1529e0a454cd
KUBE_GIT_TREE_STATE=clean
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-06-23-000343"
"base": "4.12.0-0.nightly-arm64-2023-06-25-204935"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97e93b613ada17a5730567562b62445eb17d7532e5ec7a10e4fcacc605aa4dbd",
Expand All @@ -13,8 +13,8 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24302d259c08d9bdaece2917a26df641fdf60f1ba1490f0f7aaccd311d7c4d94",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99949b2fdcb58dfc2a763131ad81d71c3e6535b055f4e48ab3d6bddfc45be929",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3daf5129584c125687fed004139a5e0c892aef92d7003801d648ee370acf01af",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbcb833fb79e28bbbba4ae0c0ca7dbe781c2ba7889fc8d0f9b3e19fc4138326d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d517456e920cfbd49fd9f3bf94658c72dcfd986f2bf3954d27a2aa9613b54fe6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f584cd2e582cfd09e5856724877daa04be94884f10ac33313f970463ed600c3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:de120740482436f4e6ddd4a8435d235e299355745e6e0a985a107c3b6b479f89",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b96d16e0664806ce048b2e782d742639b8be05f535d5f823f1addbdf50a44904"
}
}
24 changes: 12 additions & 12 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-06-22-040805"
"base": "4.12.0-0.nightly-2023-06-25-204934"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ffda2a4241b2dcc8aeca26604661bc551b8f81a4a4c36185be4ee0c99ea070d1",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1055911cc194bcc024251eb373af682ecc392e08f0bf6bb70d1d63481873526c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59f2ed74b6ab630bb710042f76c7963b03ace6244a1c12a5eb8b3f9a4f671a37",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60d7bdfd9424553ce041a2a533213c34e1f0336132ecf045b0e2336c74484886",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f8c3d97695331a52b44f669c63509a75f10308edcb4bc9f1de94f30b47e20491",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:189f8e97b6ceef052b34ce707e7317759c37a6d36d01cab58416756bdd4ac34c",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3d562e9349792159ac0d7f8e6b6130b6e79ca1703a9e37a56d5533a40da118c5",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8e4431ed3d90bafa8b99d473796efe3094d5938f0eb0577b67ab3ff0c907434",
"lvms-topolvm": "registry.redhat.io/lvms4/topolvm-rhel8@sha256:10bffded5317da9de6c45ba74f0bb10e0a08ddb2bfef23b11ac61287a37f10a1",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27f559d82dba03198cbd8c3377634eb72258486e36ff59dc9f349c59daf29b96",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b06ad18a6af3fcff131bbae682bb88be56bae2cfc7c9e7253121bc737f0dedf",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e221377b652bdfe8ae296f8056de5942a545a81d2bffd13a94f871ff2aa54153",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09436a4f9027c8ef786ee6858b4ca757a8a52b341bc7a26364522a05870f057e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a893f44bc584c64f6624017d1dc075536628416c19a8881071c8e31f48c47d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:69819636bef2a1243997b5fa1d95c8741ba1c0037efd8374285a9d1d164fdb9e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77f6f22330689dfd864d4cb670ecac19b3c222e81bc7808983fef6b6e5008f41"
"csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28c241d9f739491b35c7e19d384823f09e2e3dad97d6905405a337d292fd23ca",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f97b92798f55051fdb15b8e9be32c9a41c9ea0636351a2d94c4454306f25a082",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eaf3edec4dea89c526b3047b3833f9f51d2f97893d6105efc86be4a8ebb7019",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ff4120a5d138b9e21e7b7b80a1d2d6403c0c2c16dfc11a96a2ed95a23179a94",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6cb22cc098aa26b1004ace451b36ab857ca4e5821223e256cd75d94ab7f8df60",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:740e79ba30312c68fcb4eb45a371c5129f77e60b1711f0f606c0b1358af2570d",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:042732823a762e496298d7700b94aa3ee583edcdc144ca1e78b8f83b60f5c6db"
}
}
59 changes: 30 additions & 29 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ require (
github.com/google/go-cmp v0.5.8
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/gophercloud/gophercloud v0.1.0 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
Expand Down Expand Up @@ -166,7 +166,7 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
github.com/vmware/govmomi v0.20.3 // indirect
github.com/vmware/govmomi v0.30.0 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/xlab/treeprint v1.1.0 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
Expand Down Expand Up @@ -239,6 +239,7 @@ require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/stretchr/objx v0.4.0 // indirect
)

Expand Down Expand Up @@ -294,36 +295,36 @@ replace (
gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // from kubernetes
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 // from kubernetes
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 // from kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1 // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230612160759-8c210201e584 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230625123127-c43ddea5eec2 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230612160759-8c210201e584 // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230612160759-8c210201e584 // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230625123127-c43ddea5eec2 // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230625123127-c43ddea5eec2 // from kubernetes
sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // from kubernetes
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 // from kubernetes
)
Loading