Skip to content

rebase-4.12.0-0.nightly_amd64-2023-04-07-211226_arm64-2023-04-07-173314 #1641

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
Apr 10, 2023
Merged

rebase-4.12.0-0.nightly_amd64-2023-04-07-211226_arm64-2023-04-07-173314 #1641

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
797d01a
update last_rebase.sh
Apr 10, 2023
dc00505
update changelog
Apr 10, 2023
8f9cfb7
update go.mod
Apr 10, 2023
cf5f6c9
update vendoring
Apr 10, 2023
2c94844
update component images
Apr 10, 2023
9383b32
update manifests
Apr 10, 2023
c4a8de8
update buildfiles
Apr 10, 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.0
KUBE_GIT_COMMIT=eab9cc98fe4c002916621ace6cdd623afa519203
KUBE_GIT_COMMIT=27e744f55d2e99eb8265c837e2571e47559079f6
KUBE_GIT_TREE_STATE=clean
24 changes: 12 additions & 12 deletions assets/release/release-aarch64.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-arm64-2023-03-30-084912"
"base": "4.12.0-0.nightly-arm64-2023-04-07-173314"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9e6a4aca31c9ed4c7ad57fe760da981541b3535a28e6c37098c78f3fcc9a1c2f",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71bcd679a06b394854fde90dc133681eb69c6eb7bef3564b54cbd2982ba9c7b1",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ebd415abc99e64b5afda3a7fa3bf512602aae4488f1e4400c093801299b1c6a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3d9e90dd4ab535ec6d5512b4fbf739d33d61514bbd10d76fe98d2d5996ac35",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fec7d3fcf6f3f5dec420817329ad60e6822e16977bda55493bbbbc1f150dcc1",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38d477ccc95cfef01d41fd2a75a0b391efdff7e01ba7f6878db860ac6c12286d",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a10e8133c979164e0ce0469c2a68a0743b953a207ed35391c33e6fdbdcf92de",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1f3abde04550170e005cd59ecc0d9db2ad4854f1ea868de81df6ba050a33cf9",
"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:e5931deade8033a5637208cce4efe29c6f008c47ae3e0c76161aea6ae67480ee",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70f5ba75da255a2f176b9d5d657c062b9206bf986d6b41f4f2ce3339a0caefb9",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22002726742d2f312fcf8a4ad27544de30bd41c9276ef69fd67d25335ae4a617",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d66df63eeced9bf996628cbd046d654bf26f5a51a8e199f42125d07126bb8dcf",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48f36418f9dae877fc618ab91ce84851e66099d2c1cc82e996936c9c5d244e17",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5adebe588ac1dac69767ed98e34943446fe3c8a3cf9a83f00f10c770d721f504",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e0beedf4bf2cc075705d11cb7c54b7a4ad802c33b084139d7f7990cc18afe4f"
"csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6bf5d986589a6dd335d41b799102694dbe1130124dec43322192e07762092c0",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a45dc331d00c2c1a3cc835a0cd21fd2683aab57db3035574a5ac0a60090b22bc",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79a6615b96c9e05d838f5a276f58614315029149ea4e9975585b3185f0dc8a0c",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78046f7d60616709fdcd615b687deab6548ebfdc49ad53ab7838c6a959ea391f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb884fe0a607ff571592e6b496ec5519328bfd713a8da94f5fa95e2020829ff",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76ae10b81db6e2525bf812f9534186b2bac54c98d2198b2c0debea3f7be8ec29",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e419e06763c56cd5c374b4ba82faed004255543a77febc956929c301ee08021e"
}
}
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-04-03-132047"
"base": "4.12.0-0.nightly-2023-04-07-211226"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e43f69774d9411a1eece3f564e138e1eb547e7a8c08350987cda4e1d950adff3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65e8df341fd89862aded89c73a368e3e7c568bb8304cac5ea4af14793397bb48",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96df903a6ce89acebee3f5b05a8de69437b213797d0ed5cf3bc824440d133b31",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a68f56ec1f9fdc03290d420085d108fe8be13d390a4354607b79f6946cfaa2d",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:533ac47e89e1bcf15a78df47260558b022cd41ce89cb353d72dd5ec315823027",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b37db6614e5e6f573e7fa4a92926b49cc19a66c0421a0e9d57b1cfbc01acaf",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2774c71dd16b8a25cb6d19d0c0a02bf6582915c78766b918c65c5c55bffae52",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4c28ac772ec8f918036b4c9876ec5a0c333f909cb502d52d836f46fd179c5735",
"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:23cf7d6419275c4237d2ed4a3d0f73f242a9d114a7204186f96bceb4582c2a4b",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:869df0ee2e3c6034a1129f312878c6cebc923b883cf7057779cf2da75123f35e",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f27960af53fb94bd3a0dcf2015e84f7193f973dbd855ebdcbe28020986e30b6c",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5458bc9d131a9783f35d430a74d6b7ed94fc62d2239e372f809fac5ca0ee076e",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae636ff200105cccab1e7872332b5d4349fa86e1119f40fc5bfa044fb913e0dd",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d324064f11fbdd1534bd82623cebdff34742bca90258005f381c60259ce8ad57",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:43c0e1a4cb6d0b1167777f3f087e32389522c7d820981af74c653e76773d92db"
"csi-external-provisioner": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5382380185f0b0ea058b1f1395d2de0af7dc90343868bb639b629bfb9ec03e47",
"csi-external-resizer": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e25cd6c4997ef7c71db31ef9f400e4442d99e42e43d784d6f798c658f15e25c",
"csi-node-driver-registrar": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2609f5c0c8b106482b4876f59067252f352ea4aa1e590b7080a410fb581fd001",
"csi-livenessprobe": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:20fb28ec66f85711821ebfff9ed883b27b866541a1c4eb12aa864f29cbf28047",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8bf7f7777c9c8880d115cea1ac6300f8e8eef5cd2736077d4d97b1695772f47a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a13c22901925a66052e1a9fccf23fbeec5262ead835bb26ea2ff0e21dd66d75",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:717a72f7e9f17a0b41e33541ec65e21c8e5e86132866cb5bc11527d529f2e058"
}
}
54 changes: 27 additions & 27 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230406202355-27e744f55d2e // 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-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230406202355-27e744f55d2e // 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-20230313212328-eab9cc98fe4c // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230406202355-27e744f55d2e // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230406202355-27e744f55d2e // 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-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230313212328-eab9cc98fe4c // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230406202355-27e744f55d2e // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230406202355-27e744f55d2e // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230406202355-27e744f55d2e // 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