From 0c696d41d369b38f10d4ebdec479116a89316ae5 Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 19 Nov 2021 09:33:19 -0500 Subject: [PATCH 1/3] Create supporting services in kops-controller for gossip-mode The intent is that we can then expose these via CoreDNS, so that internal name resolution will work. --- go.mod | 2 +- pkg/apis/kops/labels.go | 4 + pkg/kubemanifest/BUILD.bazel | 3 + pkg/kubemanifest/yaml.go | 69 +++++++++ pkg/model/components/etcdmanager/model.go | 81 ++++++++--- .../kopscontroller/template_functions.go | 132 ++++++++++++++++++ .../k8s-1.16.yaml.template | 5 + upup/pkg/fi/cloudup/BUILD.bazel | 2 + upup/pkg/fi/cloudup/template_functions.go | 7 +- 9 files changed, 283 insertions(+), 22 deletions(-) create mode 100644 pkg/kubemanifest/yaml.go create mode 100644 pkg/model/components/kopscontroller/template_functions.go diff --git a/go.mod b/go.mod index 8a77e93b9e..876067d918 100644 --- a/go.mod +++ b/go.mod @@ -80,6 +80,7 @@ require ( gopkg.in/gcfg.v1 v1.2.3 gopkg.in/inf.v0 v0.9.1 gopkg.in/square/go-jose.v2 v2.5.1 + gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.7.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 @@ -225,7 +226,6 @@ require ( google.golang.org/protobuf v1.27.1 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/apiextensions-apiserver v0.22.2 // indirect k8s.io/cloud-provider v0.22.2 // indirect diff --git a/pkg/apis/kops/labels.go b/pkg/apis/kops/labels.go index affaeb8c99..15513b8ce1 100644 --- a/pkg/apis/kops/labels.go +++ b/pkg/apis/kops/labels.go @@ -28,4 +28,8 @@ const ( // UpdatePolicyExternal is a value for ClusterSpec.UpdatePolicy and InstanceGroup.UpdatePolicy indicating that upgrades are done externally, and we should disable automatic upgrades UpdatePolicyExternal = "external" + + // DiscoveryLabelKey is the label we use for services that should be exposed internally. + // Endpoints get the same labels as their services. + DiscoveryLabelKey = "discovery.kops.k8s.io/internal-name" ) diff --git a/pkg/kubemanifest/BUILD.bazel b/pkg/kubemanifest/BUILD.bazel index 35e1a02559..ff75b28753 100644 --- a/pkg/kubemanifest/BUILD.bazel +++ b/pkg/kubemanifest/BUILD.bazel @@ -9,13 +9,16 @@ go_library( "priority.go", "visitor.go", "volumes.go", + "yaml.go", ], importpath = "k8s.io/kops/pkg/kubemanifest", visibility = ["//visibility:public"], deps = [ "//util/pkg/text:go_default_library", + "//vendor/gopkg.in/yaml.v2:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/sigs.k8s.io/yaml:go_default_library", ], diff --git a/pkg/kubemanifest/yaml.go b/pkg/kubemanifest/yaml.go new file mode 100644 index 0000000000..c5df2b0ef1 --- /dev/null +++ b/pkg/kubemanifest/yaml.go @@ -0,0 +1,69 @@ +/* +Copyright 2021 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package kubemanifest + +import ( + "encoding/json" + "fmt" + + yamlv2 "gopkg.in/yaml.v2" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/klog/v2" +) + +// KubeObjectToApplyYAML returns the kubernetes object converted to YAML, with "noisy" fields removed. +// +// We remove: +// * status (can't be applied, shouldn't be specified) +// * metadata.creationTimestamp (can't be applied, shouldn't be specified) +func KubeObjectToApplyYAML(data runtime.Object) (string, error) { + // This logic is inlined sigs.k8s.io/yaml.Marshal, but we delete some fields in the middle. + + // Convert the object to JSON bytes + j, err := json.Marshal(data) + if err != nil { + return "", fmt.Errorf("error marshaling into JSON: %v", err) + } + + // Convert the JSON to a map. + jsonObj := make(map[string]interface{}) + if err := yamlv2.Unmarshal(j, &jsonObj); err != nil { + return "", err + } + + // Remove status (can't be applied, shouldn't be specified) + delete(jsonObj, "status") + + // Remove metadata.creationTimestamp (can't be applied, shouldn't be specified) + metadataObj, found := jsonObj["metadata"] + if found { + if metadata, ok := metadataObj.(map[interface{}]interface{}); ok { + delete(metadata, "creationTimestamp") + } else { + klog.Warningf("unexpected type for object metadata: %T", metadataObj) + } + } else { + klog.Warningf("object did not have metadata: %#v", jsonObj) + } + + // Marshal the cleaned-up map into YAML. + y, err := yamlv2.Marshal(jsonObj) + if err != nil { + return "", err + } + return string(y), nil +} diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go index 7ac89ee360..faa6f43af6 100644 --- a/pkg/model/components/etcdmanager/model.go +++ b/pkg/model/components/etcdmanager/model.go @@ -265,10 +265,8 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod } else { clientHost = "__name__" } - clientPort := 4001 clusterName := "etcd-" + etcdCluster.Name - peerPort := 2380 backupStore := "" if etcdCluster.Backups != nil { backupStore = etcdCluster.Backups.BackupStore @@ -287,12 +285,9 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod if pod.Labels == nil { pod.Labels = make(map[string]string) } - pod.Labels["k8s-app"] = pod.Name - - // TODO: Use a socket file for the quarantine port - quarantinedClientPort := wellknownports.EtcdMainQuarantinedClientPort - - grpcPort := wellknownports.EtcdMainGRPC + for k, v := range SelectorForCluster(etcdCluster) { + pod.Labels[k] = v + } // The dns suffix logic mirrors the existing logic, so we should be compatible with existing clusters // (etcd makes it difficult to change peer urls, treating it as a cluster event, for reasons unknown) @@ -307,20 +302,19 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod dnsInternalSuffix = ".internal." + b.Cluster.ObjectMeta.Name } + ports, err := PortsForCluster(etcdCluster) + if err != nil { + return nil, err + } + switch etcdCluster.Name { case "main": clusterName = "etcd" case "events": - clientPort = 4002 - peerPort = 2381 - grpcPort = wellknownports.EtcdEventsGRPC - quarantinedClientPort = wellknownports.EtcdEventsQuarantinedClientPort + // ok + case "cilium": - clientPort = 4003 - peerPort = 2382 - grpcPort = wellknownports.EtcdCiliumGRPC - quarantinedClientPort = wellknownports.EtcdCiliumQuarantinedClientPort if !featureflag.APIServerNodes.Enabled() { clientHost = b.Cluster.Spec.MasterInternalName } @@ -343,7 +337,7 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod Containerized: true, ClusterName: clusterName, BackupStore: backupStore, - GrpcPort: grpcPort, + GrpcPort: ports.GRPCPort, DNSSuffix: dnsInternalSuffix, } @@ -361,9 +355,9 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec) (*v1.Pod { scheme := "https" - config.PeerUrls = fmt.Sprintf("%s://__name__:%d", scheme, peerPort) - config.ClientUrls = fmt.Sprintf("%s://%s:%d", scheme, clientHost, clientPort) - config.QuarantineClientUrls = fmt.Sprintf("%s://__name__:%d", scheme, quarantinedClientPort) + config.PeerUrls = fmt.Sprintf("%s://__name__:%d", scheme, ports.PeerPort) + config.ClientUrls = fmt.Sprintf("%s://%s:%d", scheme, clientHost, ports.ClientPort) + config.QuarantineClientUrls = fmt.Sprintf("%s://__name__:%d", scheme, ports.QuarantinedGRPCPort) // TODO: We need to wire these into the etcd-manager spec // // add timeout/heartbeat settings @@ -573,3 +567,50 @@ type config struct { VolumeNameTag string `flag:"volume-name-tag"` DNSSuffix string `flag:"dns-suffix"` } + +// SelectorForCluster returns the selector that should be used to select our pods (from services) +func SelectorForCluster(etcdCluster kops.EtcdClusterSpec) map[string]string { + return map[string]string{ + "k8s-app": "etcd-manager-" + etcdCluster.Name, + } +} + +type Ports struct { + ClientPort int + PeerPort int + GRPCPort int + QuarantinedGRPCPort int +} + +// PortsForCluster returns the ports that the cluster users. +func PortsForCluster(etcdCluster kops.EtcdClusterSpec) (Ports, error) { + switch etcdCluster.Name { + case "main": + return Ports{ + GRPCPort: wellknownports.EtcdMainGRPC, + // TODO: Use a socket file for the quarantine port + QuarantinedGRPCPort: wellknownports.EtcdMainQuarantinedClientPort, + ClientPort: 4001, + PeerPort: 2380, + }, nil + + case "events": + return Ports{ + GRPCPort: wellknownports.EtcdEventsGRPC, + QuarantinedGRPCPort: wellknownports.EtcdEventsQuarantinedClientPort, + ClientPort: 4002, + PeerPort: 2381, + }, nil + case "cilium": + return Ports{ + GRPCPort: wellknownports.EtcdCiliumGRPC, + QuarantinedGRPCPort: wellknownports.EtcdCiliumQuarantinedClientPort, + ClientPort: 4003, + PeerPort: 2382, + }, nil + + default: + return Ports{}, fmt.Errorf("unknown etcd cluster key %q", etcdCluster.Name) + } + +} diff --git a/pkg/model/components/kopscontroller/template_functions.go b/pkg/model/components/kopscontroller/template_functions.go new file mode 100644 index 0000000000..0ce48fe986 --- /dev/null +++ b/pkg/model/components/kopscontroller/template_functions.go @@ -0,0 +1,132 @@ +/* +Copyright 2021 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package kopscontroller + +import ( + "text/template" + + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/kops/pkg/apis/kops" + "k8s.io/kops/pkg/dns" + "k8s.io/kops/pkg/featureflag" + "k8s.io/kops/pkg/model/components/etcdmanager" + "k8s.io/kops/pkg/wellknownports" +) + +// AddTemplateFunctions registers template functions for KopsController +func AddTemplateFunctions(cluster *kops.Cluster, dest template.FuncMap) { + t := &templateFunctions{ + Cluster: cluster, + } + dest["KopsController"] = func() *templateFunctions { + return t + } +} + +// templateFunctions implements the KopsController template object helper. +type templateFunctions struct { + Cluster *kops.Cluster +} + +// KopsControllerConfig returns the yaml configuration for kops-controller +func (t *templateFunctions) GossipServices() ([]*corev1.Service, error) { + if !dns.IsGossipHostname(t.Cluster.Name) { + return nil, nil + } + + suffix := t.Cluster.Name + + var services []*corev1.Service + + // api service + { + service := buildHeadlessService(types.NamespacedName{Name: "api-internal", Namespace: "kube-system"}) + service.Spec.Ports = []corev1.ServicePort{ + {Name: "https", Port: 443, Protocol: corev1.ProtocolTCP}, + } + service.Spec.Selector = map[string]string{ + "k8s-app": "kops-controller", + } + service.Labels = map[string]string{ + kops.DiscoveryLabelKey: "api.internal." + suffix, + } + services = append(services, service) + } + + // kops-controller service + { + service := buildHeadlessService(types.NamespacedName{Name: "kops-controller-internal", Namespace: "kube-system"}) + service.Spec.Ports = []corev1.ServicePort{ + {Name: "https", Port: wellknownports.KopsControllerPort, Protocol: corev1.ProtocolTCP}, + } + service.Spec.Selector = map[string]string{ + "k8s-app": "kops-controller", + } + service.Labels = map[string]string{ + kops.DiscoveryLabelKey: "kops-controller.internal." + suffix, + } + services = append(services, service) + } + + // etcd services + if featureflag.APIServerNodes.Enabled() { + for _, etcdCluster := range t.Cluster.Spec.EtcdClusters { + name := "etcd-" + etcdCluster.Name + "-internal" + service := buildHeadlessService(types.NamespacedName{Name: name, Namespace: "kube-system"}) + ports, err := etcdmanager.PortsForCluster(etcdCluster) + if err != nil { + return nil, err + } + service.Spec.Ports = []corev1.ServicePort{ + {Name: "https", Port: int32(ports.ClientPort), Protocol: corev1.ProtocolTCP}, + } + service.Labels = map[string]string{ + kops.DiscoveryLabelKey: etcdCluster.Name + ".etcd." + suffix, + } + service.Spec.Selector = etcdmanager.SelectorForCluster(etcdCluster) + services = append(services, service) + } + } + + // We set the target port, to make applying cleaner + for _, service := range services { + for i := range service.Spec.Ports { + port := &service.Spec.Ports[i] + if port.TargetPort == intstr.FromInt(0) { + port.TargetPort = intstr.FromInt(int(port.Port)) + } + } + } + + return services, nil +} + +// buildHeadlessService is a helper to build a headless service +func buildHeadlessService(name types.NamespacedName) *corev1.Service { + s := &corev1.Service{} + s.APIVersion = "v1" + s.Kind = "Service" + s.Name = name.Name + s.Namespace = name.Namespace + + s.Spec.ClusterIP = corev1.ClusterIPNone + s.Spec.Type = corev1.ServiceTypeClusterIP + + return s +} diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template index da17b13d28..402afb5439 100644 --- a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template @@ -205,3 +205,8 @@ subjects: - apiGroup: rbac.authorization.k8s.io kind: User name: system:serviceaccount:kube-system:kops-controller + +{{- range $service := KopsController.GossipServices }} +--- +{{ KubeObjectToApplyYAML $service }} +{{- end }} diff --git a/upup/pkg/fi/cloudup/BUILD.bazel b/upup/pkg/fi/cloudup/BUILD.bazel index 0408d1f18f..363d6932b5 100644 --- a/upup/pkg/fi/cloudup/BUILD.bazel +++ b/upup/pkg/fi/cloudup/BUILD.bazel @@ -40,12 +40,14 @@ go_library( "//pkg/client/simple:go_default_library", "//pkg/dns:go_default_library", "//pkg/featureflag:go_default_library", + "//pkg/kubemanifest:go_default_library", "//pkg/model:go_default_library", "//pkg/model/alimodel:go_default_library", "//pkg/model/awsmodel:go_default_library", "//pkg/model/azuremodel:go_default_library", "//pkg/model/components:go_default_library", "//pkg/model/components/etcdmanager:go_default_library", + "//pkg/model/components/kopscontroller:go_default_library", "//pkg/model/components/kubeapiserver:go_default_library", "//pkg/model/domodel:go_default_library", "//pkg/model/gcemodel:go_default_library", diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index 14780fc11e..b7f6fcd37d 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -48,7 +48,9 @@ import ( "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/dns" "k8s.io/kops/pkg/featureflag" + "k8s.io/kops/pkg/kubemanifest" "k8s.io/kops/pkg/model" + "k8s.io/kops/pkg/model/components/kopscontroller" "k8s.io/kops/pkg/resources/spotinst" "k8s.io/kops/pkg/wellknownports" "k8s.io/kops/upup/pkg/fi" @@ -72,9 +74,11 @@ type TemplateFunctions struct { func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretStore) (err error) { cluster := tf.Cluster - dest["SharedVPC"] = tf.SharedVPC dest["ToJSON"] = tf.ToJSON dest["ToYAML"] = tf.ToYAML + dest["KubeObjectToApplyYAML"] = kubemanifest.KubeObjectToApplyYAML + + dest["SharedVPC"] = tf.SharedVPC dest["UseBootstrapTokens"] = tf.UseBootstrapTokens // Remember that we may be on a different arch from the target. Hard-code for now. dest["replace"] = func(s, find, replace string) string { @@ -122,6 +126,7 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS dest["KopsControllerArgv"] = tf.KopsControllerArgv dest["KopsControllerConfig"] = tf.KopsControllerConfig + kopscontroller.AddTemplateFunctions(cluster, dest) dest["DnsControllerArgv"] = tf.DNSControllerArgv dest["ExternalDnsArgv"] = tf.ExternalDNSArgv dest["CloudControllerConfigArgv"] = tf.CloudControllerConfigArgv From 613325004651c80a35f43c9a453c0189377782b3 Mon Sep 17 00:00:00 2001 From: justinsb Date: Mon, 20 Sep 2021 08:59:25 -0400 Subject: [PATCH 2/3] gossip: support resolution of k8s.local names from pods We add the hosts plugin to CoreDNS, and we populate a ConfigMap from kops-controller (when in gossip mode). This enables resolution of the internal apiserver DNS name from Pods, even when gossip mode (k8s.local) is in use. This should fix the failing e2e tests which are assuming that the name in the JWT token is resolvable from inside the cluster. This is also a possible step towards a simpler gossip mode, now that we have a central controller. --- cmd/kops-controller/BUILD.bazel | 1 + cmd/kops-controller/controllers/BUILD.bazel | 3 + .../controllers/hosts_controller.go | 183 ++++++++++++++++++ cmd/kops-controller/main.go | 28 +++ cmd/kops-controller/pkg/config/options.go | 9 + .../components/kopscontroller/BUILD.bazel | 18 ++ .../k8s-1.12.yaml.template | 9 +- .../k8s-1.16.yaml.template | 21 ++ upup/pkg/fi/cloudup/template_functions.go | 16 ++ 9 files changed, 285 insertions(+), 3 deletions(-) create mode 100644 cmd/kops-controller/controllers/hosts_controller.go create mode 100644 pkg/model/components/kopscontroller/BUILD.bazel diff --git a/cmd/kops-controller/BUILD.bazel b/cmd/kops-controller/BUILD.bazel index 25904d2a13..9a14ddb598 100644 --- a/cmd/kops-controller/BUILD.bazel +++ b/cmd/kops-controller/BUILD.bazel @@ -21,6 +21,7 @@ go_library( "//vendor/k8s.io/api/coordination/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/client-go/plugin/pkg/client/auth/gcp:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/k8s.io/klog/v2/klogr:go_default_library", diff --git a/cmd/kops-controller/controllers/BUILD.bazel b/cmd/kops-controller/controllers/BUILD.bazel index f7a6040785..c73570a94d 100644 --- a/cmd/kops-controller/controllers/BUILD.bazel +++ b/cmd/kops-controller/controllers/BUILD.bazel @@ -4,6 +4,7 @@ go_library( name = "go_default_library", srcs = [ "awsipam.go", + "hosts_controller.go", "legacy_node_controller.go", "node_controller.go", ], @@ -27,7 +28,9 @@ go_library( "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/client-go/dynamic:go_default_library", "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library", "//vendor/k8s.io/klog/v2:go_default_library", "//vendor/sigs.k8s.io/controller-runtime:go_default_library", diff --git a/cmd/kops-controller/controllers/hosts_controller.go b/cmd/kops-controller/controllers/hosts_controller.go new file mode 100644 index 0000000000..c615f45af7 --- /dev/null +++ b/cmd/kops-controller/controllers/hosts_controller.go @@ -0,0 +1,183 @@ +/* +Copyright 2021 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package controllers + +import ( + "context" + "encoding/json" + "fmt" + "reflect" + "sort" + "strings" + + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime/schema" + "k8s.io/apimachinery/pkg/types" + "k8s.io/client-go/dynamic" + "k8s.io/klog/v2" + "k8s.io/kops/pkg/apis/kops" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" +) + +// HostsReconciler populates an /etc/hosts style file in the CoreDNS config map, +// supporting in-pod resolution of our k8s.local entries. +type HostsReconciler struct { + // configMapID identifies the configmap we should update + configMapID types.NamespacedName + + // client is the controller-runtime client + client client.Client + + // log is a logr + log logr.Logger + + // dynamicClient is a client-go client for patching ConfigMaps + dynamicClient dynamic.Interface + + // lastUpdate holds the last value we updated, to reduce spurious updates. + lastUpdate *managedConfigMap +} + +// NewHostsReconciler is the constructor for a HostsReconciler +func NewHostsReconciler(mgr manager.Manager, configMapID types.NamespacedName) (*HostsReconciler, error) { + r := &HostsReconciler{ + client: mgr.GetClient(), + log: ctrl.Log.WithName("controllers").WithName("Hosts"), + configMapID: configMapID, + } + + dynamicClient, err := dynamic.NewForConfig(mgr.GetConfig()) + if err != nil { + return nil, fmt.Errorf("error building dynamic client: %v", err) + } + r.dynamicClient = dynamicClient + + return r, nil +} + +// +kubebuilder:rbac:groups=,resources=endpoints,verbs=get;list;watch + +// +kubebuilder:rbac:groups=,resources=configmaps,namespace=kube-system,resourceNames=coredns,verbs=get;patch + +// Reconcile is the main reconciler function that observes node changes. +func (r *HostsReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { + _ = r.log.WithValues("endpoints", req.NamespacedName) + + // Although we label the service, the labels get copied to the endpoints by the kube-controller-manager. + endpointsLabels := client.HasLabels([]string{kops.DiscoveryLabelKey}) + + endpointsList := &corev1.EndpointsList{} + + // For security, we only process endpoints in kube-system + if err := r.client.List(ctx, endpointsList, endpointsLabels, client.InNamespace("kube-system")); err != nil { + klog.Warningf("unable to list endpoints: %v", err) + return ctrl.Result{}, err + } + + return ctrl.Result{}, r.updateHosts(ctx, endpointsList) +} + +func (r *HostsReconciler) updateHosts(ctx context.Context, endpointsList *corev1.EndpointsList) error { + addrToHosts := make(map[string][]string) + + for i := range endpointsList.Items { + endpoints := &endpointsList.Items[i] + + hostname := endpoints.Labels[kops.DiscoveryLabelKey] + if hostname == "" { + klog.Warningf("endpoints %s/%s found without discovery label %q; filtering is not working correctly", endpoints.Name, endpoints.Namespace, kops.DiscoveryLabelKey) + continue + } + + for j := range endpoints.Subsets { + subset := &endpoints.Subsets[j] + + for k := range subset.Addresses { + address := &subset.Addresses[k] + + ip := address.IP + if ip != "" { + addrToHosts[ip] = append(addrToHosts[ip], hostname) + } + } + } + } + + return r.updateConfigMap(ctx, addrToHosts) +} + +// managedConfigMap holds the fields we manage +type managedConfigMap struct { + APIVersion string `json:"apiVersion"` + Kind string `json:"kind"` + Data map[string]string `json:"data"` +} + +func (r *HostsReconciler) updateConfigMap(ctx context.Context, addrToHosts map[string][]string) error { + var block []string + for addr, hosts := range addrToHosts { + sort.Strings(hosts) + block = append(block, addr+"\t"+strings.Join(hosts, " ")) + } + // Sort into a consistent order to minimize updates + sort.Strings(block) + + hosts := strings.Join(block, "\n") + + data := &managedConfigMap{} + data.APIVersion = "v1" + data.Kind = "ConfigMap" + data.Data = map[string]string{"hosts": hosts} + + if r.lastUpdate != nil && reflect.DeepEqual(r.lastUpdate, data) { + klog.Infof("skipping hosts configmap update (unchanged): %#v", data) + return nil + } + + klog.Infof("patching hosts configmap: %#v", data) + + configmapGVR := schema.GroupVersionResource{Group: "", Version: "v1", Resource: "configmaps"} + + patch, err := json.Marshal(data) + if err != nil { + return fmt.Errorf("failed to marshal patch: %w", err) + } + + // It is strongly recommended for controllers to always "force" conflicts, since they might not be able to resolve or act on these conflicts. + force := true + patchOpts := metav1.PatchOptions{ + FieldManager: "kops-controller.kops.k8s.io/hosts", + Force: &force, + } + if _, err := r.dynamicClient.Resource(configmapGVR).Namespace(r.configMapID.Namespace).Patch(ctx, r.configMapID.Name, types.ApplyPatchType, patch, patchOpts); err != nil { + return fmt.Errorf("failed to patch configmap: %w", err) + } + + r.lastUpdate = data + + return nil +} + +func (r *HostsReconciler) SetupWithManager(mgr ctrl.Manager) error { + return ctrl.NewControllerManagedBy(mgr). + For(&corev1.Endpoints{}). + Complete(r) +} diff --git a/cmd/kops-controller/main.go b/cmd/kops-controller/main.go index 7410ef5629..dc66c7ff05 100644 --- a/cmd/kops-controller/main.go +++ b/cmd/kops-controller/main.go @@ -24,6 +24,7 @@ import ( coordinationv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/klog/v2" "k8s.io/klog/v2/klogr" @@ -155,6 +156,11 @@ func main() { os.Exit(1) } + if err := addGossipController(mgr, &opt); err != nil { + setupLog.Error(err, "unable to create controller", "controller", "GossipController") + os.Exit(1) + } + // +kubebuilder:scaffold:builder setupLog.Info("starting manager") @@ -241,3 +247,25 @@ func addNodeController(mgr manager.Manager, opt *config.Options) error { return nil } + +func addGossipController(mgr manager.Manager, opt *config.Options) error { + if opt.Discovery == nil || !opt.Discovery.Enabled { + return nil + } + + configMapID := types.NamespacedName{ + Namespace: "kube-system", + Name: "coredns", + } + + controller, err := controllers.NewHostsReconciler(mgr, configMapID) + if err != nil { + return err + } + + if err := controller.SetupWithManager(mgr); err != nil { + return err + } + + return nil +} diff --git a/cmd/kops-controller/pkg/config/options.go b/cmd/kops-controller/pkg/config/options.go index 6b712cccf5..72b7a3a783 100644 --- a/cmd/kops-controller/pkg/config/options.go +++ b/cmd/kops-controller/pkg/config/options.go @@ -29,6 +29,9 @@ type Options struct { // EnableCloudIPAM enables the cloud IPAM controller. EnableCloudIPAM bool `json:"enableCloudIPAM,omitempty"` + + // Discovery configures options relating to discovery, particularly for gossip mode. + Discovery *DiscoveryOptions `json:"discovery,omitempty"` } func (o *Options) PopulateDefaults() { @@ -58,3 +61,9 @@ type ServerProviderOptions struct { AWS *awsup.AWSVerifierOptions `json:"aws,omitempty"` GCE *gcetpm.TPMVerifierOptions `json:"gce,omitempty"` } + +// DiscoveryOptions configures our support for discovery, particularly gossip DNS (i.e. k8s.local) +type DiscoveryOptions struct { + // Enabled specifies whether support for discovery population is enabled. + Enabled bool `json:"enabled"` +} diff --git a/pkg/model/components/kopscontroller/BUILD.bazel b/pkg/model/components/kopscontroller/BUILD.bazel new file mode 100644 index 0000000000..6a814a3356 --- /dev/null +++ b/pkg/model/components/kopscontroller/BUILD.bazel @@ -0,0 +1,18 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["template_functions.go"], + importpath = "k8s.io/kops/pkg/model/components/kopscontroller", + visibility = ["//visibility:public"], + deps = [ + "//pkg/apis/kops:go_default_library", + "//pkg/dns:go_default_library", + "//pkg/featureflag:go_default_library", + "//pkg/model/components/etcdmanager:go_default_library", + "//pkg/wellknownports:go_default_library", + "//vendor/k8s.io/api/core/v1:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", + "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", + ], +) diff --git a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template index ada1a55f4c..06d788d5d0 100644 --- a/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template @@ -76,6 +76,12 @@ data: fallthrough in-addr.arpa ip6.arpa ttl 30 } + {{- if GossipDomains }} + hosts /etc/coredns/hosts {{ join GossipDomains " " }} { + ttl 30 + fallthrough + } + {{- end }} prometheus :9153 forward . {{ or (join KubeDNS.UpstreamNameservers " ") "/etc/resolv.conf" }} { max_concurrent 1000 @@ -192,9 +198,6 @@ spec: - name: config-volume configMap: name: coredns - items: - - key: Corefile - path: Corefile --- apiVersion: v1 kind: Service diff --git a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template index 402afb5439..f819658904 100644 --- a/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template +++ b/upup/models/cloudup/resources/addons/kops-controller.addons.k8s.io/k8s-1.16.yaml.template @@ -125,6 +125,16 @@ rules: - list - watch - patch +{{- if GossipDomains }} +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch +{{- end }} --- @@ -187,6 +197,17 @@ rules: - leases verbs: - create +{{- if GossipDomains }} +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - watch + - patch + resourceNames: [ "coredns" ] +{{- end }} --- diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go index b7f6fcd37d..bae5b5b3c2 100644 --- a/upup/pkg/fi/cloudup/template_functions.go +++ b/upup/pkg/fi/cloudup/template_functions.go @@ -114,6 +114,16 @@ func (tf *TemplateFunctions) AddTo(dest template.FuncMap, secretStore fi.SecretS return cluster.Spec.KubeDNS } + dest["GossipDomains"] = func() []string { + var names []string + + if dns.IsGossipHostname(cluster.Spec.MasterInternalName) { + names = append(names, "k8s.local") + } + + return names + } + dest["NodeLocalDNSClusterIP"] = func() string { if cluster.Spec.KubeProxy.ProxyMode == "ipvs" { return cluster.Spec.KubeDNS.ServerIP @@ -591,6 +601,12 @@ func (tf *TemplateFunctions) KopsControllerConfig() (string, error) { config.EnableCloudIPAM = true } + if dns.IsGossipHostname(cluster.Spec.MasterInternalName) { + config.Discovery = &kopscontrollerconfig.DiscoveryOptions{ + Enabled: true, + } + } + // To avoid indentation problems, we marshal as json. json is a subset of yaml b, err := json.Marshal(config) if err != nil { From e0b786a2544b09c1a6aae7bf59b6de69890ab486 Mon Sep 17 00:00:00 2001 From: justinsb Date: Fri, 19 Nov 2021 10:21:22 -0500 Subject: [PATCH 3/3] Update golden test output --- ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...rdata.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...mplex.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...press.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...t_123.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...g-iam.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ingsg.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nallb.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...icies.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ct_ha.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...a-gce.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...-ipv6.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...mpool.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...l-gce.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ivate.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...minimal.k8s.local-addons-bootstrap_content | 4 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 7 +- ...-controller.addons.k8s.io-k8s-1.16_content | 68 ++++++++++++++++++- ...ances.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ances.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...rname.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ed-ip.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ubnet.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...alico.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...canal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ilium.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...anced.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...edns1.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...edns2.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...annel.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...opeio.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...weave.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...ubnet.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...edvpc.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...naged.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - ...nimal.example.com-addons-bootstrap_content | 2 +- ...ons-coredns.addons.k8s.io-k8s-1.12_content | 3 - .../amazonvpc-containerd/manifest.yaml | 2 +- .../amazonvpc/manifest.yaml | 2 +- .../awscloudcontroller/manifest.yaml | 2 +- .../awsiamauthenticator/crd/manifest.yaml | 2 +- .../mappings/manifest.yaml | 2 +- .../coredns.addons.k8s.io-k8s-1.12.yaml | 3 - .../coredns/manifest.yaml | 2 +- .../service-account-iam/manifest.yaml | 2 +- .../simple/manifest.yaml | 2 +- .../weave/manifest.yaml | 2 +- 105 files changed, 128 insertions(+), 202 deletions(-) diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 18f7be2e96..14ed40a303 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content index 05a3103c9d..d53400871f 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_bastionuserdata.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content index c07aea80eb..0cdc5c5c6a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_complex.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content index c8b4bcc4c8..87b28ff319 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_compress.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content index e7bda60cd9..c8aa5a7d71 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_123.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content index b4d67a34fc..74ff46d32a 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_existing-iam.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content index c85f3c05dd..85e26f4e05 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_existingsg.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 9f96fd2366..7c5cc474a4 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index b7ca0b8c8b..422ebce897 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content index 9df8080751..0f8ed90535 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_externallb.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content index f5f8a5f75f..a0acf9bab6 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_externalpolicies.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content index 8d9215034f..00ed4f2aa4 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_ha.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content index ce036b83ef..e070003cdf 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_ha-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4bb1e13897..f52d98633c 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 0761acabcc..62531b86e2 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e4297ef11985ee4a7c4e8707453a8d2c16bcb12eccc050adffac3e6ac2fb9a18 + manifestHash: 262fb03230d0c4a72a9579736b4bc8fdf04e676b8e417790d08c14b4ff03198d name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 9eff212e2d..e63da126bf 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index e02ffc722b..ea08717d71 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e4297ef11985ee4a7c4e8707453a8d2c16bcb12eccc050adffac3e6ac2fb9a18 + manifestHash: 262fb03230d0c4a72a9579736b4bc8fdf04e676b8e417790d08c14b4ff03198d name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 9eff212e2d..e63da126bf 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 0c5afb7d45..0af286b1a9 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e4297ef11985ee4a7c4e8707453a8d2c16bcb12eccc050adffac3e6ac2fb9a18 + manifestHash: 262fb03230d0c4a72a9579736b4bc8fdf04e676b8e417790d08c14b4ff03198d name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 9eff212e2d..e63da126bf 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index e2d76014e8..3af8087f17 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-1.23/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4bb1e13897..f52d98633c 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index 904dd4ce2d..35041c6e2d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e31327420b42b8d1b813625c65601166c52b054ae9ac95a57048d72e70b7033c + manifestHash: 63d09ebb456eb06d694bce805fda8888754e5250eb6a37c120146bbf6f655af4 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index e3271a983f..334186636a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-calico/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index a0641f21b8..c5f3b13576 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e31327420b42b8d1b813625c65601166c52b054ae9ac95a57048d72e70b7033c + manifestHash: 63d09ebb456eb06d694bce805fda8888754e5250eb6a37c120146bbf6f655af4 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index e3271a983f..334186636a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-cilium/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index c82712142a..36ca77f49d 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e31327420b42b8d1b813625c65601166c52b054ae9ac95a57048d72e70b7033c + manifestHash: 63d09ebb456eb06d694bce805fda8888754e5250eb6a37c120146bbf6f655af4 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index e3271a983f..334186636a 100644 --- a/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6-private/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content index c82712142a..36ca77f49d 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: e31327420b42b8d1b813625c65601166c52b054ae9ac95a57048d72e70b7033c + manifestHash: 63d09ebb456eb06d694bce805fda8888754e5250eb6a37c120146bbf6f655af4 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index e3271a983f..334186636a 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_minimal-ipv6.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content index 48bfa3e13f..5ae303f78d 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_minimal-warmpool.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4bb1e13897..f52d98633c 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content index f5146297d9..4d500a7177 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_minimal-gce.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content index 12a42dc257..0cc5ccffec 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_minimal-gce-private.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content index 4d85baacff..9ce1e97dec 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-bootstrap_content @@ -6,7 +6,7 @@ spec: addons: - id: k8s-1.16 manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml - manifestHash: a2b7d85f845283e6a2e41036215e8b27c7808b199e0d613bcf3d1d40dd2f653b + manifestHash: 9379d3b1d4508369654ace436cf45137009a50ff1b0e73b88dac88350ebefabd name: kops-controller.addons.k8s.io needsRollingUpdate: control-plane selector: @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 237badcf1d7899f372b94c7f6b3d7dbb0c48bc490d8cbbb9f8d90ed5e1ecb6b3 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..3c652fa864 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -80,6 +80,10 @@ data: fallthrough in-addr.arpa ip6.arpa ttl 30 } + hosts /etc/coredns/hosts k8s.local { + ttl 30 + fallthrough + } prometheus :9153 forward . /etc/resolv.conf { max_concurrent 1000 @@ -200,9 +204,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content index d70ed8c31a..b0d3f2ea13 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_minimal.k8s.local-addons-kops-controller.addons.k8s.io-k8s-1.16_content @@ -1,7 +1,7 @@ apiVersion: v1 data: config.yaml: | - {"cloud":"aws","configBase":"memfs://clusters.example.com/minimal.k8s.local","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.minimal.k8s.local"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]}} + {"cloud":"aws","configBase":"memfs://clusters.example.com/minimal.k8s.local","server":{"Listen":":3988","provider":{"aws":{"nodesRoles":["nodes.minimal.k8s.local"],"Region":"us-test-1"}},"serverKeyPath":"/etc/kubernetes/kops-controller/pki/kops-controller.key","serverCertificatePath":"/etc/kubernetes/kops-controller/pki/kops-controller.crt","caBasePath":"/etc/kubernetes/kops-controller/pki","signingCAs":["kubernetes-ca"],"certNames":["kubelet","kubelet-server","kube-proxy"]},"discovery":{"enabled":true}} kind: ConfigMap metadata: creationTimestamp: null @@ -119,6 +119,14 @@ rules: - list - watch - patch +- apiGroups: + - "" + resources: + - endpoints + verbs: + - get + - list + - watch --- @@ -185,6 +193,16 @@ rules: - leases verbs: - create +- apiGroups: + - "" + resourceNames: + - coredns + resources: + - configmaps + verbs: + - get + - watch + - patch --- @@ -206,3 +224,51 @@ subjects: - apiGroup: rbac.authorization.k8s.io kind: User name: system:serviceaccount:kube-system:kops-controller + +--- + +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + addon.kops.k8s.io/name: kops-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + discovery.kops.k8s.io/internal-name: api.internal.minimal.k8s.local + k8s-addon: kops-controller.addons.k8s.io + name: api-internal + namespace: kube-system +spec: + clusterIP: None + ports: + - name: https + port: 443 + protocol: TCP + targetPort: 443 + selector: + k8s-app: kops-controller + type: ClusterIP + +--- + +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + addon.kops.k8s.io/name: kops-controller.addons.k8s.io + app.kubernetes.io/managed-by: kops + discovery.kops.k8s.io/internal-name: kops-controller.internal.minimal.k8s.local + k8s-addon: kops-controller.addons.k8s.io + name: kops-controller-internal + namespace: kube-system +spec: + clusterIP: None + ports: + - name: https + port: 3988 + protocol: TCP + targetPort: 3988 + selector: + k8s-app: kops-controller + type: ClusterIP diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content index 3099651e94..a661876d0b 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content index 3099651e94..a661876d0b 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_mixedinstances.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content index 3e632736d9..9fc4326f0b 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_nthsqsresources.longclustername.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index d7e2ddb6d3..25351039b4 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/nvidia/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content index 43024367cc..07f095f485 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_private-shared-ip.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content index 027fb15485..d3a46130c4 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_private-shared-subnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content index 0a9d7ee932..c70defd74b 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_privatecalico.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content index f4af5d859f..30f23b1a55 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_privatecanal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content index a65c882201..719405aa95 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_privatecilium.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content index 2bb9bc853f..328e0f4268 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_privateciliumadvanced.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content index 279a178b33..1c1a9221c2 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_privatedns1.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content index a4d86fc004..54c0f1d46b 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_privatedns2.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content index 98be5001ca..b77a1785c0 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_privateflannel.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content index f4e2e3563a..f3e603b725 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_privatekopeio.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content index b8e9d3f25d..4cb38004fd 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_privateweave.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content index e8ec587889..3923c77ac2 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_sharedsubnet.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content index ff704fb25f..93476722eb 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_sharedvpc.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content index 7589ef0533..d6be284e8d 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_unmanaged.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content index 4bb1e13897..f52d98633c 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-bootstrap_content @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content index 174ac503e8..1719eaf3b6 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_minimal.example.com-addons-coredns.addons.k8s.io-k8s-1.12_content @@ -200,9 +200,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml index e440d0691f..cfae009b03 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml index e440d0691f..cfae009b03 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml index b6ee3a300e..951c686088 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awscloudcontroller/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml index 5e000404b2..dcb8a18976 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/crd/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml index e481509ddc..b17e8407f5 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/awsiamauthenticator/mappings/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml index a4a7f8d419..204bd8e7b3 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/coredns.addons.k8s.io-k8s-1.12.yaml @@ -209,9 +209,6 @@ spec: operator: Exists volumes: - configMap: - items: - - key: Corefile - path: Corefile name: coredns name: config-volume diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml index 316ad12a81..da4076cdf5 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/coredns/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: a9df38695bacbb83a7e11814642d6edfc6291f9dc615c74124ee9a5a57998c0e + manifestHash: 73b69518aa4e49109f038213924a57beac385c57e0c9b96f72e6368000d160e7 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml index b3af8db731..2121f46d24 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/service-account-iam/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml index 1b2ad0153c..f81be55215 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/simple/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml index 8fea2c54ed..022d4a1521 100644 --- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml +++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml @@ -20,7 +20,7 @@ spec: version: 9.99.0 - id: k8s-1.12 manifest: coredns.addons.k8s.io/k8s-1.12.yaml - manifestHash: 88ffe1a3752cf290450cc94bd53aea49a665e411dbf4cfe9c1a2cc5b027f12ef + manifestHash: 12b67f439637253329bf6fb2ee23b3ef65959621720c863263c13da8271bff89 name: coredns.addons.k8s.io selector: k8s-addon: coredns.addons.k8s.io