Skip to content

Commit

Permalink
NO-ISSUE: rebase-main-4.15.0-0.nightly-2023-10-30-224022_amd64-2023-1…
Browse files Browse the repository at this point in the history 
…0-30_arm64-2023-10-30 (#2533)

* update last_rebase.sh

* update changelog

* update microshift/go.mod

* update microshift/vendor

* update etcd/go.mod

* update etcd/vendor

* update component images

* update manifests

* update buildfiles

---------

Co-authored-by: ci-robot <[email protected]>
  • Loading branch information
@microshift-rebase-script
microshift-rebase-script[bot] and ci-robot authored Oct 31, 2023
1 parent 14f8ddb commit b1ad2fa
Show file tree
Hide file tree
Showing 343 changed files with 61,987 additions and 13,940 deletions.
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=28
KUBE_GIT_VERSION=v1.28.3
KUBE_GIT_COMMIT=fa9f9097c61b7dd9e7f21c894dba7ed5bd02a62a
KUBE_GIT_COMMIT=993e262f7a5d6457cbbcef7a84b7128f9b0ff8fe
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-arm64-2023-10-29-152451
OCP_VERSION := 4.15.0-0.nightly-arm64-2023-10-30-224022
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.15.0-0.nightly-2023-10-27-135451
OCP_VERSION := 4.15.0-0.nightly-2023-10-30-224022
2 changes: 1 addition & 1 deletion assets/release/release-aarch64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-arm64-2023-10-29-152451"
"base": "4.15.0-0.nightly-arm64-2023-10-30-224022"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:95b180bce6addd5d5d83b9dfb3e69c50f1a5f286ea2e432b01c6aa8a9f663b12",
Expand Down
4 changes: 2 additions & 2 deletions assets/release/release-x86_64.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.15.0-0.nightly-2023-10-27-135451"
"base": "4.15.0-0.nightly-2023-10-30-224022"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7e1e3c1067531d7d32fd0ca0cc34186227cf68266d898955616c7324a2a2cfe",
Expand All @@ -9,7 +9,7 @@
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3b2243a072ff8c3f1cbd398af14cce37c86e30da08c4e3448e8fb3a59835638",
"openssl": "registry.access.redhat.com/ubi8/openssl@sha256:9e743d947be073808f7f1750a791a3dbd81e694e37161e8c6c6057c2c342d671",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:649b12e1c8f1da7aa2ae4791ee35b2bccb7c45d2136fa939f24801f3244f088a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40a318280b54b593a709cb4725394c5a54ccf7e37dea2927f1a55733f1e48ed8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f0d7ab9c29798ede460637f9254e8a9c279eda4a0b8666555401eb15ea62c61",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04f5275c046e2d25562f4c043edb3064e61d3bf0c8759d83d27f766e295d4ba7",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:b373c2b2a539ac09a5a3bbc545a10672c28936d1576b4fbb30bb5375acdc5852",
"topolvm_csi_registrar": "registry.redhat.io/openshift4/ose-csi-node-driver-registrar@sha256:b4721c901f193207735c2b5b8cdba02c6959f8dee59553c34d0834a2382cd9a5",
Expand Down
100 changes: 50 additions & 50 deletions etcd/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
golang.org/x/sync v0.2.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
golang.org/x/sync v0.3.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
)

require (
Expand Down Expand Up @@ -95,13 +95,13 @@ require (
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v2 v2.305.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/raft/v3 v3.5.9 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.10.0 // indirect
Expand All @@ -115,15 +115,15 @@ require (
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -140,41 +140,41 @@ require (

replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20230811135323-13a5964cc98e // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20230831104714-6fc69d5d8356 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20231026174244-fa9f9097c61b // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20231026174244-fa9f9097c61b // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
go.etcd.io/etcd/client/pkg/v3 => github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
go.etcd.io/etcd/client/v3 => github.com/openshift/etcd/client/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
go.etcd.io/etcd/pkg/v3 => github.com/openshift/etcd/pkg/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
go.etcd.io/etcd/raft/v3 => github.com/openshift/etcd/raft/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
go.etcd.io/etcd/server/v3 => github.com/openshift/etcd/server/v3 v3.5.1-0.20231030134014-9651438be519 // from etcd
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20231027165605-993e262f7a5d // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/component-helpers => github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/dynamic-resource-allocation => github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kms => github.com/openshift/kubernetes/staging/src/k8s.io/kms v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20231027165605-993e262f7a5d // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
)

replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20231026174244-fa9f9097c61b // staging kubernetes
replace k8s.io/endpointslice => github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20231027165605-993e262f7a5d // staging kubernetes
Loading

0 comments on commit b1ad2fa

Please sign in to comment.