Skip to content

Commit

Permalink
rebase-4.12.0-0.nightly_amd64-2023-02-26-022418_arm64-2023-02-26-0224…
Browse files Browse the repository at this point in the history 
…16 (#1415)

* update last_rebase.sh

* update changelog

* update go.mod

* update vendoring

* 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 Feb 27, 2023
1 parent 3c3dbed commit 50997a2
Show file tree
Hide file tree
Showing 12 changed files with 169 additions and 162 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=25
KUBE_GIT_VERSION=v1.25.0
KUBE_GIT_COMMIT=a34b9e9499e6c3a94e2326652bd8236a5378c0b2
KUBE_GIT_COMMIT=18eadcaadf0be77350013c8911ca953bc2ca3778
KUBE_GIT_TREE_STATE=clean
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-arm64-2023-02-18-035650"
"base": "4.12.0-0.nightly-arm64-2023-02-26-022416"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deceba7099a0aeb7c82df21f74631f28ad2790c27c668849e7f5c8782b9ffa8f",
Expand All @@ -13,8 +13,8 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92834e0c216abdd62b051807d054abca1b7bc2d0b45f390cda2e14f68e868d2a",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05148205cb9414b72a7cd83965447b6e5eb5c65492268d247291db8e77afe783",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc825fc6123d66feb35da08022fe757a70ae05ec9659d13a128f6fae9a1988e2",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5496fb4b56091de23324badd6672a5a4ef0f7918a3298549a89ee8c35712a01",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35e7217a646b1bbda17f3ae78ca604c37e7e3f2a8f3ab27ba4938b6a1d28b09c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:074dcae4c66c87464457737d48a6cf281fd8141ecda7e335870cedc002391c8c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5711fd19828b8375f5f95b74b568d265399de50f36c94184d97714c89d1bed14",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d875990af5102e92773c737d955e23bb8f563df05b3652c53d0ebe2cbad809f8"
}
}
6 changes: 3 additions & 3 deletions assets/release/release-x86_64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.12.0-0.nightly-2023-02-18-121434"
"base": "4.12.0-0.nightly-2023-02-26-022418"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9feb297a0007232cd124c9d0c94360b6ad35b81350b2b55469efc14fda48c72",
Expand All @@ -13,8 +13,8 @@
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d792755d7e9bda9d95525984f8823f5fde8304902e278ac3729fcd94c585045c",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:211d1573308c92367f9e7e0e6ffb06257748dc81666b0629e8c210a172f13629",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:21bbb5586c93ddc2b847c2a4971c6e0264ab6ea641b4d4079c863ce4f87b3b3d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c250566d31163a74fb337a93c2e222d935b35a0c8c1c2f7eb20b8b2d78c59203",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:be64c744b92d1b1df463d84d8277c38069f3ce4e8e95ce84d4a6ffac6dc53710",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41cff578751b931f3b3770758014463cf48b42a7a29568b8d89c8ed6c8e9cb19",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a4d416241b671657a03a1a3a149e0f6742591fd32761937be40fa2df09a8ce47",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad2114b3e9d4271c01728276e5ab49733e24f1603bd3927fc7a439eaa98f8753"
}
}
62 changes: 31 additions & 31 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/cluster-policy-controller v0.0.0-20230117141919-105cc773b37f
github.com/openshift/cluster-policy-controller v0.0.0-20230220142510-a78a00b3632f
github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43
github.com/openshift/route-controller-manager v0.0.0-20221130011049-9e74d175e81e
github.com/pkg/errors v0.9.1
Expand Down Expand Up @@ -225,7 +225,7 @@ require (
k8s.io/legacy-cloud-providers v0.0.0 // indirect
k8s.io/metrics v0.0.0 // indirect
k8s.io/mount-utils v0.0.0 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect
k8s.io/pod-security-admission v0.25.0 // indirect
k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
Expand All @@ -238,7 +238,7 @@ require (
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-20221017210321-925452e8316c // indirect
github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 // indirect
github.com/stretchr/objx v0.4.0 // indirect
)

Expand Down Expand Up @@ -269,7 +269,7 @@ replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c // from kubernetes
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // from kubernetes
github.com/openshift/api => github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e // from kubernetes
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20221017210321-925452e8316c // from kubernetes
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 // from kubernetes
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d // from kubernetes
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // from kubernetes
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43 // from kubernetes
Expand All @@ -294,36 +294,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-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230221110312-18eadcaadf0b // 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-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230221110312-18eadcaadf0b // 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-20230110155528-a34b9e9499e6 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230221110312-18eadcaadf0b // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230221110312-18eadcaadf0b // 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-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230110155528-a34b9e9499e6 // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230110155528-a34b9e9499e6 // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230221110312-18eadcaadf0b // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230221110312-18eadcaadf0b // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230221110312-18eadcaadf0b // 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

0 comments on commit 50997a2

Please sign in to comment.