diff --git a/go.mod b/go.mod index b22dddb8f6..3e4794d0bb 100644 --- a/go.mod +++ b/go.mod @@ -22,17 +22,17 @@ require ( golang.org/x/sys v0.5.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.25.2 - k8s.io/apiextensions-apiserver v0.25.0 - k8s.io/apimachinery v0.25.2 - k8s.io/apiserver v0.25.2 - k8s.io/cli-runtime v0.25.2 - k8s.io/client-go v0.25.2 - k8s.io/component-base v0.25.2 - k8s.io/controller-manager v0.25.2 // indirect + k8s.io/apiextensions-apiserver v0.0.0 + k8s.io/apimachinery v0.0.0 + k8s.io/apiserver v0.0.0 + k8s.io/cli-runtime v0.0.0 + k8s.io/client-go v0.0.0 + k8s.io/component-base v0.0.0 + k8s.io/controller-manager v0.0.0 // indirect k8s.io/klog/v2 v2.80.1 - k8s.io/kube-aggregator v0.25.0 + k8s.io/kube-aggregator v0.0.0 k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea - k8s.io/kubectl v0.25.2 + k8s.io/kubectl v0.0.0 k8s.io/kubernetes v1.25.2 sigs.k8s.io/yaml v1.2.0 ) @@ -215,7 +215,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/cloud-provider v0.0.0 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect - k8s.io/component-helpers v0.25.2 // indirect + k8s.io/component-helpers v0.0.0 // indirect k8s.io/cri-api v0.0.0 // indirect k8s.io/csi-translation-lib v0.0.0 // indirect k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect @@ -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.25.0 // indirect + k8s.io/pod-security-admission v0.0.0 // indirect k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect @@ -249,6 +249,11 @@ require ( github.com/go-ldap/ldap/v3 v3.4.3 // indirect github.com/golang-jwt/jwt/v4 v4.2.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.20.0 // indirect + k8s.io/code-generator v0.0.0 + k8s.io/kube-proxy v0.0.0 + k8s.io/sample-apiserver v0.0.0 + k8s.io/sample-cli-plugin v0.0.0 + k8s.io/sample-controller v0.0.0 ) replace ( @@ -294,36 +299,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-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230404123625-db63dbe4698b // 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-20230404123625-db63dbe4698b // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230404123625-db63dbe4698b // 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-20230404123625-db63dbe4698b // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230404123625-db63dbe4698b // 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-20230404123625-db63dbe4698b // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20230404123625-db63dbe4698b // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20230404123625-db63dbe4698b // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20230404123625-db63dbe4698b // 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 ) diff --git a/go.sum b/go.sum index 1ff9ab5d77..a770a5e226 100644 --- a/go.sum +++ b/go.sum @@ -548,8 +548,8 @@ github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 h1:iMup github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7/go.mod h1:xwZlQLuAWsWw5rpb/Gwzi3nFie9STKcrKQbM6evLi5g= github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c h1:IkEJvk3ky9d2edAyumMjjeGu9A/F2H/1N9IcdEGkLVQ= github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:U7onx+dLL248udqLPp6SzctRAMzhBDh07QEJQHM3XyU= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c h1:p2wTy6HEQ5q28fhoCTwmSnozpk9CaDyyQlIl6NY3BSs= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:0e+IH7CyGwrfYDYKUsNW0HpasrfRUy40RzB40z/JbZ4= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230404123625-db63dbe4698b h1:Y6CtPjtIPBUaW8LWlxjj+NvX7WXt2YVufEwg0fdLmaA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230404123625-db63dbe4698b/go.mod h1:0e+IH7CyGwrfYDYKUsNW0HpasrfRUy40RzB40z/JbZ4= github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c h1:EZWEdmDFHY6AM1baGoR7JZe+2pWwRJKH/lBXuphvtDQ= github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c/go.mod h1:hBdDIJQkeKDFqRAp9Ech139uPvJOcZEpWo4tbYmqA6M= github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c h1:8HjWNDIBpyg3zVW/Pul5Yi4PXHh/QhMdnweRC4TB/3s= diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..d180cd24c4 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,583 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-06-213526 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-06-213526 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 1c136fe Merge pull request #344 from Miciah/art-consistency-openshift-4.12-ose-cluster-dns-operator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 992b43b Merge pull request #851 from arkadeepsen/route-metric-label + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at 2076f3d Merge pull request #1440 from stlaz/deads2k_featuresets_412_psa_enable + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at 1c2157d Merge pull request #694 from stlaz/deads2k_featuresets_412 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at 845ae42 Merge pull request #462 from ingvagabund/guard-pod-set-readiness-probe-endpoint-explicitly-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at 529ff4a Merge pull request #1759 from openshift-cherrypick-robot/cherry-pick-1680-to-release-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at d1915d1 Merge pull request #275 from coreydaley/fix_gofmt_go1.19 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at 139ac04 Merge pull request #98 from stlaz/deads2k_featuresets_412 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at c1d76ffd Merge pull request #185 from openshift-cherrypick-robot/cherry-pick-177-to-openshift-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at db63dbe46 Merge pull request #1527 from suleymanakbas91/bump-1.25.8 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at 5c2ff4ba Merge pull request #3573 from cybertron/resolv-prepender-systemd-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at b6528f9 Merge pull request #241 from openshift-bot/art-consistency-openshift-4.12-ose-openshift-controller-manager + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at 9e74d17 Merge pull request #12 from atiratree/route-defaulting-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at 299b709 Merge pull request #203 from openshift-cherrypick-robot/cherry-pick-202-to-release-4.12 + +# Cloning registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 31aa3e8 Merge pull request #1382 from openshift-cherrypick-robot/cherry-pick-1377-to-release-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at 9aaa7e0 Merge pull request #78 from gcs278/bufsize-upstream-fix + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-provisioner/.git/ +HEAD is now at 140851f Merge pull request #58 from openshift-bot/art-consistency-openshift-4.12-csi-provisioner + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-resizer/.git/ +HEAD is now at 239d751 Merge pull request #134 from openshift-bot/art-consistency-openshift-4.12-ose-csi-external-resizer + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-livenessprobe/.git/ +HEAD is now at 720e1d6 Merge pull request #35 from openshift-bot/art-consistency-openshift-4.12-csi-livenessprobe + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-node-driver-registrar/.git/ +HEAD is now at 805d5ac Merge pull request #39 from openshift-bot/art-consistency-openshift-4.12-csi-node-driver-registrar + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 3065f65 Merge pull request #424 from Miciah/art-consistency-openshift-4.12-ose-haproxy-router-base + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at 513fd32 Merge pull request #60 from openshift-auth/merg-upstream-into-downstream + +lvms-topolvm not from release payload, skipping + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/ +HEAD is now at 3780f16 Merge pull request #1617 from npinaeva/ocpbugs-11109 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at db63dbe46 Merge pull request #1527 from suleymanakbas91/bump-1.25.8 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at 299b709 Merge pull request #203 from openshift-cherrypick-robot/cherry-pick-202-to-release-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at 31aa3e8 Merge pull request #1382 from openshift-cherrypick-robot/cherry-pick-1377-to-release-4.12 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at 9aaa7e0 Merge pull request #78 from gcs278/bufsize-upstream-fix + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-provisioner/.git/ +HEAD is now at 140851f Merge pull request #58 from openshift-bot/art-consistency-openshift-4.12-csi-provisioner + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-resizer/.git/ +HEAD is now at 239d751 Merge pull request #134 from openshift-bot/art-consistency-openshift-4.12-ose-csi-external-resizer + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-livenessprobe/.git/ +HEAD is now at 720e1d6 Merge pull request #35 from openshift-bot/art-consistency-openshift-4.12-csi-livenessprobe + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-node-driver-registrar/.git/ +HEAD is now at 805d5ac Merge pull request #39 from openshift-bot/art-consistency-openshift-4.12-csi-node-driver-registrar + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at 3065f65 Merge pull request #424 from Miciah/art-consistency-openshift-4.12-ose-haproxy-router-base + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at 513fd32 Merge pull request #60 from openshift-auth/merg-upstream-into-downstream + +lvms-topolvm not from release payload, skipping + +openssl not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/ +HEAD is now at 3780f16 Merge pull request #1617 from npinaeva/ocpbugs-11109 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at db63dbe46 Merge pull request #1527 from suleymanakbas91/bump-1.25.8 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at 299b709 Merge pull request #203 from openshift-cherrypick-robot/cherry-pick-202-to-release-4.12 + +error: branch 'rebase-4.12.0-0.nightly_amd64-2023-04-06-213528_arm64-2023-04-06-213526' not found. +Switched to a new branch 'rebase-4.12.0-0.nightly_amd64-2023-04-06-213528_arm64-2023-04-06-213526' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-4.12.0-0.nightly_amd64-2023-04-06-213528_arm64-2023-04-06-213526 41b3def3] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-dns-operator embedded-component no change + +cluster-ingress-operator embedded-component no change + +cluster-kube-apiserver-operator embedded-component no change + +cluster-kube-scheduler-operator embedded-component no change + +cluster-openshift-controller-manager-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +etcd embedded-component no change + +openshift-controller-manager embedded-component no change + +route-controller-manager embedded-component no change + +service-ca-operator embedded-component no change + +oc image-amd64 no change + +coredns image-amd64 no change + +csi-external-provisioner image-amd64 no change + +csi-external-resizer image-amd64 no change + +csi-livenessprobe image-amd64 no change + +csi-node-driver-registrar image-amd64 no change + +router image-amd64 no change + +kube-rbac-proxy image-amd64 no change + +service-ca-operator image-amd64 no change + +oc image-arm64 no change + +coredns image-arm64 no change + +csi-external-provisioner image-arm64 no change + +csi-external-resizer image-arm64 no change + +csi-livenessprobe image-arm64 no change + +csi-node-driver-registrar image-arm64 no change + +router image-arm64 no change + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-4.12.0-0.nightly_amd64-2023-04-06-213528_arm64-2023-04-06-213526 7cbcb451] update changelog + 2 files changed, 92 insertions(+), 15 deletions(-) + rewrite scripts/auto-rebase/changelog.txt (94%) +# Updating go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@139ac0499ac4d744023827ceb6d16aa6b467be27 +go: downloading github.com/spf13/cobra v1.4.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230313212328-eab9cc98fe4c +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading k8s.io/klog/v2 v2.70.1 +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230313212328-eab9cc98fe4c +go: downloading sigs.k8s.io/yaml v1.2.0 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading github.com/kelseyhightower/envconfig v1.4.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/mitchellh/go-homedir v1.1.0 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/openshift/kubernetes v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/stretchr/testify v1.8.0 +go: downloading github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e +go: downloading github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c +go: downloading github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230313212328-eab9cc98fe4c +go: downloading golang.org/x/sys v0.5.0 +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20230227104154-139ac0499ac4 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20221130011049-9e74d175e81e +go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading github.com/google/go-cmp v0.5.8 +go: downloading k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 +go: downloading github.com/go-logr/logr v1.2.3 +go: downloading github.com/inconshreveable/mousetrap v1.0.0 +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading golang.org/x/net v0.7.0 +go: downloading golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd +go: downloading golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading github.com/google/uuid v1.1.2 +go: downloading k8s.io/utils v0.0.0-20220922133306-665eaaec4324 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/google/gofuzz v1.1.0 +go: downloading github.com/jonboulle/clockwork v0.2.2 +go: downloading github.com/google/gnostic v0.5.7-v3refs +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.0 +go: downloading github.com/russross/blackfriday v1.5.2 +go: downloading github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae +go: downloading github.com/imdario/mergo v0.3.6 +go: downloading golang.org/x/term v0.5.0 +go: downloading sigs.k8s.io/kube-storage-version-migrator v0.0.4 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.2.3 +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading go.etcd.io/bbolt v1.3.6 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 +go: downloading go.opentelemetry.io/contrib v0.20.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp v0.20.0 +go: downloading go.opentelemetry.io/otel v0.20.0 +go: downloading go.opentelemetry.io/otel/sdk v0.20.0 +go: downloading go.uber.org/multierr v1.6.0 +go: downloading go.uber.org/zap v1.19.0 +go: downloading google.golang.org/grpc v1.47.0 +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.0.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/google/cadvisor v0.45.0 +go: downloading k8s.io/component-helpers v0.25.0 +go: downloading github.com/fsnotify/fsnotify v1.4.9 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230313212328-eab9cc98fe4c +go: downloading go.opentelemetry.io/otel/trace v0.20.0 +go: downloading github.com/coreos/go-systemd/v22 v22.3.2 +go: downloading github.com/opencontainers/runc v1.1.3 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230313212328-eab9cc98fe4c +go: downloading sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading github.com/golang/protobuf v1.5.2 +go: downloading google.golang.org/protobuf v1.28.0 +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading golang.org/x/text v0.7.0 +go: downloading sigs.k8s.io/kustomize/api v0.12.1 +go: downloading sigs.k8s.io/kustomize/kyaml v0.13.9 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 +go: downloading golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 +go: downloading golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 +go: downloading github.com/prometheus/client_golang v1.12.1 +go: downloading github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da +go: downloading github.com/blang/semver/v4 v4.0.0 +go: downloading github.com/prometheus/client_model v0.2.0 +go: downloading github.com/prometheus/procfs v0.7.3 +go: downloading github.com/prometheus/common v0.32.1 +go: downloading github.com/blang/semver v3.5.1+incompatible +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.8.1 +go: downloading github.com/emicklei/go-restful/v3 v3.8.0 +go: downloading go.uber.org/atomic v1.7.0 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/gorilla/websocket v1.4.2 +go: downloading google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 +go: downloading gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c +go: downloading github.com/onsi/gomega v1.20.1 +go: downloading github.com/coreos/go-semver v0.3.0 +go: downloading github.com/dustin/go-humanize v1.0.0 +go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 +go: downloading github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 +go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 +go: downloading go.opentelemetry.io/otel/oteltest v0.20.0 +go: downloading go.uber.org/goleak v1.2.0 +go: downloading go.opentelemetry.io/otel/metric v0.20.0 +go: downloading go.opentelemetry.io/otel/sdk/export/metric v0.20.0 +go: downloading go.opentelemetry.io/otel/sdk/metric v0.20.0 +go: downloading go.opentelemetry.io/proto/otlp v0.7.0 +go: downloading github.com/onsi/ginkgo v1.11.0 +go: downloading github.com/benbjohnson/clock v1.1.0 +go: downloading github.com/form3tech-oss/jwt-go v3.2.3+incompatible +go: downloading github.com/BurntSushi/toml v0.3.1 +go: downloading github.com/Azure/azure-sdk-for-go v55.0.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/adal v0.9.20 +go: downloading github.com/Azure/go-autorest/autorest v0.11.27 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/Azure/go-autorest v14.2.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/to v0.4.0 +go: downloading gopkg.in/square/go-jose.v2 v2.2.2 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 +go: downloading github.com/karrick/godirwalk v1.16.1 +go: downloading github.com/docker/go-units v0.4.0 +go: downloading github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.35 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230210123647-1a6a836b6681 +go: downloading github.com/aws/aws-sdk-go v1.38.49 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/golang/mock v1.6.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.20.0 +go: downloading github.com/container-storage-interface/spec v1.6.0 +go: downloading github.com/heketi/heketi v10.3.0+incompatible +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading github.com/moby/sys/mountinfo v0.6.0 +go: downloading github.com/cyphar/filepath-securejoin v0.2.3 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading gonum.org/v1/gonum v0.6.2 +go: downloading github.com/google/btree v1.0.1 +go: downloading github.com/fvbommel/sortorder v1.0.1 +go: downloading github.com/go-openapi/jsonreference v0.19.5 +go: downloading github.com/go-openapi/swag v0.19.14 +go: downloading k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 +go: downloading github.com/creack/pty v1.1.11 +go: downloading gotest.tools/v3 v3.0.3 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.1.2 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230313212328-eab9cc98fe4c +go: downloading github.com/NYTimes/gziphandler v1.1.1 +go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd +go: downloading github.com/modern-go/reflect2 v1.0.2 +go: downloading github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e +go: downloading go.etcd.io/etcd/client/v2 v2.305.4 +go: downloading github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5 +go: downloading github.com/Azure/go-autorest/autorest/date v0.3.0 +go: downloading github.com/Azure/go-autorest/logger v0.2.1 +go: downloading github.com/Azure/go-autorest/tracing v0.6.0 +go: downloading github.com/golang-jwt/jwt/v4 v4.2.0 +go: downloading github.com/Azure/go-autorest/autorest/mocks v0.4.2 +go: downloading github.com/felixge/httpsnoop v1.0.1 +go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/containerd/ttrpc v1.0.2 +go: downloading github.com/Microsoft/go-winio v0.4.17 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/mitchellh/mapstructure v1.4.1 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading github.com/hashicorp/golang-lru v0.5.1 +go: downloading github.com/docker/distribution v2.8.1+incompatible +go: downloading github.com/coreos/go-oidc v2.1.0+incompatible +go: downloading gopkg.in/gcfg.v1 v1.2.0 +go: downloading github.com/gophercloud/gophercloud v0.1.0 +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +go: downloading github.com/vmware/govmomi v0.20.3 +go: downloading cloud.google.com/go v0.97.0 +go: downloading github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading google.golang.org/api v0.60.0 +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/Microsoft/hcsshim v0.8.22 +go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab +go: downloading github.com/lithammer/dedent v1.1.0 +go: downloading github.com/godbus/dbus/v5 v5.0.6 +go: downloading go.opentelemetry.io/contrib/propagators v0.20.0 +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 +go: downloading github.com/gorilla/mux v1.8.0 +go: downloading github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6 +go: downloading github.com/urfave/negroni v1.0.0 +go: downloading github.com/go-ozzo/ozzo-validation v3.5.0+incompatible +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading golang.org/x/exp v0.0.0-20210220032938-85be41e4509f +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/PuerkitoBio/purell v1.1.1 +go: downloading github.com/go-openapi/jsonpointer v0.19.5 +go: downloading github.com/mailru/easyjson v0.7.6 +go: downloading golang.org/x/tools v0.1.12 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/go-errors/errors v1.0.1 +go: downloading github.com/kr/text v0.2.0 +go: downloading github.com/cockroachdb/errors v1.2.4 +go: downloading github.com/stretchr/objx v0.4.0 +go: downloading github.com/docker/docker v20.10.17+incompatible +go: downloading github.com/docker/go-connections v0.4.0 +go: downloading github.com/checkpoint-restore/go-criu/v5 v5.3.0 +go: downloading github.com/containerd/console v1.0.3 +go: downloading github.com/mrunalp/fileutils v0.5.0 +go: downloading github.com/google/cel-go v0.12.6 +go: downloading github.com/pquerna/cachecontrol v0.1.0 +go: downloading gopkg.in/warnings.v0 v0.1.1 +go: downloading github.com/boltdb/bolt v1.3.1 +go: downloading github.com/lpabon/godbc v0.1.1 +go: downloading github.com/auth0/go-jwt-middleware v1.0.1 +go: downloading gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e +go: downloading github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 +go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 +go: downloading github.com/xlab/treeprint v1.1.0 +go: downloading github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 +go: downloading github.com/josharian/intern v1.0.0 +go: downloading github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f +go: downloading github.com/getsentry/raven-go v0.2.0 +go: downloading github.com/cilium/ebpf v0.7.0 +go: downloading github.com/Azure/go-autorest/autorest/validation v0.1.0 +go: downloading github.com/gofrs/uuid v4.0.0+incompatible +go: downloading github.com/dnaeon/go-vcr v1.0.1 +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 +go: downloading github.com/jmespath/go-jmespath v0.4.0 +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading github.com/googleapis/gax-go/v2 v2.1.1 +go: downloading go.opencensus.io v0.23.0 +go: downloading github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed +go: downloading go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e +go: downloading github.com/go-asn1-ber/asn1-ber v1.5.4 +go: downloading github.com/frankban/quicktest v1.11.3 +go: downloading github.com/containerd/cgroups v1.0.1 +go: downloading github.com/kr/pretty v0.2.1 +go: downloading github.com/jmespath/go-jmespath/internal/testify v1.5.1 +go mod edit -require github.com/openshift/route-controller-manager@9e74d175e81ef6a2beb3718398e3fc99dded037c +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@db63dbe4698bd34bab98717093af4f5424482286 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace github.com/MakeNowJust/heredoc=github.com/MakeNowJust/heredoc@v1.0.0 +go mod edit -replace github.com/auth0/go-jwt-middleware=github.com/auth0/go-jwt-middleware@v1.0.1 +go mod edit -replace github.com/boltdb/bolt=github.com/boltdb/bolt@v1.3.1 +go mod edit -replace github.com/go-logr/logr=github.com/go-logr/logr@v1.2.3 +go mod edit -replace github.com/go-ozzo/ozzo-validation=github.com/go-ozzo/ozzo-validation@v3.5.0+incompatible +go mod edit -replace github.com/google/go-cmp=github.com/google/go-cmp@v0.5.8 +go mod edit -replace github.com/google/gofuzz=github.com/google/gofuzz@v1.1.0 +go mod edit -replace github.com/hashicorp/golang-lru=github.com/hashicorp/golang-lru@v0.5.1 +go mod edit -replace github.com/heketi/tests=github.com/heketi/tests@v0.0.0-20151005000721-f3775cbcefd6 +go mod edit -replace github.com/imdario/mergo=github.com/imdario/mergo@v0.3.6 +go mod edit -replace github.com/lpabon/godbc=github.com/lpabon/godbc@v0.1.1 +go mod edit -replace github.com/moby/sys/mountinfo=github.com/moby/sys/mountinfo@v0.6.0 +go mod edit -replace github.com/mohae/deepcopy=github.com/mohae/deepcopy@v0.0.0-20170603005431-491d3605edfb +go mod edit -replace github.com/onsi/ginkgo=github.com/onsi/ginkgo@v1.11.0 +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.0.0-20221005160638-5fa9cd70cd8c +go mod edit -replace github.com/opencontainers/image-spec=github.com/opencontainers/image-spec@v1.0.2 +go mod edit -replace github.com/openshift/api=github.com/openshift/api@v0.0.0-20221116152553-4b67c2b2bb1e +go mod edit -replace github.com/openshift/apiserver-library-go=github.com/openshift/apiserver-library-go@v0.0.0-20230210123647-1a6a836b6681 +go mod edit -replace github.com/openshift/build-machinery-go=github.com/openshift/build-machinery-go@v0.0.0-20220913142420-e25cf57ea46d +go mod edit -replace github.com/openshift/client-go=github.com/openshift/client-go@v0.0.0-20221019143426-16aed247da5c +go mod edit -replace github.com/openshift/library-go=github.com/openshift/library-go@v0.0.0-20221205131816-1700fb06ea43 +go mod edit -replace github.com/pkg/errors=github.com/pkg/errors@v0.9.1 +go mod edit -replace github.com/pquerna/cachecontrol=github.com/pquerna/cachecontrol@v0.1.0 +go mod edit -replace github.com/prometheus/client_golang=github.com/prometheus/client_golang@v1.12.1 +go mod edit -replace github.com/spf13/cobra=github.com/spf13/cobra@v1.4.0 +go mod edit -replace github.com/spf13/pflag=github.com/spf13/pflag@v1.0.5 +go mod edit -replace github.com/stretchr/testify=github.com/stretchr/testify@v1.8.0 +go mod edit -replace github.com/urfave/negroni=github.com/urfave/negroni@v1.0.0 +go mod edit -replace github.com/vishvananda/netns=github.com/vishvananda/netns@v0.0.0-20200728191858-db3c7e526aae +skipping modulepath go.etcd.io/etcd/api/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/client/pkg/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/client/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/pkg/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/raft/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/server/v3: override [pinning etcd due to conflicting opentelemetry version] +skipping modulepath go.etcd.io/etcd/v3: override [pinning etcd due to conflicting opentelemetry version] +go mod edit -replace golang.org/x/crypto=golang.org/x/crypto@v0.0.0-20220315160706-3147a52a75dd +go mod edit -replace golang.org/x/exp=golang.org/x/exp@v0.0.0-20210220032938-85be41e4509f +go mod edit -replace golang.org/x/net=golang.org/x/net@v0.7.0 +go mod edit -replace gonum.org/v1/netlib=gonum.org/v1/netlib@v0.0.0-20190331212654-76723241ea4e +go mod edit -replace gopkg.in/square/go-jose.v2=gopkg.in/square/go-jose.v2@v2.2.2 +go mod edit -replace gopkg.in/yaml.v2=gopkg.in/yaml.v2@v2.4.0 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/component-helpers=k8s.io/component-helpers@v0.25.0 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/klog/v2=k8s.io/klog/v2@v2.70.1 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-openapi=k8s.io/kube-openapi@v0.0.0-20220803162953-67bda5d908f1 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20230404123625-db63dbe4698b +go mod edit -replace sigs.k8s.io/json=sigs.k8s.io/json@v0.0.0-20220713155537-f223a00ba0e2 +go mod edit -replace sigs.k8s.io/yaml=sigs.k8s.io/yaml@v1.2.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230404123625-db63dbe4698b +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230404123625-db63dbe4698b +go: github.com/openshift/api@v0.0.0-20221116152553-4b67c2b2bb1e requires + k8s.io/apimachinery@v0.25.0 (replaced by github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230404123625-db63dbe4698b): verifying go.mod: github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230404123625-db63dbe4698b/go.mod: reading https://sum.golang.org/lookup/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20230404123625-db63dbe4698b: 404 Not Found + server response: not found: fetch timed out +Script exited with error. diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 4fa47e4883..4e6e86f593 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,7 +1,84 @@ -# cluster-network-operator embedded-component 41a8c00b633446c2ee05fc19b924240de2d8b18f to 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde -4fbe0b47753fd408689b94b7ee0094f7db8da6e2 2022-12-09T11:58:33+00:00 Fix info log formatting -# machine-config-operator embedded-component 52fe26136643a946ff1dd1307012cbdef31ebf97 to e8291b07876fd93fad5ef8c09b9f47621186cb17 -963248648c0e90610fd3d88ee252d9d484c73d7a 2023-01-17T15:54:12+00:00 OCPBUGS-5872: Wrap podman commands in a while loop -# ovn-kubernetes image-amd64 78938a80db83ac5df2d450103829c319c733b23a to ffce71cb9cc045517288ed0f28a5d25c059d2438 -8ce4aa4f4594271b53e7833dd9713605845d2b3a 2023-03-28T10:16:27+02:00 fix multiple error aggregation: `errors.Wrapf` always returns nil if the first argument is nil. -c43e230cff6bdd811448d528699635387187b74f 2023-03-28T10:14:11+02:00 Egress firewall creation error was overridden by the status update error and never returned. That would prevent retry on failure. +# cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 to 1c2157df6e9031bf6abb9250d2bec901608fe5b4 +46d4cbcd5d6d41480088c4597736eb450460fd24 2023-03-07T10:21:54+01:00 add featuregates for clusterpolicycontroller +3f435b6ffe739bbb945084d1f86b16e32726e15c 2023-03-07T10:14:25+01:00 update openshift/api to get new featuregates +# cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde to 529ff4a694ff0f4598d5763b20f78fe44cd14f22 +5dd5e9963ec960c0c6a1f28ad9137d1bfe2ba77f 2023-03-30T20:35:41+00:00 remove TLS_RSA_WITH_AES_128_CBC_SHA256 cipher +# kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203 to db63dbe4698bd34bab98717093af4f5424482286 +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics +# machine-config-operator embedded-component e8291b07876fd93fad5ef8c09b9f47621186cb17 to 5c2ff4ba47b3114b9116fe87a1ba81ae45e73c7d +150f62ac3a81d1e83c4f7f05f2338e41c61a479a 2023-04-06T11:01:52-05:00 OCPBUGS-5872: Wrap podman commands in a while loop +0d261434b2b2efb54a0151174e104802ed10c6db 2023-04-06T11:01:52-05:00 Remove timeout and separate image pull from prepender script +b360ceb047b11233551764e6e1b7518872e87b92 2023-04-06T11:01:50-05:00 Forklift most of resolv-prepender dispatcher script to systemd +# ovn-kubernetes image-amd64 ffce71cb9cc045517288ed0f28a5d25c059d2438 to 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +0bc8f1412f1a462900961e4e54bc747b7a83d52a 2023-03-30T18:38:13+02:00 Optimize egress firewall cleanup to only select switches that have stale acls. +88ecd8b1b477c09a10bc7e151a181580fc8ca79f 2023-03-30T09:44:23+02:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. +# kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203 to db63dbe4698bd34bab98717093af4f5424482286 +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics +# ovn-kubernetes image-arm64 ffce71cb9cc045517288ed0f28a5d25c059d2438 to 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +0bc8f1412f1a462900961e4e54bc747b7a83d52a 2023-03-30T18:38:13+02:00 Optimize egress firewall cleanup to only select switches that have stale acls. +88ecd8b1b477c09a10bc7e151a181580fc8ca79f 2023-03-30T09:44:23+02:00 Batch potentially big transaction on egress firewall ACLs migration. The default transaction timeout is 10 seconds, it can be reached when we delete all egress firewall acls during migration to port groups from switches. +# kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 to db63dbe4698bd34bab98717093af4f5424482286 +60398d079008c394fb817b1f5f37155dd47cc346 2023-03-30T18:47:02+00:00 UPSTREAM: : hack/update-vendor.sh, make update and update image +0ce7342c984110dfc93657d64df5dc3b2c0d1fe9 2023-03-15T13:31:32+00:00 Release commit for Kubernetes v1.25.8 +42c5d12dabca806ca24cf886b26f5eb29ebb7af7 2023-03-09T16:00:44-05:00 One lock among PodNominator and SchedulingQueue +360e5303abc8ef88f4fa7f388d303b81cb60c028 2023-03-09T10:09:17+01:00 releng/go: Update images, dependencies and version to Go 1.19.7 +a561bb21aa9eb60cc00f1f203f04bb16da3365da 2023-03-03T11:20:16+05:30 Fix for windows kube-proxy: 'externalTrafficPolicy: Local' results in no clusterIP entry in windows node. +e64823164d7569f2eea7ce43c8a5e6b45d8aec3d 2023-03-02T02:28:33+00:00 add unit test +ca14d024105553724722ba44d9b30f4f6e2e5fa5 2023-03-02T02:28:32+00:00 fix 116028 +fa67514717bd8ab66be9dd35de66b54e07d5168c 2023-02-28T17:11:26-03:00 Re-enable label selector +557582e467fa64bd468f793e3ba4645feb436fee 2023-02-28T17:11:26-03:00 Add integration test for diff --prune --selector +92fff2577a08b0db131193a63b7d5903b75d2d4c 2023-02-28T17:11:24-03:00 Use label selector for filtering out resources when pruning. Matches same behavior as for kubectl apply +33c239a372de8fae329ddc898c431621549bc355 2023-02-24T20:21:38+01:00 scheduler/framework/plugins/volumebinding: fix inaccurate log for when a volume is bound to a claim +1f40263f4f1b1a28e69172e9b364e6ec0af70751 2023-02-22T14:59:51+00:00 Update CHANGELOG/CHANGELOG-1.25.md for v1.25.7 +0dd0c702133d51d69d0e6ed019820eeaecb1242f 2023-02-22T13:56:51+00:00 Release commit for Kubernetes v1.25.8-rc.0 +05844c82d10b2b735fba485a8fc32a53a3678a30 2023-02-14T17:47:25+00:00 Remove check for CSI driver running on node for CSI migration attach operations +792b44dfe04e1b832ed7959ac7d84d6e04235b52 2023-02-13T21:31:10-05:00 Simplify construction of /metrics request +02d8672f8f8b2c4d0c5e7b9e902f2fee733001e9 2023-02-10T09:57:24-07:00 test: remove flaky pod update test in CSIInlineVolumes e2e +8f09151d9c11b0219450ca8160fb770512fe68e5 2023-02-09T10:47:54-08:00 Move CSI json file saving to SetUpAt() +9be591d06a0a7da0100401deea1e39be18f171d6 2023-02-08T16:49:10+05:30 Fix for issue with Loadbalancer policy creation for IPV6 endpoints in Dualstack mode. +029bde8d3d2111d05c72b26f31779e43f0082254 2023-02-03T00:03:49-05:00 Invoke gimme from kube::golang::verify_go_version +8b8eee429c84938f17d9d6ed4c1c604810020a6f 2023-02-03T00:03:49-05:00 Add gimme +441276ceb06eb5804256ab8331e10da8b46c2f1e 2023-02-03T00:03:48-05:00 Defer builds to test-cmd and test-integration targets +514352be24319a5825de8ed23940beaf83cc04c4 2023-01-30T15:38:00-05:00 Carefully compute request path for metrics diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 46bfe690aa..12d7638a4a 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,14 +1,14 @@ https://github.com/openshift/cluster-dns-operator embedded-component 1c136fe38b8cd5c0de99577d23157f884728d20b https://github.com/openshift/cluster-ingress-operator embedded-component 992b43b3cf3e1784bfe8d3083229c7ecb410e7e3 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 2076f3d0e4fea6fca54028ec7831407173ea81f5 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b108134de5b1c7ef179fc523ffd62bc5898106a3 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 1c2157df6e9031bf6abb9250d2bec901608fe5b4 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 845ae423e831b1cacf0bcae5e6528f1d21b5ddf2 -https://github.com/openshift/cluster-network-operator embedded-component 6878a2cec16309dcd96aaf03ae0d7db8f37d3cde +https://github.com/openshift/cluster-network-operator embedded-component 529ff4a694ff0f4598d5763b20f78fe44cd14f22 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component d1915d130481541b8bacb5b98eddbc1541809d0a https://github.com/openshift/cluster-policy-controller embedded-component 139ac0499ac4d744023827ceb6d16aa6b467be27 https://github.com/openshift/etcd embedded-component c1d76ffd4b4cf0a0d2a6056a505fbef0b187c027 -https://github.com/openshift/kubernetes embedded-component eab9cc98fe4c002916621ace6cdd623afa519203 -https://github.com/openshift/machine-config-operator embedded-component e8291b07876fd93fad5ef8c09b9f47621186cb17 +https://github.com/openshift/kubernetes embedded-component db63dbe4698bd34bab98717093af4f5424482286 +https://github.com/openshift/machine-config-operator embedded-component 5c2ff4ba47b3114b9116fe87a1ba81ae45e73c7d https://github.com/openshift/openshift-controller-manager embedded-component b6528f9ea28164af9f1ceea0e50f18116fe3c90e https://github.com/openshift/route-controller-manager embedded-component 9e74d175e81ef6a2beb3718398e3fc99dded037c https://github.com/openshift/service-ca-operator embedded-component 299b7097a49385fdd4f86eccedc07f3a192e2504 @@ -20,8 +20,8 @@ https://github.com/openshift/csi-livenessprobe image-amd64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-amd64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-amd64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-amd64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-amd64 ffce71cb9cc045517288ed0f28a5d25c059d2438 -https://github.com/openshift/kubernetes image-amd64 eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/ovn-kubernetes image-amd64 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +https://github.com/openshift/kubernetes image-amd64 db63dbe4698bd34bab98717093af4f5424482286 https://github.com/openshift/service-ca-operator image-amd64 299b7097a49385fdd4f86eccedc07f3a192e2504 https://github.com/openshift/oc image-arm64 31aa3e89a926f81aa0af30320ffcb71acadf3015 https://github.com/openshift/coredns image-arm64 9aaa7e0a86b69bafb9f544a0e5cb1873535a8f6b @@ -31,6 +31,6 @@ https://github.com/openshift/csi-livenessprobe image-arm64 720e1d6e3e828dec99080 https://github.com/openshift/csi-node-driver-registrar image-arm64 805d5ac247137b02e6081e3eb7aa1fb9f4c7b4b2 https://github.com/openshift/router image-arm64 3065f6583f3925328fbdbfe95e3bc7bb7a084d33 https://github.com/openshift/kube-rbac-proxy image-arm64 513fd32175af4bb03f2e8a31030477e63380b5bc -https://github.com/openshift/ovn-kubernetes image-arm64 ffce71cb9cc045517288ed0f28a5d25c059d2438 -https://github.com/openshift/kubernetes image-arm64 eab9cc98fe4c002916621ace6cdd623afa519203 +https://github.com/openshift/ovn-kubernetes image-arm64 3780f16d8e9c3a5495ba3b1caff3bc53070f6bb6 +https://github.com/openshift/kubernetes image-arm64 db63dbe4698bd34bab98717093af4f5424482286 https://github.com/openshift/service-ca-operator image-arm64 299b7097a49385fdd4f86eccedc07f3a192e2504 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 8f441c27e9..267904f010 100755 --- a/scripts/auto-rebase/last_rebase.sh +++ b/scripts/auto-rebase/last_rebase.sh @@ -1,2 +1,2 @@ #!/bin/bash -x -./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-03-132047" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-03-30-084912" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.12.0-0.nightly-2023-04-06-213528" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.12.0-0.nightly-arm64-2023-04-06-213526"