diff --git a/etcd/go.mod b/etcd/go.mod index 549317ebc3..ffaa0ae06f 100644 --- a/etcd/go.mod +++ b/etcd/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/microshift/etcd -go 1.20 +go 1.21 require github.com/openshift/microshift v0.0.0 @@ -82,6 +82,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/openshift/cluster-policy-controller cc48f3152213bfe6e42fdd82f760246e862d208f github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_golang v1.16.0 // indirect diff --git a/go.mod b/go.mod index 9961057141..c79b9d3549 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.4 github.com/vishvananda/netlink v1.1.0 - go.etcd.io/etcd/client/pkg/v3 v3.5.12 + go.etcd.io/etcd/client/pkg/v3 v3.5.13 go.etcd.io/etcd/client/v3 v3.5.9 golang.org/x/sys v0.15.0 gopkg.in/yaml.v3 v3.0.1 @@ -172,7 +172,7 @@ require ( github.com/vishvananda/netns v0.0.4 // indirect github.com/vmware/govmomi v0.30.6 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.etcd.io/etcd/api/v3 v3.5.12 // indirect + go.etcd.io/etcd/api/v3 v3.5.13 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect @@ -237,44 +237,44 @@ require ( replace ( github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes - k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes - k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240405160812-6b4a380c8104 // release kubernetes - k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240405160812-6b4a380c8104 // from kubernetes - k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240405160812-6b4a380c8104 // from kubernetes + k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240411183121-897457758819 // staging kubernetes + k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20240411183121-897457758819 // release kubernetes + k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20240411183121-897457758819 // from kubernetes + k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20240411183121-897457758819 // from kubernetes ) replace ( - go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd - go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd - go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b // from etcd + go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20240408141336-23e5492c2e17 // from etcd + go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408141336-23e5492c2e17 // from etcd + go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20240408141336-23e5492c2e17 // from etcd ) replace sigs.k8s.io/kube-storage-version-migrator => github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 // release kube-storage-version-migrator via kubernetes-kube-storage-version-migrator -replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240405160812-6b4a380c8104 // staging kubernetes +replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240411183121-897457758819 // staging kubernetes diff --git a/go.sum b/go.sum index 20560b080d..deae957250 100644 --- a/go.sum +++ b/go.sum @@ -525,66 +525,66 @@ github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6 h1:3wgEtuYbZ76 github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6/go.mod h1:Fkn7VRruQ4KwNGeaUmi9QgqLk/d7U6cj+UiP8b+0hiQ= github.com/openshift/cluster-policy-controller v0.0.0-20231201224824-cc48f3152213 h1:oV0O1oVn+VrLfbPmptULih4O6kXP33hYF/cL4OWR61w= github.com/openshift/cluster-policy-controller v0.0.0-20231201224824-cc48f3152213/go.mod h1:u9xZD1sX2QlaItGQca+2cB10z0yL+BZ+KscZBj+NUZs= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:zdd9Jt2yalNhYR8knTolghXg4F9Dunjs7229KIl4zyU= -github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:Ot+o0SWSyT6uHhA56al1oCED0JImsRiU9Dc26+C2a+4= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:2c68ooDs1tI78FHtzWXidIEE8ymnkJctYEheSYVSvZQ= -github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:seTzl2d9APP8R5Y2hFL3NVlD6qC/dOT+3kvrqPyTas4= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b h1:A/hePFQbZeTcaSAtSu8ifOIX/KdDT9W4aifIP/FpTs0= -github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b/go.mod h1:tSbBCakoWmmddL+BKVAJHa9km+O/E+bumDe9mSbPiqw= -github.com/openshift/kubernetes v0.0.0-20240405160812-6b4a380c8104 h1:JRPLYhXJuukcbYiSvftvcwryMMnZd9qb2lhT39KnvLI= -github.com/openshift/kubernetes v0.0.0-20240405160812-6b4a380c8104/go.mod h1:65u2CEHCxS1I1yzTBPCaUPicdY9U9Gsrq7gqfxf8rZk= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240408141336-23e5492c2e17 h1:C9VO39RedPk6tQtFmlCkOVyhhIqjIZPvbiCyleTDTjQ= +github.com/openshift/etcd/api/v3 v3.5.1-0.20240408141336-23e5492c2e17/go.mod h1:gBqlqkcMMZMVTMm4NDZloEVJzxQOQIls8splbqBDa0c= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408141336-23e5492c2e17 h1:xvrlmyl4xou59Il1+Yj4V77Fz0FOFWi/kHTOO3R0hzY= +github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408141336-23e5492c2e17/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240408141336-23e5492c2e17 h1:qqqUUlJlOpfBY1byIb+AE3ud0Pe+Qw7bbJBHAzR/HHA= +github.com/openshift/etcd/client/v3 v3.5.1-0.20240408141336-23e5492c2e17/go.mod h1:cqiAeY8b5DEEcpxvgWKsbLIWNM/8Wy2xJSDMtioMcoI= +github.com/openshift/kubernetes v0.0.0-20240411183121-897457758819 h1:THBGD6SXPeE1AfL5LrxKQ0cZ7XEyVP43lWegJ6pjzJo= +github.com/openshift/kubernetes v0.0.0-20240411183121-897457758819/go.mod h1:65u2CEHCxS1I1yzTBPCaUPicdY9U9Gsrq7gqfxf8rZk= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 h1:dFt4v5LeBJ4Ohf9oaZ5tce37PPGAeZ4sdbDIeW3R2qo= github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8/go.mod h1:nc9vh1Bd8i4OnTM+uoZeFbRaJJ9uOs1AzaN69SdVnd8= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240405160812-6b4a380c8104 h1:MQh/xwSafkRKvp7ZfyP5OM/EaWdDelfmsMdHBh098pw= -github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240405160812-6b4a380c8104/go.mod h1:OQqu1RLWBsFXxYxub14/ltGiEBUu4M2AU0wC2Ma5mKk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240405160812-6b4a380c8104 h1:0P/3RdeLc0XDAaHhgKtcjitRiGAH0dVp7nQXdvzwopA= -github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240405160812-6b4a380c8104/go.mod h1:va/EkJ18udgi1XpNFBQ1KGOxyGNW6yamAjwk1M5BskE= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240405160812-6b4a380c8104 h1:w87PY/u/BPPvVbsPWTKlbD2l1A2rrlS38/rIIDHFCgc= -github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240405160812-6b4a380c8104/go.mod h1:A5+AwLnVEfW28m3l3IZC1UjeSFDg9GzHIhjv20oshqM= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240405160812-6b4a380c8104 h1:B0ld86ZGTsc3lKN8AjadKgBlnl6TTLBco1KW4i8QSSk= -github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240405160812-6b4a380c8104/go.mod h1:8zQp2lxObjryaHbfnj+hWCPZkrKUpg/ATx0QXb3g/1Q= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240405160812-6b4a380c8104 h1:9RzN0/9kVs8vh2k7WPxVDg9TS3uZLoeGPBhhFkADrQQ= -github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240405160812-6b4a380c8104/go.mod h1:yHZtIWHmUTlVik+SnMeQu/dw5/jSLPuNZAhAUm/iNoc= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240405160812-6b4a380c8104 h1:ElR2o7ZhG2kHO0JoLwEo+IksdQ/onjuBNmB3pc9lCEg= -github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240405160812-6b4a380c8104/go.mod h1:rtTyNN2l1iOC7kW5r34UOkQ3S1bkLcmyqiwb2aBCpXU= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240405160812-6b4a380c8104 h1:xN1ALwF4GXF7i1iTqepX6JI67OjZvfQptqofGdHOoUc= -github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240405160812-6b4a380c8104/go.mod h1:UXTggMei+33OeYEDywqy5w94u7hQPTYuB+KsI1418m4= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240405160812-6b4a380c8104 h1:FTS2dcXONybD1URyruvspzmbvEpwkD0AO211IhUhyZY= -github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240405160812-6b4a380c8104/go.mod h1:0k7c+iz02zT9BGIRlAsyOWlGAE8w7VijnqfObwXnQ9s= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240405160812-6b4a380c8104 h1:kdVSuhLwy7/UAx0WYpOMp6cj4EsmhHDWEsLoIh2ib0k= -github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240405160812-6b4a380c8104/go.mod h1:Lhf5r4uNE62gntiCSY1eVmiZ87m9W21wFz+MJ+9h3is= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240405160812-6b4a380c8104 h1:yGx8rXrq1VJNaYNE/PpIQSPf5FIytfTa0LAiEmohmAA= -github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240405160812-6b4a380c8104/go.mod h1:+/TzDyJWXy4gop9M/qFXLev70ajxSCnQd69V6/QyPDA= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240405160812-6b4a380c8104 h1:c5uSzvr4vFLquqIOfUWW0LETudt4z5H40RmSc5M/aXY= -github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240405160812-6b4a380c8104/go.mod h1:eu/NQJbdNO/OlvcB8Aea9jCp0FEAqE9oszRowpk/YMY= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240405160812-6b4a380c8104 h1:jVWpE0V9oK+xR4bKTnZBHQpqhepXW4YxtZmSGSwfIpo= -github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240405160812-6b4a380c8104/go.mod h1:EIUd8zvvZOOcVveedwlT91gSnP+mpg5LvzYYzuITmKM= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240405160812-6b4a380c8104 h1:hwjyUh0YZnBP2lxXc43xdgPhhOFsEsF+CGnoTCdMBZg= -github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240405160812-6b4a380c8104/go.mod h1:aGKFQMlfnq/9FDN5cH08F926YFcurxiI4CPM7HeY4mM= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240405160812-6b4a380c8104 h1:yEpE3Z1ciG3Fh6/ueqxOIbvieKM92BHSfKjPtZ5FhBk= -github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240405160812-6b4a380c8104/go.mod h1:wB9LnoIw1saNm5IPrIwHO92GaOC6ADwxQb5BddGSX4s= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240405160812-6b4a380c8104 h1:BRwVAUYN7Z4t7Gb/z8iT8rLoVRCCoScE0GqA/Hv481M= -github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240405160812-6b4a380c8104/go.mod h1:Nm50Zdb0Q+75XdK6QIe+tyEDOWHpwaoxG1TdnbXnZ+I= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240405160812-6b4a380c8104 h1:rc+KZTc0Z9fx4pOOlRF9BSQYxBfy9j22CMS1M/a+bMo= -github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240405160812-6b4a380c8104/go.mod h1:TuUHnE1xN6pHB2LMcLG6fCorxZSAgt6HdUPIrxU/w9E= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240405160812-6b4a380c8104 h1:h44QRiSoFZuJHwGLi0bMmgQNBaxv5XISp2IduF6D3cA= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240405160812-6b4a380c8104/go.mod h1:XzMUZ4y2i34IMwsYzPxvezpaZVinjq3uGCnL3IZz12w= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240405160812-6b4a380c8104 h1:KlJFeNDTYg71SlkrZBjvniYSCePF04C24vjGp6Jk/9A= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240405160812-6b4a380c8104/go.mod h1:WiyR7ctK1sPkvP16D3U1zUTkjwrfMIEf8jr8ZXei9SI= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240405160812-6b4a380c8104 h1:Tnr/MQEGZIGa43XQDm5/WVOmIImr3s0GtCWv/cdKdCU= -github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240405160812-6b4a380c8104/go.mod h1:Ngtqa/sowx3/jlY1X9zoZpeyERVamEEccOhvwLY3fAg= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240405160812-6b4a380c8104 h1:Yr6d+vfP4l5m8i2AY8KD2eTxcZDa7aKqesk3F1l3PTI= -github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240405160812-6b4a380c8104/go.mod h1:rbgZK93TrV5Z36l854T8x7YVDc08xpZGEBlMg8Hhb7w= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240405160812-6b4a380c8104 h1:Q2EkLCaqHkUh5imziyXVJlXdwLu2JmvOn0GsIhRjw/0= -github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240405160812-6b4a380c8104/go.mod h1:+qn8tBFDaRugXNZD3AEZKMkb/k6e5gHuthBTKisMxTg= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240405160812-6b4a380c8104 h1:87jHrlEOgTfNn7D8ARXW01THcdwKUdyQeOnb5fY9QtY= -github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240405160812-6b4a380c8104/go.mod h1:RWFWeGDPm1WTPK0u9/m7s4CMT8TlIHXtfRZt0XXjJtI= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240405160812-6b4a380c8104 h1:a4FykKkWNiW7NTk+mxwfuxaMkN2vDNraII0fuycWpMk= -github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240405160812-6b4a380c8104/go.mod h1:5SmE64aphwd4AyqlOqUU5xRHuyBAGB+0bZo2I9AuLOU= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240405160812-6b4a380c8104 h1:uXKbIPx4I3D1od8JgHZzMJ5Barkku2pAp2ZXmbxJhoY= -github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240405160812-6b4a380c8104/go.mod h1:RM2SGu9Hi4rZtX4j7MH4fz75mOtl5d9pGyC4NahYrHo= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240405160812-6b4a380c8104 h1:p9YZ7FlzMVfq7ZDjYgCVUPYwj3zqqSomaC8Vm+qT61Y= -github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240405160812-6b4a380c8104/go.mod h1:R2qBVneOqCcHdrfsOHUYZFjirIN8ZYIrCvPa34IzdgA= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240411183121-897457758819 h1:le8LsKkw4PrRLmQj096l02airIoX8ZdesH2QJd/5mpY= +github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240411183121-897457758819/go.mod h1:OQqu1RLWBsFXxYxub14/ltGiEBUu4M2AU0wC2Ma5mKk= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240411183121-897457758819 h1:GyzioeCJr47QymFXF2Kv4bKz8HTJR/4rolZ1prJwaZo= +github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240411183121-897457758819/go.mod h1:va/EkJ18udgi1XpNFBQ1KGOxyGNW6yamAjwk1M5BskE= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240411183121-897457758819 h1:0GPCrIn8HKy9duBw0ZDbYv92NUNyKuHayZ0IAiWKB/g= +github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240411183121-897457758819/go.mod h1:A5+AwLnVEfW28m3l3IZC1UjeSFDg9GzHIhjv20oshqM= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240411183121-897457758819 h1:K6ms+SbVc+AYFWVRfUJEwYbuY8/i+A9+4twaIWklApg= +github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240411183121-897457758819/go.mod h1:8zQp2lxObjryaHbfnj+hWCPZkrKUpg/ATx0QXb3g/1Q= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240411183121-897457758819 h1:6RRzmXJE2zZEW1oQR1DncLEfFxpL7i459aLunZdvsQA= +github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240411183121-897457758819/go.mod h1:yHZtIWHmUTlVik+SnMeQu/dw5/jSLPuNZAhAUm/iNoc= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240411183121-897457758819 h1:/XXSPzOcqa5Nb/MyI2zZ9LjNeCGT/njcvoKs8slHt5s= +github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240411183121-897457758819/go.mod h1:rtTyNN2l1iOC7kW5r34UOkQ3S1bkLcmyqiwb2aBCpXU= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240411183121-897457758819 h1:7Cl1KAXznENoMcvrxCu3T2Kd1NHXHXiyVjHAuRpbc44= +github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240411183121-897457758819/go.mod h1:UXTggMei+33OeYEDywqy5w94u7hQPTYuB+KsI1418m4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240411183121-897457758819 h1:h5N4vf/Xp9U7Oe3n36JgaVu3aWDtO/P9a+84icKIoH4= +github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240411183121-897457758819/go.mod h1:0k7c+iz02zT9BGIRlAsyOWlGAE8w7VijnqfObwXnQ9s= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240411183121-897457758819 h1:4pw3luxLjOEQDUh1sL2EndFbrvIuUBxnRcR/FbMmeBY= +github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240411183121-897457758819/go.mod h1:Lhf5r4uNE62gntiCSY1eVmiZ87m9W21wFz+MJ+9h3is= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240411183121-897457758819 h1:bwp/ljjGdPBmtrnzEIafRiiiNvOKn8ldUMrvfJJ0Cgg= +github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240411183121-897457758819/go.mod h1:+/TzDyJWXy4gop9M/qFXLev70ajxSCnQd69V6/QyPDA= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240411183121-897457758819 h1:xbrwp8kqRFj00LIE2KV72ufF1g3Lw4TftXK4KBGmpSY= +github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240411183121-897457758819/go.mod h1:eu/NQJbdNO/OlvcB8Aea9jCp0FEAqE9oszRowpk/YMY= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240411183121-897457758819 h1:LWpeNPBYYUAsD4z6se7mcBRqN41WbzqzW2iZl+34d2A= +github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240411183121-897457758819/go.mod h1:EIUd8zvvZOOcVveedwlT91gSnP+mpg5LvzYYzuITmKM= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240411183121-897457758819 h1:8xF7yEBypM/MA2Lw7rGIZSiEWH2kS9+5Te9ma4bmkJc= +github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240411183121-897457758819/go.mod h1:aGKFQMlfnq/9FDN5cH08F926YFcurxiI4CPM7HeY4mM= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240411183121-897457758819 h1:GVSs4GRUZXNy0u4aBZRMUJ8lMezLBxMlXvXS+mcbg/s= +github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240411183121-897457758819/go.mod h1:wB9LnoIw1saNm5IPrIwHO92GaOC6ADwxQb5BddGSX4s= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240411183121-897457758819 h1:BJVxGWQ/O6jvwP/UaDLxRuyuDceWKwbMrU2e4RVM/hg= +github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240411183121-897457758819/go.mod h1:Nm50Zdb0Q+75XdK6QIe+tyEDOWHpwaoxG1TdnbXnZ+I= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240411183121-897457758819 h1:bBTVUrLLdFC5s7r9KAU1rdBu/2aoK2GjwX7DkyvR6Wo= +github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240411183121-897457758819/go.mod h1:TuUHnE1xN6pHB2LMcLG6fCorxZSAgt6HdUPIrxU/w9E= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240411183121-897457758819 h1:CjSF1lOONbvpOVLQ5LUnSFIwZE9+DlT5cFUBHBzi04o= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240411183121-897457758819/go.mod h1:XzMUZ4y2i34IMwsYzPxvezpaZVinjq3uGCnL3IZz12w= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240411183121-897457758819 h1:/9JZtWpC1ECbFkrVNZEkQBMc+vgmqG/4f+g7BPzBXWQ= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240411183121-897457758819/go.mod h1:WiyR7ctK1sPkvP16D3U1zUTkjwrfMIEf8jr8ZXei9SI= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240411183121-897457758819 h1:FmvegmHtHw6/iF9fGuuOlM8OrQpIh53Mx4dCmBo5nV0= +github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240411183121-897457758819/go.mod h1:Ngtqa/sowx3/jlY1X9zoZpeyERVamEEccOhvwLY3fAg= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240411183121-897457758819 h1:JG3d13XdtGITJsa399iUFrBN6JzEH0mJNfBdjGxIQwY= +github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240411183121-897457758819/go.mod h1:rbgZK93TrV5Z36l854T8x7YVDc08xpZGEBlMg8Hhb7w= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240411183121-897457758819 h1:BYoQcdGEJDSlQTWk507cD/0qwtFHynrRWqz1XElvtKE= +github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240411183121-897457758819/go.mod h1:+qn8tBFDaRugXNZD3AEZKMkb/k6e5gHuthBTKisMxTg= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240411183121-897457758819 h1:m5v9obZI5NEJeOtcebewNxfY3X9Fym0rSwnZWKlKX/c= +github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240411183121-897457758819/go.mod h1:RWFWeGDPm1WTPK0u9/m7s4CMT8TlIHXtfRZt0XXjJtI= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240411183121-897457758819 h1:H808VbVPFqEZqMpiqndSzWxn+kj9evEA6o+4X/KfmYw= +github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240411183121-897457758819/go.mod h1:5SmE64aphwd4AyqlOqUU5xRHuyBAGB+0bZo2I9AuLOU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240411183121-897457758819 h1:8/7eypR6gF003x66wvv3uLg2M/cc+UokK9fhS9pVXhU= +github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240411183121-897457758819/go.mod h1:RM2SGu9Hi4rZtX4j7MH4fz75mOtl5d9pGyC4NahYrHo= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240411183121-897457758819 h1:VUgUF6ZaeDfuBvymOwcBpdw08Oy4Az/fSruXElTMwJA= +github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240411183121-897457758819/go.mod h1:R2qBVneOqCcHdrfsOHUYZFjirIN8ZYIrCvPa34IzdgA= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 h1:pJLcCSJzdiWCaJ4bAepgnvwMdP33LumbVJyWSW7+3ng= github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7/go.mod h1:jgxNp8aApJnZtECid9SUSr5Bu6DLo8Hfdv1DgFZaYA8= github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e h1:WgaylNSIB4uff7ieewaqIiEG3mP6jSMER8LCkoOEkys= diff --git a/rebase_sh.log b/rebase_sh.log new file mode 100644 index 0000000000..7cd95c3218 --- /dev/null +++ b/rebase_sh.log @@ -0,0 +1,546 @@ +# Rebasing to registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-21-021546 +# Fetching release info for registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624 (amd64) +# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-21-021546 (arm64) +# Extracting registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624 manifest content +# Cloning registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624 component repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/ +HEAD is now at 87d7080 Merge pull request #203 from dobsonj/OCPBUGS-31497-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/ +HEAD is now at 49290d7 Merge pull request #407 from arkadeepsen/ocpbugs-32093 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/ +HEAD is now at 0106cb9 Merge pull request #1022 from sadasu/custom-dns-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/ +HEAD is now at f5c5a60 Merge pull request #1662 from tkashem/secret-hack-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/ +HEAD is now at ee8cf52 Merge pull request #801 from p0lyn0mial/release-4.15-pick-library-go-1705 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/ +HEAD is now at f054dfa Merge pull request #537 from ingvagabund/bump-library-go-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/ +HEAD is now at a62442b Merge pull request #2314 from kyrtapz/roks_net_id_4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/ +HEAD is now at e9845aa Merge pull request #322 from openshift-cherrypick-robot/cherry-pick-320-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/ +HEAD is now at cc48f31 Merge pull request #143 from openshift-bot/art-consistency-openshift-4.15-cluster-policy-controller + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/ +HEAD is now at 4f2955c Merge pull request #147 from dobsonj/OCPBUGS-31599 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/ +HEAD is now at 23e5492c Merge pull request #260 from Elbehery/rebase-etcd-3.5.13-openshift-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/ +HEAD is now at 897457758 Merge pull request #1897 from openshift-cherrypick-robot/cherry-pick-1787-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/ +HEAD is now at e874968 Merge pull request #201 from openshift-bot/art-consistency-openshift-4.15-ose-kube-storage-version-migrator + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/ +HEAD is now at 6e28938b Merge pull request #4311 from MarSik/cherry-pick-4124-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/ +HEAD is now at edbf735 Merge pull request #281 from openshift-bot/art-consistency-openshift-4.15-ose-openshift-controller-manager + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/ +HEAD is now at f6374fbc Merge pull request #736 from kevinrizza/alreadyexists-fix-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/ +HEAD is now at c5cc7a7 Merge pull request #35 from rfredette/ocpbugs-15253-ingress-alerts + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/ +HEAD is now at f5972cc Merge pull request #226 from openshift-bot/art-consistency-openshift-4.15-ose-service-ca-operator + +# Cloning registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624 image repos +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/ +HEAD is now at 62c4d45a Merge pull request #1698 from openshift-cherrypick-robot/cherry-pick-1680-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/ +HEAD is now at 22f950e Merge pull request #110 from openshift-cherrypick-robot/cherry-pick-109-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/ +HEAD is now at 4f2955c Merge pull request #147 from dobsonj/OCPBUGS-31599 + + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/ +HEAD is now at 397ff2f Merge pull request #579 from openshift-cherrypick-robot/cherry-pick-573-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/ +HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2 + +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 feca446 Merge pull request #2094 from arghosh93/SDN-4544 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/ +HEAD is now at 897457758 Merge pull request #1897 from openshift-cherrypick-robot/cherry-pick-1787-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/ +HEAD is now at f5972cc Merge pull request #226 from openshift-bot/art-consistency-openshift-4.15-ose-service-ca-operator + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/ +HEAD is now at 62c4d45a Merge pull request #1698 from openshift-cherrypick-robot/cherry-pick-1680-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/ +HEAD is now at 22f950e Merge pull request #110 from openshift-cherrypick-robot/cherry-pick-109-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/ +HEAD is now at 4f2955c Merge pull request #147 from dobsonj/OCPBUGS-31599 + + + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/ +HEAD is now at 397ff2f Merge pull request #579 from openshift-cherrypick-robot/cherry-pick-573-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/ +HEAD is now at e8e8c84 Merge pull request #80 from ibihim/CVE-2023-44487-trimming-http2 + +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 feca446 Merge pull request #2094 from arghosh93/SDN-4544 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/ +HEAD is now at 897457758 Merge pull request #1897 from openshift-cherrypick-robot/cherry-pick-1787-to-release-4.15 + +Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/ +HEAD is now at f5972cc Merge pull request #226 from openshift-bot/art-consistency-openshift-4.15-ose-service-ca-operator + +topolvm_csi not from release payload, skipping + +topolvm_csi_livenessprobe not from release payload, skipping + +topolvm_csi_provisioner not from release payload, skipping + +topolvm_csi_registrar not from release payload, skipping + +topolvm_csi_resizer not from release payload, skipping + +Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch. +error: branch 'rebase-release-4.15-4.15.0-0.nightly-2024-04-21-051624_amd64-2024-04-21_arm64-2024-04-21' not found. +Switched to a new branch 'rebase-release-4.15-4.15.0-0.nightly-2024-04-21-051624_amd64-2024-04-21_arm64-2024-04-21' +## Updating last_rebase.sh +## Committing changes to last_rebase.sh +[rebase-release-4.15-4.15.0-0.nightly-2024-04-21-051624_amd64-2024-04-21_arm64-2024-04-21 5166e3d2f] update last_rebase.sh + 1 file changed, 1 insertion(+), 1 deletion(-) +cluster-ingress-operator embedded-component no change + +cluster-network-operator embedded-component no change + +cluster-policy-controller embedded-component no change + +csi-external-snapshotter embedded-component no change + +kubernetes-kube-storage-version-migrator 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-snapshotter image-amd64 no change + +csi-external-snapshotter image-amd64 no change + +csi-external-snapshotter 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 + +kube-rbac-proxy image-arm64 no change + +service-ca-operator image-arm64 no change + +## Committing changes to changelog +[rebase-release-4.15-4.15.0-0.nightly-2024-04-21-051624_amd64-2024-04-21_arm64-2024-04-21 3e4c5a34c] update changelog + 2 files changed, 123 insertions(+), 56 deletions(-) +# Updating microshift/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@cc48f3152213bfe6e42fdd82f760246e862d208f +go: downloading github.com/openshift/library-go v0.0.0-20231017173800-126f85ed0cc7 +go: downloading github.com/openshift/client-go v0.0.0-20231018150822-6e226e2825a6 +go: downloading github.com/openshift/api v0.0.0-20231018090736-41ecc021ff27 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240405160812-6b4a380c8104 +go: downloading k8s.io/klog/v2 v2.100.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240405160812-6b4a380c8104 +go: downloading sigs.k8s.io/yaml v1.3.0 +go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e +go: downloading github.com/spf13/cobra v1.7.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/spf13/pflag v1.0.5 +go: downloading gopkg.in/yaml.v3 v3.0.1 +go: downloading github.com/stretchr/testify v1.8.4 +go: downloading github.com/apparentlymart/go-cidr v1.1.0 +go: downloading sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/miekg/dns v1.1.35 +go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20231201224824-cc48f3152213 +go: downloading github.com/openshift/route-controller-manager v0.0.0-20231025213326-c5cc7a73705e +go: downloading github.com/vishvananda/netlink v1.1.0 +go: downloading golang.org/x/sys v0.15.0 +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240314173502-8aecb841e30b +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20240314173502-8aecb841e30b +go: downloading k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 +go: downloading github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20240104155603-e8749689edb8 +go: downloading github.com/google/go-cmp v0.5.9 +go: downloading github.com/openshift/build-machinery-go v0.0.0-20230824093055-6a18da01283c +go: downloading k8s.io/utils v0.0.0-20230726121419-3b25d923346b +go: downloading github.com/evanphx/json-patch v4.12.0+incompatible +go: downloading github.com/davecgh/go-spew v1.1.1 +go: downloading github.com/ghodss/yaml v1.0.0 +go: downloading github.com/gogo/protobuf v1.3.2 +go: downloading github.com/google/gofuzz v1.2.0 +go: downloading sigs.k8s.io/structured-merge-diff/v4 v4.3.0 +go: downloading github.com/imdario/mergo v0.3.11 +go: downloading golang.org/x/term v0.15.0 +go: downloading golang.org/x/net v0.19.0 +go: downloading gopkg.in/yaml.v2 v2.4.0 +go: downloading github.com/go-logr/logr v1.2.4 +go: downloading github.com/inconshreveable/mousetrap v1.1.0 +go: downloading sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd +go: downloading github.com/pmezard/go-difflib v1.0.0 +go: downloading golang.org/x/time v0.3.0 +go: downloading github.com/google/uuid v1.3.1 +go: downloading sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 +go: downloading golang.org/x/crypto v0.16.0 +go: downloading golang.org/x/sync v0.5.0 +go: downloading github.com/vishvananda/netns v0.0.4 +go: downloading github.com/jonboulle/clockwork v0.2.2 +go: downloading github.com/pkg/errors v0.9.1 +go: downloading github.com/MakeNowJust/heredoc v1.0.0 +go: downloading github.com/mitchellh/go-wordwrap v1.0.1 +go: downloading github.com/russross/blackfriday/v2 v2.1.0 +go: downloading go.uber.org/zap v1.19.0 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20240314173502-8aecb841e30b +go: downloading google.golang.org/grpc v1.59.0 +go: downloading go.opentelemetry.io/otel/trace v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/coreos/go-systemd/v22 v22.5.0 +go: downloading github.com/google/cadvisor v0.47.3 +go: downloading github.com/opencontainers/runc v1.1.9 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.10.0 +go: downloading go.opentelemetry.io/otel v1.10.0 +go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 +go: downloading go.opentelemetry.io/otel/sdk v1.10.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240405160812-6b4a380c8104 +go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/fsnotify/fsnotify v1.6.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240405160812-6b4a380c8104 +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_golang v1.16.0 +go: downloading github.com/prometheus/client_model v0.4.0 +go: downloading github.com/blang/semver v3.5.1+incompatible +go: downloading github.com/prometheus/procfs v0.10.1 +go: downloading github.com/prometheus/common v0.44.0 +go: downloading gopkg.in/inf.v0 v0.9.1 +go: downloading github.com/golang/protobuf v1.5.4 +go: downloading github.com/google/gnostic-models v0.6.8 +go: downloading google.golang.org/protobuf v1.33.0 +go: downloading golang.org/x/oauth2 v0.11.0 +go: downloading github.com/json-iterator/go v1.1.12 +go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de +go: downloading golang.org/x/text v0.14.0 +go: downloading github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 +go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible +go: downloading github.com/pkg/profile v1.3.0 +go: downloading github.com/sirupsen/logrus v1.9.0 +go: downloading github.com/emicklei/go-restful/v3 v3.9.0 +go: downloading go.uber.org/atomic v1.10.0 +go: downloading github.com/chai2010/gettext-go v1.0.2 +go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e +go: downloading github.com/onsi/gomega v1.27.6 +go: downloading github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d +go: downloading github.com/moby/term v0.0.0-20221205130635-1aeaba878587 +go: downloading go.uber.org/multierr v1.11.0 +go: downloading go.uber.org/goleak v1.2.1 +go: downloading github.com/benbjohnson/clock v1.1.0 +go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d +go: downloading github.com/coreos/go-semver v0.3.1 +go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d +go: downloading google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d +go: downloading gopkg.in/natefinch/lumberjack.v2 v2.2.1 +go: downloading gopkg.in/square/go-jose.v2 v2.6.0 +go: downloading go.etcd.io/etcd/server/v3 v3.5.9 +go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 +go: downloading go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 +go: downloading github.com/onsi/ginkgo v1.16.5 +go: downloading go.opentelemetry.io/proto/otlp v0.19.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/Azure/azure-sdk-for-go v68.0.0+incompatible +go: downloading github.com/Azure/go-autorest/autorest/adal v0.9.23 +go: downloading github.com/Azure/go-autorest/autorest v0.11.29 +go: downloading github.com/Azure/go-autorest v14.2.0+incompatible +go: downloading github.com/cyphar/filepath-securejoin v0.2.4 +go: downloading github.com/opencontainers/selinux v1.10.0 +go: downloading github.com/golang/mock v1.6.0 +go: downloading github.com/docker/go-units v0.5.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.35.0 +go: downloading github.com/Microsoft/go-winio v0.6.0 +go: downloading github.com/container-storage-interface/spec v1.8.0 +go: downloading github.com/libopenstorage/openstorage v1.0.0 +go: downloading github.com/moby/sys/mountinfo v0.6.2 +go: downloading github.com/kr/pretty v0.3.1 +go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 +go: downloading github.com/openshift/apiserver-library-go v0.0.0-20230927115548-521857444d9a +go: downloading github.com/google/cel-go v0.16.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/robfig/cron/v3 v3.0.1 +go: downloading github.com/robfig/cron v1.2.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/karrick/godirwalk v1.17.0 +go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 +go: downloading github.com/containerd/typeurl v1.0.2 +go: downloading github.com/matttproud/golang_protobuf_extensions v1.0.4 +go: downloading github.com/beorn7/perks v1.0.1 +go: downloading github.com/cespare/xxhash/v2 v2.2.0 +go: downloading github.com/go-openapi/swag v0.22.3 +go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 +go: downloading github.com/go-logr/zapr v1.2.3 +go: downloading github.com/go-openapi/jsonreference v0.20.2 +go: downloading github.com/go-errors/errors v1.4.2 +go: downloading k8s.io/gengo v0.0.0-20220913193501-391367153a38 +go: downloading github.com/google/btree v1.0.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/NYTimes/gziphandler v1.1.1 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/fvbommel/sortorder v1.1.0 +go: downloading github.com/creack/pty v1.1.18 +go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 +go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240405160812-6b4a380c8104 +go: downloading github.com/felixge/httpsnoop v1.0.3 +go: downloading go.opentelemetry.io/otel/metric v0.31.0 +go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0 +go: downloading github.com/soheilhy/cmux v0.1.5 +go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 +go: downloading go.etcd.io/bbolt v1.3.7 +go: downloading go.etcd.io/etcd/pkg/v3 v3.5.9 +go: downloading github.com/coreos/go-oidc v2.2.1+incompatible +go: downloading github.com/go-logr/stdr v1.2.2 +go: downloading github.com/cenkalti/backoff/v4 v4.2.1 +go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 +go: downloading cloud.google.com/go/compute/metadata v0.2.3 +go: downloading cloud.google.com/go/compute v1.23.0 +go: downloading github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.1-0.20220218231025-f11817397a1b +go: downloading google.golang.org/api v0.126.0 +go: downloading github.com/rubiojr/go-vhd v0.0.0-20200706105327-02e210299021 +go: downloading gopkg.in/gcfg.v1 v1.2.3 +go: downloading github.com/vmware/govmomi v0.30.6 +go: downloading github.com/Azure/go-autorest/autorest/date v0.3.0 +go: downloading github.com/Azure/go-autorest/tracing v0.6.0 +go: downloading github.com/Azure/go-autorest/logger v0.2.1 +go: downloading github.com/golang-jwt/jwt/v4 v4.5.0 +go: downloading github.com/Azure/go-autorest/autorest/mocks v0.4.2 +go: downloading github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e +go: downloading github.com/containerd/cgroups v1.1.0 +go: downloading github.com/Microsoft/hcsshim v0.8.25 +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/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible +go: downloading github.com/godbus/dbus/v5 v5.0.6 +go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.10.0 +go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f +go: downloading github.com/moby/spdystream v0.2.0 +go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 +go: downloading golang.org/x/tools v0.16.1 +go: downloading github.com/mohae/deepcopy v0.0.0-20170603005431-491d3605edfb +go: downloading github.com/kr/text v0.2.0 +go: downloading github.com/rogpeppe/go-internal v1.10.0 +go: downloading github.com/docker/distribution v2.8.2+incompatible +go: downloading github.com/stoewer/go-strcase v1.2.0 +go: downloading github.com/containerd/ttrpc v1.2.2 +go: downloading github.com/opencontainers/go-digest v1.0.0 +go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible +go: downloading github.com/mailru/easyjson v0.7.7 +go: downloading github.com/sergi/go-diff v1.1.0 +go: downloading github.com/go-openapi/jsonpointer v0.19.6 +go: downloading google.golang.org/appengine v1.6.7 +go: downloading github.com/fatih/camelcase v1.0.0 +go: downloading github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 +go: downloading github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a +go: downloading github.com/gorilla/websocket v1.4.2 +go: downloading github.com/dustin/go-humanize v1.0.1 +go: downloading go.etcd.io/etcd/raft/v3 v3.5.9 +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 github.com/pquerna/cachecontrol v0.1.0 +go: downloading gopkg.in/warnings.v0 v0.1.2 +go: downloading github.com/stretchr/objx v0.5.0 +go: downloading github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df +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/docker/docker v20.10.21+incompatible +go: downloading github.com/docker/go-connections v0.4.0 +go: downloading github.com/josharian/intern v1.0.0 +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.2.0 +go: downloading github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 +go: downloading go.etcd.io/etcd/client/v2 v2.305.9 +go: downloading github.com/golang/glog v1.1.2 +go: downloading github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 +go: downloading github.com/google/s2a-go v0.1.4 +go: downloading github.com/googleapis/gax-go/v2 v2.11.0 +go: downloading go.opencensus.io v0.24.0 +go: downloading github.com/moby/ipvs v1.1.0 +go: downloading github.com/cilium/ebpf v0.9.1 +go: downloading github.com/go-ldap/ldap/v3 v3.4.3 +go: downloading golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e +go: downloading github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 +go: downloading github.com/seccomp/libseccomp-golang v0.10.0 +go: downloading github.com/opencontainers/image-spec v1.0.2 +go: downloading github.com/envoyproxy/protoc-gen-validate v1.0.2 +go: downloading github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 +go: downloading github.com/googleapis/enterprise-certificate-proxy v0.2.3 +go: downloading golang.org/x/mod v0.14.0 +go: downloading github.com/frankban/quicktest v1.14.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 go.starlark.net v0.0.0-20230525235612-a134d8f9ddca +go: downloading github.com/Azure/go-autorest/autorest/to v0.4.0 +go: downloading github.com/Azure/go-autorest/autorest/validation v0.3.1 +go: downloading github.com/dnaeon/go-vcr v1.2.0 +go: downloading github.com/gofrs/uuid v4.4.0+incompatible +go mod edit -require github.com/openshift/route-controller-manager@c5cc7a73705e4086759e2a36811b055b7716def4 +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@897457758819e01219db3268c4cad88b3c221c4c +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240411183121-897457758819 +go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20230811135323-13a5964cc98e +go mod edit -replace k8s.io/api=github.com/openshift/kubernetes/staging/src/k8s.io/api@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apiextensions-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apimachinery=github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cli-runtime=github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/client-go=github.com/openshift/kubernetes/staging/src/k8s.io/client-go@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cloud-provider=github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cluster-bootstrap=github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/code-generator=github.com/openshift/kubernetes/staging/src/k8s.io/code-generator@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/component-base=github.com/openshift/kubernetes/staging/src/k8s.io/component-base@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/component-helpers=github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/cri-api=github.com/openshift/kubernetes/staging/src/k8s.io/cri-api@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/csi-translation-lib=github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/dynamic-resource-allocation=github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kms=github.com/openshift/kubernetes/staging/src/k8s.io/kms@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-aggregator=github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-controller-manager=github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-proxy=github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kube-scheduler=github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kubectl=github.com/openshift/kubernetes/staging/src/k8s.io/kubectl@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kubelet=github.com/openshift/kubernetes/staging/src/k8s.io/kubelet@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/kubernetes=github.com/openshift/kubernetes@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/legacy-cloud-providers=github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/metrics=github.com/openshift/kubernetes/staging/src/k8s.io/metrics@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/mount-utils=github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/pod-security-admission=github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-apiserver=github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-cli-plugin=github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin@v0.0.0-20240411183121-897457758819 +go mod edit -replace k8s.io/sample-controller=github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller@v0.0.0-20240411183121-897457758819 +go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@23e5492c2e174ac502ff6113957069da5a12dbf0 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20240408141336-23e5492c2e17 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20240411183121-897457758819 +go: downloading github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20240411183121-897457758819 +go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20240408141336-23e5492c2e17 +go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20240408141336-23e5492c2e17 +go mod edit -replace sigs.k8s.io/kube-storage-version-migrator=github.com/openshift/kubernetes-kube-storage-version-migrator@e8749689edb8e7fea42eca5f2b67c3187192cdeb +go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20240408141336-23e5492c2e17 +go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20240408141336-23e5492c2e17 +go mod edit -replace k8s.io/endpointslice=github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice@v0.0.0-20240411183121-897457758819 +# Updating etcd/go.mod +go mod edit -require github.com/openshift/cluster-policy-controller@cc48f3152213bfe6e42fdd82f760246e862d208f +go: go.mod file indicates go 1.21, but maximum version supported by tidy is 1.20 diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index d576991eb2..63df3068d6 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,50 +1,110 @@ -- cluster-network-operator embedded-component 6480348212445eb74ca2dafc61503f4942a87bed to a62442bbb2ee777e3715f57af6dd87f333e0e20a - - 7d1cadf 2024-03-15T17:48:54+01:00 Fully disable network-node-identity on ROKS +- cluster-csi-snapshot-controller-operator embedded-component 1afe553a46159bd5b65061c98e15138bf48327cc to 87d7080a91e9247c9fde6c3e2d9e222c23df541e + - 42d42f9 2024-04-01T15:39:39-06:00 create suitable role and roleBinding for csi-snapshot-webhook -- csi-external-snapshotter embedded-component 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 - - c8162b6 2024-04-02T14:31:10-06:00 UPSTREAM: 922: add cmdline args to enable group snapshot webhooks +- cluster-dns-operator embedded-component 9eb983497cd90c4115d7dc476e4bcf0dfb5ee002 to 49290d7db2194df73dfaeb1e719580dabf166690 + - 5a1285a 2024-04-19T16:14:44+05:30 Add RBAC for reading featuregates -- kubernetes embedded-component f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 to 6b4a380c8104d3b8f48443544548193cccb32b72 - - f82e7dbb4 2024-04-01T15:05:04-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - - b0a30c246 2024-04-01T14:34:49-03:00 UPSTREAM: : manually resolve conflicts - - de36ba911 2024-03-28T14:55:37+01:00 UPSTREAM: : Pin x/net to the private fork - - fc11ff34c 2024-03-15T00:00:00+00:00 Release commit for Kubernetes v1.28.8 - - e55ff77df 2024-03-06T13:07:31-08:00 remove --v arg from kubetest2-tester-ginkgo test args - - 1107f1b80 2024-03-06T13:07:31-08:00 ci: bump kind to latest for kms jobs - - 023168e25 2024-03-06T13:12:09-05:00 [go] Bump images, dependencies and versions to go 1.21.8 / distroless-iptables to v0.4.6 - - 7889bca8b 2024-03-06T10:47:48-05:00 [CVE-2024-24786] Bump github.com/golang/protobuf v1.5.4, google.golang.org/protobuf v1.33.0 - - 39bb9e94e 2024-03-06T14:49:24+01:00 keep existing PDB conditions when updating status - - d75625a52 2024-03-05T19:58:35+09:00 Validate restartable init container state transition - - 4fbf9a22a 2024-03-05T07:27:12+00:00 Test that separation of streams work by using progress notifies - - 1792c73a2 2024-03-05T07:24:58+00:00 Prevent watch cache starvation, by moving its watch to separate RPC and add a SeparateCacheWatchRPC feature flag to disable this behavior - - d216da45c 2024-03-01T11:17:54+08:00 fix UT failure TestPrintIPAddressList - - bb365b8e6 2024-02-26T13:59:31-05:00 Fix race condition between external-resizer and kubelet - - 728325849 2024-02-19T10:51:44+01:00 codegen: don't nuke files if only verifying - - 3be54edf8 2024-02-15T09:38:32+01:00 dra: increase timeout in setupFakeDRADriverGRPCServer to prevent tests to flake. - - d077f4a7e 2024-02-15T11:20:00+09:00 e2e_node: replace `registry.k8s.io/stress:v1` with agnhost - - 6e552d8d2 2024-02-15T11:19:55+09:00 promote agnhost to v2.47 - - 00f140f6e 2024-02-14T11:03:40+00:00 Update CHANGELOG/CHANGELOG-1.28.md for v1.28.7 - - a3e89669b 2024-02-12T09:50:04-08:00 fixing issue with GetCPUUsageNanoCores on Windows - - f483e4106 2024-02-12T17:23:11+01:00 Fix cleanup of file subpaths - - e51a3130d 2024-02-12T17:43:38+05:30 etcd: Update to version 3.5.12 - - 04a499fd1 2024-02-12T17:43:12+05:30 build etcd image v3.5.12 +- cluster-kube-apiserver-operator embedded-component 9fe0ab100bc6241030bf6ad1fc3f554ad0b0faf1 to f5c5a609fa5e318379ceb86d346122814dc81762 + - 2809abd 2024-04-09T10:04:59-04:00 use RotatedSigningCASecret in update only mode + - 3602f48 2024-04-09T10:03:57-04:00 bump(library-go) + +- cluster-kube-controller-manager-operator embedded-component 642fb08461913d9352b781693311727da42ffc0a to ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f + - 6f89332 2024-04-09T11:51:56+02:00 operator/certrotationcontroller/certrotationcontroller: make use of UseSecretUpdateOnly + - ae7842a 2024-04-09T11:50:11+02:00 go mod tidy && go mod vendor + - fd4959c 2024-04-09T11:49:56+02:00 pin library-go to v0.0.0-20240409080036-0ebfe3e52a95 + - d070507 2024-04-04T13:16:49+02:00 bump(library-go)=release-4.15 -- machine-config-operator embedded-component 36049f9a1cc1b2f9b8c5edee9165fb4307313ec0 to 3b90c34b13f52ca89e9a3fecc9ac827eff9886d1 - - a1d14210 2024-04-01T09:34:26-05:00 kubelet: restorecon necessary files on kubelet's prestart +- cluster-kube-scheduler-operator embedded-component e1a1e3a845fd27d2dc8cbd7eb40975505ff294ab to f054dfaf189b43b262c11ef7f97038c79592c796 + - b7deb92 2024-04-04T13:16:03+02:00 Bump(library-go)=release-4.15 -- operator-framework-olm embedded-component 59aa935ebbe6948921ea3292603cbdce898e0091 to 0a14440d662de108769cd3f3cf9cb5a47559b5cd - - 44a81b0f 2024-04-03T07:39:44-04:00 OCPBUGS-31438: Correctly detect catalog image ID for extractContent catalog pods (#3194) +- cluster-openshift-controller-manager-operator embedded-component f189a00839491e166cd0220afe11d35cdb844754 to e9845aab67730c8b6b9225d0a27f082b8640b139 + - 6175d69 2024-01-03T08:43:19+00:00 fix unit tests + - 7c5df4e 2024-01-03T08:43:19+00:00 Disable deployer-controller when deploymentconfig is disabled -- csi-external-snapshotter image-amd64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +- etcd embedded-component 8aecb841e30bb4ce38de1d270ef5138301de828a to 23e5492c2e174ac502ff6113957069da5a12dbf0 + - f28dbd98 2024-04-02T18:36:36+02:00 Merge pull request #215 from openshift-bot/art-consistency-openshift-4.15-ose-etcd + - ae99d351 2024-04-02T18:35:52+02:00 DOWNSTREAM : resolve merge conflicts + - c9063a0d 2024-03-30T07:27:31+13:00 version: bump up to 3.5.13 + - 59e3f7df 2024-03-21T07:28:20+00:00 build(deps): bump distroless/static-debian11 from `9be3fcc` to `7e5c6a2` + - 46d2caae 2024-03-18T18:41:17-07:00 [release-3.5] backport fix watch event loss after compaction + - 579b22cf 2024-03-11T20:18:26+01:00 Fix progress notification for watch that doesn't get any events + - 67afad6e 2024-03-08T08:30:03-08:00 Add govuln GitHub workflow + - e6d95c84 2024-03-07T16:03:12-08:00 dependency: bump google.golang.org/protobuf to v1.33.0 + - 722e5cbb 2024-03-06T09:33:17+00:00 Update go version to 1.21.8 + - d76d8479 2024-02-24T15:38:49+00:00 Bump bbolt to 1.3.9 for 3.5 + - f1d1029c 2024-02-23T16:24:13-08:00 dependency: bump github.com/sirupsen/logrus to v1.9.3 + - a1aaa51c 2024-02-19T13:26:15+00:00 add uds test cases into e2e TestAuthority + - 80e2064b 2024-02-19T12:21:31+00:00 Add unix socket test to TestNewURLsValue + - 1a9062ec 2024-02-19T12:21:16+00:00 pkg/types: Support Unix sockets in NewURLS + - 31f097ee 2024-02-18T20:44:25+08:00 added dial-keepalive-time、dial-keepalive-timeout、permit-without-stream arguments to the grpc-proxy + - 4a90575a 2024-02-17T22:16:53-08:00 Backport ignore old leader's leases revoking request + - c486b589 2024-02-17T22:16:29-08:00 tests/e2e: backport e2e cluster setup + - 9635525b 2024-02-17T03:02:19-08:00 *: add test-smoke to the pipeline and update test-smoke + - 7ebbc0f6 2024-02-16T13:52:09-08:00 tools/mod: go mod tidy + - f4633c84 2024-02-15T19:55:22-08:00 *: fix failing shellchecks + - b9b4f1bd 2024-02-15T19:46:22-08:00 server: fix comment to match function name + - 1115eb15 2024-02-13T15:21:07-08:00 tests/e2e: implement EtcdProcess GoFailClientTimeout + - e179686f 2024-02-13T16:01:10+05:30 Make CGO_ENABLED configurable for etcd 3.5 + - 07c4dcb9 2024-02-07T17:00:09-08:00 tests/e2e: use WaitLeader in corrupt test + - 8b249325 2024-02-06T14:29:51-08:00 tests/e2e: implement EtcdProcessCluster WaitLeader + - c37d33c5 2024-02-06T14:29:40-08:00 tests/e2e: implement EtcdProcess Etcdctl + - 62a4bb3b 2024-02-06T19:39:09+01:00 etcd: Add OpenBSD-specific files for SetKeepAlivePeriod handling + - a965801b 2024-02-06T12:11:33+08:00 etcdserver: drain leaky goroutines before test completed + - 26bae5ef 2024-02-05T15:13:42-08:00 tests/e2e: move etcdctl to framework/e2e + - a13f676e 2024-02-02T14:40:15-05:00 [3.5] backport: add backoff to client config + - 3d64877d 2024-02-02T14:25:53-05:00 [3.5] Update to go1.21 + +- kubernetes embedded-component 6b4a380c8104d3b8f48443544548193cccb32b72 to 897457758819e01219db3268c4cad88b3c221c4c + - a307a04fa 2024-04-05T13:20:15+02:00 UPSTREAM: : allow type mutation for specific secrets + - 069162827 2024-04-04T14:25:40+02:00 UPSTREAM: 124048: Use the right feature gate when updating uncertain volumes + - 7bfb5d228 2024-03-25T09:28:40+00:00 UPSTREAM: : OCPBUGS-29520: fix cpu manager default cpuset check in workload partitioned env + - b0d358b89 2024-03-25T09:28:40+00:00 UPSTREAM: 123603: fix UT failure TestPrintIPAddressList + - 20972fe8e 2024-02-26T12:11:12+00:00 UPSTREAM: : openshift-kube-apiserver: add kube-apiserver patches + +- machine-config-operator embedded-component 3b90c34b13f52ca89e9a3fecc9ac827eff9886d1 to 6e28938baecfe677ff6b69f46e2c889c1a7a0bb5 + - 62fa2987 2024-04-09T15:09:06+02:00 OCPBUGS-24366: Delete state files on reboot only + - 9c809af9 2024-04-05T14:57:34+00:00 OCPBUGS-22910: Modify rm_nm_conn_files to remove temporary files + - dedf98bb 2024-04-02T17:01:20+00:00 fix: resources were in the wrong indentation level + - e1188cfa 2024-01-11T16:33:20+00:00 OCPBUGS-18541: Log network service output to console + +- operator-framework-olm embedded-component 0a14440d662de108769cd3f3cf9cb5a47559b5cd to f6374fbc52a33f72763e7dda2b0bf04773a359dd + - c077b3db 2024-04-16T11:45:12-04:00 Update if AlreadyExists (#3202) + - 1dcc7cfb 2024-04-16T11:41:50-04:00 RoleBinding SSA (#3190) + - c7c5a73a 2024-04-06T21:59:14-04:00 copy-content: delete destination dirs before copying (#3197) + +- router image-amd64 b7001137f832d02d4ed68cba27fe3001ff523fa6 to 397ff2fdb0a65bca3c960c364239bd1c0697ce21 + - ee6382a 2024-04-18T15:00:27+00:00 OCPBUGS-32044: Introduce 'idle-close-on-response' option for frontends + - f3ad52d 2024-03-29T14:06:16+00:00 OCPBUGS-22739: Properly handle rewrite-target annotation + +- ovn-kubernetes image-amd64 3bdcbd4e7cf57237c8c59b277fc2d8de6a932f68 to feca446a2e3848f79e533bb28763b2d61074de6e + - 057abeb 2024-04-08T10:21:05+02:00 Remove OVN topology version reporting/detection from OVN db + - 0f743ab 2024-04-08T10:21:03+02:00 Remove the configmap based OVN topology version reporting/detection + - bab2028 2024-03-20T09:14:34+01:00 Periodically check the ovnkube-node certificate is not expired + - 2016e89 2024-03-12T21:08:51+05:30 Custom v4 and v6 transit switch subnets while creating kind cluster + +- kubernetes image-amd64 6b4a380c8104d3b8f48443544548193cccb32b72 to 897457758819e01219db3268c4cad88b3c221c4c + - a307a04fa 2024-04-05T13:20:15+02:00 UPSTREAM: : allow type mutation for specific secrets + - 069162827 2024-04-04T14:25:40+02:00 UPSTREAM: 124048: Use the right feature gate when updating uncertain volumes + - 7bfb5d228 2024-03-25T09:28:40+00:00 UPSTREAM: : OCPBUGS-29520: fix cpu manager default cpuset check in workload partitioned env + - b0d358b89 2024-03-25T09:28:40+00:00 UPSTREAM: 123603: fix UT failure TestPrintIPAddressList + - 20972fe8e 2024-02-26T12:11:12+00:00 UPSTREAM: : openshift-kube-apiserver: add kube-apiserver patches + +- csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 - c8162b6 2024-04-02T14:31:10-06:00 UPSTREAM: 922: add cmdline args to enable group snapshot webhooks -- csi-external-snapshotter image-amd64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +- csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 - c8162b6 2024-04-02T14:31:10-06:00 UPSTREAM: 922: add cmdline args to enable group snapshot webhooks -- csi-external-snapshotter image-amd64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +- csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 to 4f2955c7c90cd150f9dfae782148d0fa8eba7342 - c8162b6 2024-04-02T14:31:10-06:00 UPSTREAM: 922: add cmdline args to enable group snapshot webhooks -- ovn-kubernetes image-amd64 42b1cc427538a736f8c056171b4de7e6c6a366fb to 3bdcbd4e7cf57237c8c59b277fc2d8de6a932f68 +- router image-arm64 b7001137f832d02d4ed68cba27fe3001ff523fa6 to 397ff2fdb0a65bca3c960c364239bd1c0697ce21 + - ee6382a 2024-04-18T15:00:27+00:00 OCPBUGS-32044: Introduce 'idle-close-on-response' option for frontends + - f3ad52d 2024-03-29T14:06:16+00:00 OCPBUGS-22739: Properly handle rewrite-target annotation + +- ovn-kubernetes image-arm64 42b1cc427538a736f8c056171b4de7e6c6a366fb to feca446a2e3848f79e533bb28763b2d61074de6e + - 057abeb 2024-04-08T10:21:05+02:00 Remove OVN topology version reporting/detection from OVN db + - 0f743ab 2024-04-08T10:21:03+02:00 Remove the configmap based OVN topology version reporting/detection - 8ad99d7 2024-03-28T07:50:16+00:00 Node IP handler: do not exclude keepalived vips - 6699b80 2024-03-28T07:50:16+00:00 EIP multi NIC: in LGW mode, skip IP rules when dst is node IP - 831040d 2024-03-28T07:50:16+00:00 Rename non-OVN eips to secondary host eips @@ -65,11 +125,17 @@ - eda6ec5 2024-03-28T07:48:30+00:00 Upgrade netlink lib to consume default route fix - d1ce354 2024-03-28T07:48:14+00:00 Add netlink subscriber for link manager - f1b13a7 2024-03-28T07:17:42+00:00 Exposes link manager to track MAC address changes + - bab2028 2024-03-20T09:14:34+01:00 Periodically check the ovnkube-node certificate is not expired + - 2016e89 2024-03-12T21:08:51+05:30 Custom v4 and v6 transit switch subnets while creating kind cluster -- kubernetes image-amd64 f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 to 6b4a380c8104d3b8f48443544548193cccb32b72 +- kubernetes image-arm64 f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 to 897457758819e01219db3268c4cad88b3c221c4c + - a307a04fa 2024-04-05T13:20:15+02:00 UPSTREAM: : allow type mutation for specific secrets + - 069162827 2024-04-04T14:25:40+02:00 UPSTREAM: 124048: Use the right feature gate when updating uncertain volumes - f82e7dbb4 2024-04-01T15:05:04-03:00 UPSTREAM: : hack/update-vendor.sh, make update and update image - b0a30c246 2024-04-01T14:34:49-03:00 UPSTREAM: : manually resolve conflicts - de36ba911 2024-03-28T14:55:37+01:00 UPSTREAM: : Pin x/net to the private fork + - 7bfb5d228 2024-03-25T09:28:40+00:00 UPSTREAM: : OCPBUGS-29520: fix cpu manager default cpuset check in workload partitioned env + - b0d358b89 2024-03-25T09:28:40+00:00 UPSTREAM: 123603: fix UT failure TestPrintIPAddressList - fc11ff34c 2024-03-15T00:00:00+00:00 Release commit for Kubernetes v1.28.8 - e55ff77df 2024-03-06T13:07:31-08:00 remove --v arg from kubetest2-tester-ginkgo test args - 1107f1b80 2024-03-06T13:07:31-08:00 ci: bump kind to latest for kms jobs @@ -81,6 +147,7 @@ - 1792c73a2 2024-03-05T07:24:58+00:00 Prevent watch cache starvation, by moving its watch to separate RPC and add a SeparateCacheWatchRPC feature flag to disable this behavior - d216da45c 2024-03-01T11:17:54+08:00 fix UT failure TestPrintIPAddressList - bb365b8e6 2024-02-26T13:59:31-05:00 Fix race condition between external-resizer and kubelet + - 20972fe8e 2024-02-26T12:11:12+00:00 UPSTREAM: : openshift-kube-apiserver: add kube-apiserver patches - 728325849 2024-02-19T10:51:44+01:00 codegen: don't nuke files if only verifying - 3be54edf8 2024-02-15T09:38:32+01:00 dra: increase timeout in setupFakeDRADriverGRPCServer to prevent tests to flake. - d077f4a7e 2024-02-15T11:20:00+09:00 e2e_node: replace `registry.k8s.io/stress:v1` with agnhost diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ccfda58baa..f71a1afcf4 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,19 +1,19 @@ -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 1afe553a46159bd5b65061c98e15138bf48327cc -https://github.com/openshift/cluster-dns-operator embedded-component 9eb983497cd90c4115d7dc476e4bcf0dfb5ee002 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 87d7080a91e9247c9fde6c3e2d9e222c23df541e +https://github.com/openshift/cluster-dns-operator embedded-component 49290d7db2194df73dfaeb1e719580dabf166690 https://github.com/openshift/cluster-ingress-operator embedded-component 0106cb99b340a2f266a88700b4250f11457ffb05 -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9fe0ab100bc6241030bf6ad1fc3f554ad0b0faf1 -https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 642fb08461913d9352b781693311727da42ffc0a -https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e1a1e3a845fd27d2dc8cbd7eb40975505ff294ab +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component f5c5a609fa5e318379ceb86d346122814dc81762 +https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ee8cf52558df0862f9927dbc7275fbe6cc1a1e5f +https://github.com/openshift/cluster-kube-scheduler-operator embedded-component f054dfaf189b43b262c11ef7f97038c79592c796 https://github.com/openshift/cluster-network-operator embedded-component a62442bbb2ee777e3715f57af6dd87f333e0e20a -https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f189a00839491e166cd0220afe11d35cdb844754 +https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e9845aab67730c8b6b9225d0a27f082b8640b139 https://github.com/openshift/cluster-policy-controller embedded-component cc48f3152213bfe6e42fdd82f760246e862d208f https://github.com/openshift/csi-external-snapshotter embedded-component 4f2955c7c90cd150f9dfae782148d0fa8eba7342 -https://github.com/openshift/etcd embedded-component 8aecb841e30bb4ce38de1d270ef5138301de828a -https://github.com/openshift/kubernetes embedded-component 6b4a380c8104d3b8f48443544548193cccb32b72 +https://github.com/openshift/etcd embedded-component 23e5492c2e174ac502ff6113957069da5a12dbf0 +https://github.com/openshift/kubernetes embedded-component 897457758819e01219db3268c4cad88b3c221c4c https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component e8749689edb8e7fea42eca5f2b67c3187192cdeb -https://github.com/openshift/machine-config-operator embedded-component 3b90c34b13f52ca89e9a3fecc9ac827eff9886d1 +https://github.com/openshift/machine-config-operator embedded-component 6e28938baecfe677ff6b69f46e2c889c1a7a0bb5 https://github.com/openshift/openshift-controller-manager embedded-component edbf7353e21a286cac85867ec13d6cf937dd9c33 -https://github.com/openshift/operator-framework-olm embedded-component 0a14440d662de108769cd3f3cf9cb5a47559b5cd +https://github.com/openshift/operator-framework-olm embedded-component f6374fbc52a33f72763e7dda2b0bf04773a359dd https://github.com/openshift/route-controller-manager embedded-component c5cc7a73705e4086759e2a36811b055b7716def4 https://github.com/openshift/service-ca-operator embedded-component f5972cc74670c274bdc2b29d0903c4ed0432b9ca https://github.com/openshift/oc image-amd64 62c4d45a976deb18194a7b9eb853a8c40b10f4b8 @@ -21,18 +21,18 @@ https://github.com/openshift/coredns image-amd64 22f950eae53fcba187c2303ac4f1a83 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 https://github.com/openshift/csi-external-snapshotter image-amd64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 -https://github.com/openshift/router image-amd64 b7001137f832d02d4ed68cba27fe3001ff523fa6 +https://github.com/openshift/router image-amd64 397ff2fdb0a65bca3c960c364239bd1c0697ce21 https://github.com/openshift/kube-rbac-proxy image-amd64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 -https://github.com/openshift/ovn-kubernetes image-amd64 3bdcbd4e7cf57237c8c59b277fc2d8de6a932f68 -https://github.com/openshift/kubernetes image-amd64 6b4a380c8104d3b8f48443544548193cccb32b72 +https://github.com/openshift/ovn-kubernetes image-amd64 feca446a2e3848f79e533bb28763b2d61074de6e +https://github.com/openshift/kubernetes image-amd64 897457758819e01219db3268c4cad88b3c221c4c https://github.com/openshift/service-ca-operator image-amd64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca https://github.com/openshift/oc image-arm64 62c4d45a976deb18194a7b9eb853a8c40b10f4b8 https://github.com/openshift/coredns image-arm64 22f950eae53fcba187c2303ac4f1a8305b6c1c8a -https://github.com/openshift/csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 -https://github.com/openshift/csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 -https://github.com/openshift/csi-external-snapshotter image-arm64 50fa049ccaa48d7f7dcb165fb6e20c185a0cbd13 -https://github.com/openshift/router image-arm64 b7001137f832d02d4ed68cba27fe3001ff523fa6 +https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +https://github.com/openshift/csi-external-snapshotter image-arm64 4f2955c7c90cd150f9dfae782148d0fa8eba7342 +https://github.com/openshift/router image-arm64 397ff2fdb0a65bca3c960c364239bd1c0697ce21 https://github.com/openshift/kube-rbac-proxy image-arm64 e8e8c84bcc6d4419970726f3028df4b178c0b1c9 -https://github.com/openshift/ovn-kubernetes image-arm64 42b1cc427538a736f8c056171b4de7e6c6a366fb -https://github.com/openshift/kubernetes image-arm64 f1b5f6c8166add33d0d5b0964e7e4482d11b1a17 +https://github.com/openshift/ovn-kubernetes image-arm64 feca446a2e3848f79e533bb28763b2d61074de6e +https://github.com/openshift/kubernetes image-arm64 897457758819e01219db3268c4cad88b3c221c4c https://github.com/openshift/service-ca-operator image-arm64 f5972cc74670c274bdc2b29d0903c4ed0432b9ca diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 5577f29b22..2e84a864d3 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.15.0-0.nightly-2024-04-07-120427" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-03-202447" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.15.0-0.nightly-2024-04-21-051624" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.15.0-0.nightly-arm64-2024-04-21-021546"