Skip to content

rebase-4.12.0-0.nightly-2022-12-08-234300 #1181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 4 commits into from
Dec 9, 2022
Merged

rebase-4.12.0-0.nightly-2022-12-08-234300 #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9fd21a
update go.mod
Dec 9, 2022
f90a09a
update vendoring
Dec 9, 2022
8a4b7bd
update component images
Dec 9, 2022
a18afd8
update buildfiles
Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=25
KUBE_GIT_VERSION=v1.25.0
KUBE_GIT_COMMIT=553373323f102cd92183bfe80e5759984b399ab4
KUBE_GIT_COMMIT=86bd4ff6092e5dd9cb77d498833d9bae3cf1fe4a
KUBE_GIT_TREE_STATE=clean
76 changes: 38 additions & 38 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ require (
github.com/mitchellh/go-homedir v1.1.0 // microshift
github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/cluster-policy-controller v0.0.0-20221115141013-c7a633416a8e
github.com/openshift/library-go v0.0.0-20221116163016-046e935fe86f
github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43
github.com/openshift/route-controller-manager v0.0.0-20221130011049-9e74d175e81e
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
github.com/stretchr/testify v1.8.0
go.etcd.io/etcd/server/v3 v3.5.4
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10
gopkg.in/yaml.v2 v2.4.0
Expand Down Expand Up @@ -227,7 +227,7 @@ require (
k8s.io/mount-utils v0.0.0 // indirect
k8s.io/pod-security-admission v0.0.0 // indirect
k8s.io/utils v0.0.0-20220922133306-665eaaec4324 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.32 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
sigs.k8s.io/kustomize/api v0.12.1 // indirect
Expand All @@ -238,8 +238,8 @@ require (
require (
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/openshift/apiserver-library-go v0.0.0-20220831203000-5dd0c565981c // indirect
github.com/stretchr/objx v0.2.0 // indirect
github.com/openshift/apiserver-library-go v0.0.0-20221017210321-925452e8316c // indirect
github.com/stretchr/objx v0.4.0 // indirect
)

require (
Expand Down Expand Up @@ -269,16 +269,16 @@ replace (
github.com/onsi/ginkgo/v2 => github.com/openshift/onsi-ginkgo/v2 v2.0.0-20221005160638-5fa9cd70cd8c // from kubernetes
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v1.0.2 // from kubernetes
github.com/openshift/api => github.com/openshift/api v0.0.0-20221116152553-4b67c2b2bb1e // from kubernetes
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20220831203000-5dd0c565981c // from kubernetes
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20220720161851-9b4f0386f6b0 // from kubernetes
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20220831193253-4950ae70c8ea // from kubernetes
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20221116163016-046e935fe86f // from kubernetes
github.com/openshift/apiserver-library-go => github.com/openshift/apiserver-library-go v0.0.0-20221017210321-925452e8316c // from kubernetes
github.com/openshift/build-machinery-go => github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d // from kubernetes
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // from kubernetes
github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20221205131816-1700fb06ea43 // from kubernetes
github.com/pkg/errors => github.com/pkg/errors v0.9.1 // from kubernetes
github.com/pquerna/cachecontrol => github.com/pquerna/cachecontrol v0.1.0 // from kubernetes
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.12.1 // from kubernetes
github.com/spf13/cobra => github.com/spf13/cobra v1.4.0 // from kubernetes
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5 // from kubernetes
github.com/stretchr/testify => github.com/stretchr/testify v1.7.0 // from kubernetes
github.com/stretchr/testify => github.com/stretchr/testify v1.8.0 // from kubernetes
github.com/urfave/negroni => github.com/urfave/negroni v1.0.0 // from kubernetes
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // from kubernetes
go.etcd.io/etcd/api/v3 => github.com/openshift/etcd/api/v3 v3.5.1-0.20220707134052-31b6b2d9b4d7 // override pinning etcd due to conflicting opentelemetry version
Expand All @@ -294,36 +294,36 @@ replace (
gonum.org/v1/netlib => gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // from kubernetes
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.2.2 // from kubernetes
gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0 // from kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/component-helpers => k8s.io/component-helpers v0.25.0 // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/klog/v2 => k8s.io/klog/v2 v2.70.1 // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20221119160213-553373323f10 // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20221208093808-86bd4ff6092e // staging kubernetes
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20221119160213-553373323f10 // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20221119160213-553373323f10 // from kubernetes
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20221208093808-86bd4ff6092e // release kubernetes
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/pod-security-admission => github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20221208093808-86bd4ff6092e // from kubernetes
sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // from kubernetes
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.2.0 // from kubernetes
)
Loading