From 1e8b9b53af371b6cb42a54d29b7cae38bc8958f3 Mon Sep 17 00:00:00 2001 From: Christian Bianchi Date: Wed, 11 Jan 2023 15:32:12 +0100 Subject: [PATCH] Bump k8scc to support k8s 1.24. (#1694) * Bump k8scc to support k8s 1.24. * bump k8scc * bump k8scc * bump 8scc --- CHANGELOG.md | 4 ++++ go.mod | 4 ++-- go.sum | 8 ++++---- .../controller/azureconfig/handler/blobobject/desired.go | 2 +- .../controller/azuremachinepool/handler/spark/create.go | 2 +- service/controller/cloudconfig/cloud_config.go | 2 +- service/controller/cloudconfig/master_template.go | 8 +++----- service/controller/cloudconfig/types.go | 2 +- service/controller/cloudconfig/worker_template.go | 3 +-- service/controller/key/key.go | 2 +- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65b754f7a4..6f71c6f038 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Bump k8scc to support k8s 1.24. + ## [6.0.3] - 2022-10-11 ### Fixed diff --git a/go.mod b/go.mod index 96a732ce6c..aaf7f0180b 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/giantswarm/exporterkit v1.0.0 github.com/giantswarm/ipam v0.3.0 github.com/giantswarm/k8sclient/v7 v7.0.1 - github.com/giantswarm/k8scloudconfig/v14 v14.5.2 + github.com/giantswarm/k8scloudconfig/v15 v15.4.0 github.com/giantswarm/k8smetadata v0.9.3 github.com/giantswarm/kubelock/v2 v2.0.0 github.com/giantswarm/microendpoint v1.0.0 @@ -110,7 +110,7 @@ require ( go.opentelemetry.io/otel v1.3.0 // indirect go.opentelemetry.io/otel/trace v1.3.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect - golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect diff --git a/go.sum b/go.sum index aab8ad1a61..dad0a45081 100644 --- a/go.sum +++ b/go.sum @@ -396,8 +396,8 @@ github.com/giantswarm/ipam v0.3.0/go.mod h1:xG4cMEKwHlbE0aZ7x2H5j7o81U13LIStA73X github.com/giantswarm/k8sclient/v4 v4.0.0/go.mod h1:jTwQ8q0YbJJu3ZxbjoI6hkXeuvKm15xyI/c+zwxnUH0= github.com/giantswarm/k8sclient/v7 v7.0.1 h1:UmRwgsw5Uda27tpIblPo7nWjp/nq5qwqxEPHWcvzsHk= github.com/giantswarm/k8sclient/v7 v7.0.1/go.mod h1:zJTXammjLHSiukMIO4+a6eUDgzj/lJxEXFZ22mC0WXc= -github.com/giantswarm/k8scloudconfig/v14 v14.5.2 h1:tnZCKbKIvGLYN57lp0rDEhOgoe8p8ptVacu/nbB53pw= -github.com/giantswarm/k8scloudconfig/v14 v14.5.2/go.mod h1:XYSG+atEtJq4qablG3KWKe1fpiaS9KZCy66QzsFTyow= +github.com/giantswarm/k8scloudconfig/v15 v15.4.0 h1:bv92A4t7BjpR3WiHLx75wgmwThv5w61P476RojPvnQQ= +github.com/giantswarm/k8scloudconfig/v15 v15.4.0/go.mod h1:U/8wnDDk6aiL7g81AtB0dfnyJjiubJNlaUgBakHRgNo= github.com/giantswarm/k8smetadata v0.9.3 h1:YJJ5NJzjIQImNZc96ia2zh1PEkMt9+G+HalA8ZL8qxQ= github.com/giantswarm/k8smetadata v0.9.3/go.mod h1:k3DYCMdspxhk7efLkQdX1b8UZ71ijOCG3ZoIU8+5xgw= github.com/giantswarm/kubelock/v2 v2.0.0 h1:s5mJc32HD0cX7hRS3sZ+d0J7d7g9CZtz9uxyDv+24II= @@ -1363,8 +1363,8 @@ golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y= -golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/service/controller/azureconfig/handler/blobobject/desired.go b/service/controller/azureconfig/handler/blobobject/desired.go index f08ef18aaf..2d83eb9d1f 100644 --- a/service/controller/azureconfig/handler/blobobject/desired.go +++ b/service/controller/azureconfig/handler/blobobject/desired.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" "golang.org/x/sync/errgroup" diff --git a/service/controller/azuremachinepool/handler/spark/create.go b/service/controller/azuremachinepool/handler/spark/create.go index db07029d5d..809c47bedd 100644 --- a/service/controller/azuremachinepool/handler/spark/create.go +++ b/service/controller/azuremachinepool/handler/spark/create.go @@ -16,7 +16,7 @@ import ( corev1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/core/v1alpha1" providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" releasev1alpha1 "github.com/giantswarm/release-operator/v3/api/v1alpha1" diff --git a/service/controller/cloudconfig/cloud_config.go b/service/controller/cloudconfig/cloud_config.go index 12dae46f84..4379ba6964 100644 --- a/service/controller/cloudconfig/cloud_config.go +++ b/service/controller/cloudconfig/cloud_config.go @@ -2,7 +2,7 @@ package cloudconfig import ( "github.com/Azure/go-autorest/autorest/azure/auth" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" ctrl "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/cloudconfig/master_template.go b/service/controller/cloudconfig/master_template.go index 6ac017d69a..d973b1623c 100644 --- a/service/controller/cloudconfig/master_template.go +++ b/service/controller/cloudconfig/master_template.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/giantswarm/apiextensions/v6/pkg/annotation" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" @@ -15,9 +15,8 @@ import ( ) const ( - defaultEtcdPort = 2379 - defaultImagePullProgressDeadline = "1m" - EtcdInitialClusterStateNew = "new" + defaultEtcdPort = 2379 + EtcdInitialClusterStateNew = "new" encryptionConfigFilePath = "/etc/kubernetes/encryption/k8s-encryption-config.yaml" ) @@ -50,7 +49,6 @@ func (c CloudConfig) NewMasterTemplate(ctx context.Context, data IgnitionTemplat params.Cluster = data.CustomObject.Spec.Cluster params.CalicoPolicyOnly = true params.DockerhubToken = c.dockerhubToken - params.ImagePullProgressDeadline = defaultImagePullProgressDeadline params.DisableIngressControllerService = true params.Etcd.ClientPort = defaultEtcdPort params.Etcd.HighAvailability = false diff --git a/service/controller/cloudconfig/types.go b/service/controller/cloudconfig/types.go index effe822c45..88a20082d5 100644 --- a/service/controller/cloudconfig/types.go +++ b/service/controller/cloudconfig/types.go @@ -3,7 +3,7 @@ package cloudconfig import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" capi "sigs.k8s.io/cluster-api/api/v1beta1" diff --git a/service/controller/cloudconfig/worker_template.go b/service/controller/cloudconfig/worker_template.go index c792dd0ede..9a8e676c89 100644 --- a/service/controller/cloudconfig/worker_template.go +++ b/service/controller/cloudconfig/worker_template.go @@ -5,7 +5,7 @@ import ( "encoding/base64" "fmt" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" @@ -56,7 +56,6 @@ func (c CloudConfig) NewWorkerTemplate(ctx context.Context, data IgnitionTemplat } params.DockerhubToken = c.dockerhubToken params.Images = data.Images - params.ImagePullProgressDeadline = defaultImagePullProgressDeadline params.RegistryMirrors = c.registryMirrors params.Versions = data.Versions params.SSOPublicKey = c.ssoPublicKey diff --git a/service/controller/key/key.go b/service/controller/key/key.go index b837c53960..62cc95e57e 100644 --- a/service/controller/key/key.go +++ b/service/controller/key/key.go @@ -12,7 +12,7 @@ import ( "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" apiextensionslabels "github.com/giantswarm/apiextensions/v6/pkg/label" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v14/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" k8smetaannotation "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" v1 "k8s.io/api/core/v1"