From 01ea2cf35fd699534fa2e489c8dba515dd8cff51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nick=20J=C3=BCttner?= Date: Fri, 9 Jun 2023 13:55:42 +0200 Subject: [PATCH] Remove CSIMigration flag (#3561) * remove csimigration flag * nancy * update k8scloudconfig to v17 --- .nancy-ignore | 1 + CHANGELOG.md | 4 ++++ go.mod | 2 +- go.sum | 4 ++-- service/internal/cloudconfig/tccpn.go | 3 +-- service/internal/cloudconfig/tccpn_extension.go | 2 +- service/internal/cloudconfig/tcnp.go | 3 +-- service/internal/cloudconfig/tcnp_extension.go | 2 +- service/internal/images/images.go | 2 +- service/internal/images/spec.go | 2 +- service/internal/unittest/default_images.go | 2 +- 11 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.nancy-ignore b/.nancy-ignore index fda5de853a..47bffea61f 100644 --- a/.nancy-ignore +++ b/.nancy-ignore @@ -29,3 +29,4 @@ CVE-2020-8561 CVE-2023-25809 CVE-2023-28642 CVE-2023-26125 +CVE-2023-29401 diff --git a/CHANGELOG.md b/CHANGELOG.md index 24a97d6c25..29a61705bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Removed + +- Remove CSIMigration feature flag (enabled by default with k8s 1.23). + ## [14.17.1] - 2023-05-11 ### Added diff --git a/go.mod b/go.mod index 2120b60611..11cee1e92c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/giantswarm/certs/v4 v4.0.0 github.com/giantswarm/ipam v0.3.0 github.com/giantswarm/k8sclient/v7 v7.0.1 - github.com/giantswarm/k8scloudconfig/v16 v16.2.0 + github.com/giantswarm/k8scloudconfig/v17 v17.1.0 github.com/giantswarm/k8smetadata v0.20.0 github.com/giantswarm/kubelock/v4 v4.0.0 github.com/giantswarm/microendpoint v1.0.0 diff --git a/go.sum b/go.sum index 97f1b4ddd1..cfa2f833ec 100644 --- a/go.sum +++ b/go.sum @@ -232,8 +232,8 @@ github.com/giantswarm/ipam v0.3.0 h1:QNb4k5Zu6nGsqJkAM7dLM1J6TiUP+LGjo9CPR+ewZBk github.com/giantswarm/ipam v0.3.0/go.mod h1:xG4cMEKwHlbE0aZ7x2H5j7o81U13LIStA73XCECdk+I= 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/v16 v16.2.0 h1:10CurD+EPF7ALoqyZCvqKG1jZ6hLWlH/B8XFugmSRdo= -github.com/giantswarm/k8scloudconfig/v16 v16.2.0/go.mod h1:9QNKXwjyBCWup2ek+kRZ356zw38QhQ2QgwuHuK9zzQo= +github.com/giantswarm/k8scloudconfig/v17 v17.1.0 h1:QggvIFWT7pvJzPcFBEr7wHG3peZldPOJhzgLu2Yfogo= +github.com/giantswarm/k8scloudconfig/v17 v17.1.0/go.mod h1:peChY0p9SloYvoQfx5zCXIU6T//QdkG4y8LgFEWyuE4= github.com/giantswarm/k8smetadata v0.20.0 h1:wvKD2SkFsNxQkbnvRbq/e2DHVqoQVeNxehGOmcIdTL8= github.com/giantswarm/k8smetadata v0.20.0/go.mod h1:QiQAyaZnwco1U0lENLF0Kp4bSN4dIPwIlHWEvUo3ES8= github.com/giantswarm/kubelock/v4 v4.0.0 h1:qvFGOIlDthAD8r32WcorT8R4gp3c1dpnDbHuLsDU2ZA= diff --git a/service/internal/cloudconfig/tccpn.go b/service/internal/cloudconfig/tccpn.go index 22c236aa6b..3db35ef2af 100644 --- a/service/internal/cloudconfig/tccpn.go +++ b/service/internal/cloudconfig/tccpn.go @@ -10,7 +10,7 @@ import ( "github.com/blang/semver" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys/v3" @@ -499,7 +499,6 @@ func (t *TCCPN) newTemplate(ctx context.Context, obj interface{}, mapping hamast // It gets created by the Ingress Controller app if it is installed in the tenant cluster. params.DisableIngressControllerService = true params.DockerhubToken = t.config.DockerhubToken - params.EnableCSIMigrationAWS = true params.Etcd = k8scloudconfig.Etcd{ ClientPort: key.EtcdPort, InitialClusterState: etcdInitialClusterState, diff --git a/service/internal/cloudconfig/tccpn_extension.go b/service/internal/cloudconfig/tccpn_extension.go index 6e8c4d3459..aa12c4e278 100644 --- a/service/internal/cloudconfig/tccpn_extension.go +++ b/service/internal/cloudconfig/tccpn_extension.go @@ -7,7 +7,7 @@ import ( "github.com/blang/semver" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" diff --git a/service/internal/cloudconfig/tcnp.go b/service/internal/cloudconfig/tcnp.go index c4fd7cfd27..7e52f2253a 100644 --- a/service/internal/cloudconfig/tcnp.go +++ b/service/internal/cloudconfig/tcnp.go @@ -8,7 +8,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys/v3" @@ -228,7 +228,6 @@ func (t *TCNP) NewTemplates(ctx context.Context, obj interface{}) ([]string, err params.Cluster = g8sConfig.Cluster params.DockerhubToken = t.config.DockerhubToken - params.EnableCSIMigrationAWS = true params.Extension = &TCNPExtension{ awsConfigSpec: cmaClusterToG8sConfig(t.config, cl, key.KubeletLabelsTCNP(&cr)), cc: cc, diff --git a/service/internal/cloudconfig/tcnp_extension.go b/service/internal/cloudconfig/tcnp_extension.go index ccdadd820c..7a0db6d798 100644 --- a/service/internal/cloudconfig/tcnp_extension.go +++ b/service/internal/cloudconfig/tcnp_extension.go @@ -7,7 +7,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" g8sv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" diff --git a/service/internal/images/images.go b/service/internal/images/images.go index dcd0874d0e..281ff3ed6c 100644 --- a/service/internal/images/images.go +++ b/service/internal/images/images.go @@ -5,7 +5,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/k8sclient/v7/pkg/k8sclient" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/microerror" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/service/internal/images/spec.go b/service/internal/images/spec.go index ae1636b5c6..a07bd1a3fb 100644 --- a/service/internal/images/spec.go +++ b/service/internal/images/spec.go @@ -3,7 +3,7 @@ package images import ( "context" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" ) type Interface interface { diff --git a/service/internal/unittest/default_images.go b/service/internal/unittest/default_images.go index 68d11bb43b..a140c4bf24 100644 --- a/service/internal/unittest/default_images.go +++ b/service/internal/unittest/default_images.go @@ -1,6 +1,6 @@ package unittest -import k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" +import k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" func DefaultImages() k8scloudconfig.Images { return k8scloudconfig.Images{