From 113377cdd2de0980ecbcbc07b30c480c740dd361 Mon Sep 17 00:00:00 2001 From: Ciprian Hacman Date: Fri, 10 Jun 2022 13:59:28 +0300 Subject: [PATCH] Completely remove core addons --- cmd/kops/integration_test.go | 2 -- .../resources/addons/core.addons.k8s.io/v1.4.0.yaml | 0 .../bootstrapchannelbuilder.go | 12 ------------ 3 files changed, 14 deletions(-) delete mode 100644 upup/models/cloudup/resources/addons/core.addons.k8s.io/v1.4.0.yaml diff --git a/cmd/kops/integration_test.go b/cmd/kops/integration_test.go index 9d7caa1466..771f143383 100644 --- a/cmd/kops/integration_test.go +++ b/cmd/kops/integration_test.go @@ -1173,7 +1173,6 @@ func (i *integrationTest) runTestTerraformAWS(t *testing.T) { "aws_s3_object_manifests-static-kube-apiserver-healthcheck_content", "aws_s3_object_nodeupconfig-nodes_content", "aws_s3_object_"+i.clusterName+"-addons-bootstrap_content", - "aws_s3_object_"+i.clusterName+"-addons-core.addons.k8s.io_content", "aws_s3_object_"+i.clusterName+"-addons-kops-controller.addons.k8s.io-k8s-1.16_content", "aws_s3_object_"+i.clusterName+"-addons-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content", "aws_s3_object_"+i.clusterName+"-addons-limit-range.addons.k8s.io_content", @@ -1307,7 +1306,6 @@ func (i *integrationTest) runTestTerraformGCE(t *testing.T) { "aws_s3_object_manifests-static-kube-apiserver-healthcheck_content", "aws_s3_object_nodeupconfig-nodes_content", "aws_s3_object_"+i.clusterName+"-addons-bootstrap_content", - "aws_s3_object_"+i.clusterName+"-addons-core.addons.k8s.io_content", "aws_s3_object_"+i.clusterName+"-addons-coredns.addons.k8s.io-k8s-1.12_content", "aws_s3_object_"+i.clusterName+"-addons-kops-controller.addons.k8s.io-k8s-1.16_content", "aws_s3_object_"+i.clusterName+"-addons-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content", diff --git a/upup/models/cloudup/resources/addons/core.addons.k8s.io/v1.4.0.yaml b/upup/models/cloudup/resources/addons/core.addons.k8s.io/v1.4.0.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go index 9956992a01..6af14d26f0 100644 --- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go +++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go @@ -325,18 +325,6 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*Addon } } - { - key := "core.addons.k8s.io" - version := "1.4.0" - location := key + "/v" + version + ".yaml" - - addons.Add(&channelsapi.AddonSpec{ - Name: fi.String(key), - Selector: map[string]string{"k8s-addon": key}, - Manifest: fi.String(location), - }) - } - // @check if podsecuritypolicies are enabled and if so, push the default kube-system policy if b.Cluster.Spec.KubeAPIServer != nil && b.Cluster.Spec.KubeAPIServer.HasAdmissionController("PodSecurityPolicy") { key := "podsecuritypolicy.addons.k8s.io"