Skip to content

Commit

Permalink
Merge pull request #4266 from nirarg/k8s-version
Browse files Browse the repository at this point in the history 
Bump K8s.io version to v0.19.0
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Oct 15, 2020
2 parents 9ce90a2 + 7055e9b commit dfdc5ef
Show file tree
Hide file tree
Showing 740 changed files with 73,269 additions and 29,806 deletions.
8 changes: 4 additions & 4 deletions cmd/openshift-install/create.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,14 +209,14 @@ func runTargetCmd(targets ...asset.WritableAsset) func(cmd *cobra.Command, args
}

// addRouterCAToClusterCA adds router CA to cluster CA in kubeconfig
func addRouterCAToClusterCA(config *rest.Config, directory string) (err error) {
func addRouterCAToClusterCA(ctx context.Context, config *rest.Config, directory string) (err error) {
client, err := kubernetes.NewForConfig(config)
if err != nil {
return errors.Wrap(err, "creating a Kubernetes client")
}

// Configmap may not exist. log and accept not-found errors with configmap.
caConfigMap, err := client.CoreV1().ConfigMaps("openshift-config-managed").Get("default-ingress-cert", metav1.GetOptions{})
caConfigMap, err := client.CoreV1().ConfigMaps("openshift-config-managed").Get(ctx, "default-ingress-cert", metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, "fetching default-ingress-cert configmap from openshift-config-managed namespace")
}
Expand Down Expand Up @@ -440,7 +440,7 @@ func waitForConsole(ctx context.Context, config *rest.Config) (string, error) {
silenceRemaining := logDownsample
timer.StartTimer("Console")
wait.Until(func() {
consoleRoutes, err := rc.RouteV1().Routes(consoleNamespace).List(metav1.ListOptions{})
consoleRoutes, err := rc.RouteV1().Routes(consoleNamespace).List(ctx, metav1.ListOptions{})
if err == nil && len(consoleRoutes.Items) > 0 {
for _, route := range consoleRoutes.Items {
logrus.Debugf("Route found in openshift-console namespace: %s", route.Name)
Expand Down Expand Up @@ -504,7 +504,7 @@ func waitForInstallComplete(ctx context.Context, config *rest.Config, directory
return err
}

if err = addRouterCAToClusterCA(config, rootOpts.dir); err != nil {
if err = addRouterCAToClusterCA(ctx, config, rootOpts.dir); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion cmd/openshift-install/gather.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ func logClusterOperatorConditions(ctx context.Context, config *rest.Config) erro
return errors.Wrap(err, "creating a config client")
}

operators, err := client.ConfigV1().ClusterOperators().List(metav1.ListOptions{})
operators, err := client.ConfigV1().ClusterOperators().List(ctx, metav1.ListOptions{})
if err != nil {
return errors.Wrap(err, "listing ClusterOperator objects")
}
Expand Down
7 changes: 7 additions & 0 deletions cmd/openshift-install/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/spf13/cobra"
"golang.org/x/crypto/ssh/terminal"
"k8s.io/klog"
klogv2 "k8s.io/klog/v2"

"github.com/openshift/installer/pkg/terraform/exec/plugins"
)
Expand All @@ -26,10 +27,16 @@ var (
func main() {
// This attempts to configure klog (used by vendored Kubernetes code) not
// to log anything.
// Handle k8s.io/klog
var fs flag.FlagSet
klog.InitFlags(&fs)
fs.Set("stderrthreshold", "4")
klog.SetOutput(ioutil.Discard)
// Handle k8s.io/klog/v2
var fsv2 flag.FlagSet
klogv2.InitFlags(&fsv2)
fsv2.Set("stderrthreshold", "4")
klogv2.SetOutput(ioutil.Discard)

if len(os.Args) > 0 {
base := filepath.Base(os.Args[0])
Expand Down
62 changes: 21 additions & 41 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ require (
github.com/dmacvicar/terraform-provider-libvirt v0.6.2
github.com/frankban/quicktest v1.7.2 // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-logr/logr v0.2.1 // indirect
github.com/go-playground/validator/v10 v10.2.0
github.com/golang/mock v1.4.3
github.com/golang/protobuf v1.4.1
github.com/golang/protobuf v1.4.2
github.com/google/martian v2.1.1-0.20190517191504-25dcb96d9e51+incompatible // indirect
github.com/google/uuid v1.1.1
github.com/gophercloud/gophercloud v0.12.1-0.20200821143728-362eb785d617
Expand All @@ -49,13 +50,13 @@ require (
github.com/mitchellh/cli v1.1.1
github.com/openshift-metal3/terraform-provider-ironic v0.2.3
github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
github.com/openshift/client-go v0.0.0-20200320150128-a906f3d8e723
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
github.com/openshift/cluster-api v0.0.0-20191129101638-b09907ac6668
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200120152131-1b09fd9e7156
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20200504092944-27473ea1ae43
github.com/openshift/library-go v0.0.0-20200324092245-db2a8546af81
github.com/openshift/library-go v0.0.0-20200831114015-2ab0c61c15de
github.com/openshift/machine-api-operator v0.2.1-0.20200429102619-d36974451290
github.com/openshift/machine-config-operator v0.0.0
github.com/ovirt/go-ovirt v0.0.0-20200613023950-320a86f9df27
Expand All @@ -65,14 +66,14 @@ require (
github.com/pierrec/lz4 v2.3.0+incompatible // indirect
github.com/pkg/errors v0.9.1
github.com/pkg/sftp v1.10.1
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/common v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/prometheus/common v0.10.0
github.com/satori/uuid v1.2.0 // indirect
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
github.com/sirupsen/logrus v1.5.0
github.com/spf13/cobra v0.0.6
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/stoewer/go-strcase v1.1.0 // indirect
github.com/stretchr/testify v1.5.1
github.com/stretchr/testify v1.6.1
github.com/terraform-provider-openstack/terraform-provider-openstack v1.32.0
github.com/terraform-providers/terraform-provider-aws v0.0.0
github.com/terraform-providers/terraform-provider-azurerm v0.0.0
Expand All @@ -85,23 +86,22 @@ require (
github.com/vincent-petithory/dataurl v0.0.0-20191104211930-d1553a71de50
github.com/vmware/govmomi v0.22.2
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20200509044756-6aff5f38e54f
golang.org/x/text v0.3.3 // indirect
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
google.golang.org/api v0.25.0
google.golang.org/genproto v0.0.0-20200507105951-43844f6eee31
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013
google.golang.org/grpc v1.29.1
gopkg.in/AlecAivazis/survey.v1 v1.8.9-0.20200217094205-6773bdf39b7f
gopkg.in/ini.v1 v1.51.0
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.18.3
k8s.io/apiextensions-apiserver v0.18.2
k8s.io/apimachinery v0.18.3
k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog v1.0.0
k8s.io/utils v0.0.0-20200327001022-6496210b90e8
k8s.io/klog/v2 v2.3.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
sigs.k8s.io/cluster-api-provider-aws v0.0.0
sigs.k8s.io/cluster-api-provider-azure v0.0.0
sigs.k8s.io/cluster-api-provider-openstack v0.0.0
Expand All @@ -118,35 +118,15 @@ replace (
github.com/metal3-io/baremetal-operator => github.com/openshift/baremetal-operator v0.0.0-20200715132148-0f91f62a41fe // Use OpenShift fork
github.com/metal3-io/cluster-api-provider-baremetal => github.com/openshift/cluster-api-provider-baremetal v0.0.0-20190821174549-a2a477909c1d // Pin OpenShift fork
github.com/openshift/api => github.com/openshift/api v0.0.0-20200601094953-95abe2d2f422 // Pin API
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200116152001-92a2713fa240 // Pin client-go
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20200721120235-b3b074ee9156 // Pin MCO so it doesn't get downgraded
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200929181438-91d71ef2122c // Pin client-go
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 // Pin MCO so it doesn't get downgraded
github.com/terraform-providers/terraform-provider-aws => github.com/openshift/terraform-provider-aws v1.60.1-0.20200630224953-76d1fb4e5699 // Pin to openshift fork with tag v2.67.0-openshift
github.com/terraform-providers/terraform-provider-azurerm => github.com/openshift/terraform-provider-azurerm v1.40.1-0.20200707062554-97ea089cc12a // release-2.17.0 branch
github.com/terraform-providers/terraform-provider-ignition/v2 => github.com/community-terraform-providers/terraform-provider-ignition/v2 v2.1.0
github.com/terraform-providers/terraform-provider-vsphere => github.com/openshift/terraform-provider-vsphere v1.18.1-openshift-2
github.com/vmware/govmomi => github.com/vmware/govmomi v0.22.2-0.20200420222347-5fceac570f29
k8s.io/api => k8s.io/api v0.17.1 // Replaced by MCO/CRI-O
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.17.1 // Replaced by MCO/CRI-O
k8s.io/apimachinery => k8s.io/apimachinery v0.17.1 // Replaced by MCO/CRI-O
k8s.io/apiserver => k8s.io/apiserver v0.17.1 // Replaced by MCO/CRI-O
k8s.io/cli-runtime => k8s.io/cli-runtime v0.17.1 // Replaced by MCO/CRI-O
k8s.io/client-go => k8s.io/client-go v0.17.1 // Replaced by MCO/CRI-O
k8s.io/cloud-provider => k8s.io/cloud-provider v0.17.1 // Replaced by MCO/CRI-O
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.17.1 // Replaced by MCO/CRI-O
k8s.io/code-generator => k8s.io/code-generator v0.17.1 // Replaced by MCO/CRI-O
k8s.io/component-base => k8s.io/component-base v0.17.1 // Replaced by MCO/CRI-O
k8s.io/cri-api => k8s.io/cri-api v0.17.1 // Replaced by MCO/CRI-O
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kube-proxy => k8s.io/kube-proxy v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kubectl => k8s.io/kubectl v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kubelet => k8s.io/kubelet v0.17.1 // Replaced by MCO/CRI-O
k8s.io/kubernetes => k8s.io/kubernetes v1.17.1 // Replaced by MCO/CRI-O
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.17.1 // Replaced by MCO/CRI-O
k8s.io/metrics => k8s.io/metrics v0.17.1 // Replaced by MCO/CRI-O
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.17.1 // Replaced by MCO/CRI-O
k8s.io/api => k8s.io/api v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20200506073438-9d49428ff837 // Pin OpenShift fork
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20200120114645-8a9592f1f87b // Pin OpenShift fork
sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.0.0-20200526112135-319a35b2e38e // Pin OpenShift fork
Expand Down

0 comments on commit dfdc5ef

Please sign in to comment.