mirror of https://github.com/kubernetes/kops.git
Completely remove core addons
This commit is contained in:
parent
81368448c3
commit
113377cdd2
|
|
@ -1173,7 +1173,6 @@ func (i *integrationTest) runTestTerraformAWS(t *testing.T) {
|
||||||
"aws_s3_object_manifests-static-kube-apiserver-healthcheck_content",
|
"aws_s3_object_manifests-static-kube-apiserver-healthcheck_content",
|
||||||
"aws_s3_object_nodeupconfig-nodes_content",
|
"aws_s3_object_nodeupconfig-nodes_content",
|
||||||
"aws_s3_object_"+i.clusterName+"-addons-bootstrap_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-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-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content",
|
||||||
"aws_s3_object_"+i.clusterName+"-addons-limit-range.addons.k8s.io_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_manifests-static-kube-apiserver-healthcheck_content",
|
||||||
"aws_s3_object_nodeupconfig-nodes_content",
|
"aws_s3_object_nodeupconfig-nodes_content",
|
||||||
"aws_s3_object_"+i.clusterName+"-addons-bootstrap_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-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-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-kubelet-api.rbac.addons.k8s.io-k8s-1.9_content",
|
||||||
|
|
|
||||||
|
|
@ -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
|
// @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") {
|
if b.Cluster.Spec.KubeAPIServer != nil && b.Cluster.Spec.KubeAPIServer.HasAdmissionController("PodSecurityPolicy") {
|
||||||
key := "podsecuritypolicy.addons.k8s.io"
|
key := "podsecuritypolicy.addons.k8s.io"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue