template/test_data: update to test the non-empty cloudproviderconfig

openshift · Apr 24, 2019 · 8251247 · 8251247
1 parent 2fe9613
commit 8251247
Show file tree

Hide file tree

Showing 64 changed files with 80 additions and 430 deletions.
diff --git a/pkg/controller/template/test_data/controller_config_openstack.yaml b/pkg/controller/template/test_data/controller_config_openstack.yaml
@@ -2,7 +2,11 @@ apiVersion: "machineconfigurations.openshift.io/v1"
 kind: "ControllerConfig"
 spec:
   clusterDNSIP: "10.3.0.10"
-  cloudProviderConfig: ""
+  cloudProviderConfig: |
+    testing
+    multi-line cloud config
+    [test]
+      option = dummy
   etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
   etcdInitialCount: 3
   platform: "openstack"

diff --git a/pkg/controller/template/test_data/controller_config_vsphere.yaml b/pkg/controller/template/test_data/controller_config_vsphere.yaml
@@ -2,7 +2,11 @@ apiVersion: "machineconfigurations.openshift.io/v1"
 kind: "ControllerConfig"
 spec:
   clusterDNSIP: "10.3.0.10"
-  cloudProviderConfig: ""
+  cloudProviderConfig: |
+    testing
+    multi-line cloud config
+    [test]
+      option = dummy
   etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
   etcdInitialCount: 3
   platform: "vsphere"

diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/aws/master/files/-etc-kubernetes-kubelet.conf
diff --git a/.../template/test_data/templates/aws/master/files/-etc-kubernetes-manifests-etcd-member.yaml b/.../template/test_data/templates/aws/master/files/-etc-kubernetes-manifests-etcd-member.yaml
diff --git a/...t_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/...t_data/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt
diff --git a/...templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-metric-ca.crt b/...templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-metric-ca.crt
diff --git a/...a/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/...a/templates/aws/master/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/aws/master/files/-etc-sysctl.d-forward.conf
diff --git a/pkg/controller/template/test_data/templates/aws/master/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/aws/master/files/-var-lib-kubelet-config.json
diff --git a/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/master/units/kubelet.service
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-ca.crt
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-kubernetes-kubelet.conf
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/aws/worker/files/-etc-sysctl.d-forward.conf
diff --git a/pkg/controller/template/test_data/templates/aws/worker/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/aws/worker/files/-var-lib-kubelet-config.json
diff --git a/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service b/pkg/controller/template/test_data/templates/aws/worker/units/kubelet.service
diff --git a/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-ca.crt
diff --git a/...controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf b/...controller/template/test_data/templates/libvirt/master/files/-etc-kubernetes-kubelet.conf
diff --git a/...plate/test_data/templates/libvirt/master/files/-etc-kubernetes-manifests-etcd-member.yaml b/...plate/test_data/templates/libvirt/master/files/-etc-kubernetes-manifests-etcd-member.yaml