From e1724779f15fd1042cc5ca1449e4cf3c55da0eb7 Mon Sep 17 00:00:00 2001 From: Kirsten G Date: Wed, 27 Mar 2019 09:40:44 -0700 Subject: [PATCH] mcc: fix spelling of vsphere and update golden files "vsphere" was mistyped in render_test.go. fixed typo and regenerated golden files. --- pkg/controller/template/render_test.go | 2 +- .../00-master/{vpshere => vsphere}/files/-etc-kubernetes-ca.crt | 0 .../files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy | 0 .../files/-etc-kubernetes-manifests-etcd-member.yaml | 0 .../-etc-kubernetes-static-pod-resources-etcd-member-ca.crt | 0 ...-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt | 0 .../{vpshere => vsphere}/files/-etc-sysconfig-crio-network | 0 .../{vpshere => vsphere}/files/-etc-sysctl.d-forward.conf | 0 .../{vpshere => vsphere}/files/-var-lib-kubelet-config.json | 0 .../{vpshere => vsphere}/files/-etc-containers-registries.conf | 0 .../{vpshere => vsphere}/files/-etc-containers-storage.conf | 0 .../{vpshere => vsphere}/files/-etc-crio-crio.conf | 0 .../{vpshere => vsphere}/files/-etc-kubernetes-kubelet.conf | 0 .../{vpshere => vsphere}/units/kubelet.service | 0 .../00-worker/{vpshere => vsphere}/files/-etc-kubernetes-ca.crt | 0 .../files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy | 0 .../{vpshere => vsphere}/files/-etc-sysconfig-crio-network | 0 .../{vpshere => vsphere}/files/-etc-sysctl.d-forward.conf | 0 .../{vpshere => vsphere}/files/-var-lib-kubelet-config.json | 0 .../{vpshere => vsphere}/files/-etc-containers-registries.conf | 0 .../{vpshere => vsphere}/files/-etc-containers-storage.conf | 0 .../{vpshere => vsphere}/files/-etc-crio-crio.conf | 0 .../{vpshere => vsphere}/files/-etc-kubernetes-kubelet.conf | 0 .../{vpshere => vsphere}/units/kubelet.service | 0 24 files changed, 1 insertion(+), 1 deletion(-) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-kubernetes-ca.crt (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-kubernetes-manifests-etcd-member.yaml (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-sysconfig-crio-network (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-etc-sysctl.d-forward.conf (100%) rename pkg/controller/template/test_data/templates/master/00-master/{vpshere => vsphere}/files/-var-lib-kubelet-config.json (100%) rename pkg/controller/template/test_data/templates/master/01-master-container-runtime/{vpshere => vsphere}/files/-etc-containers-registries.conf (100%) rename pkg/controller/template/test_data/templates/master/01-master-container-runtime/{vpshere => vsphere}/files/-etc-containers-storage.conf (100%) rename pkg/controller/template/test_data/templates/master/01-master-container-runtime/{vpshere => vsphere}/files/-etc-crio-crio.conf (100%) rename pkg/controller/template/test_data/templates/master/01-master-kubelet/{vpshere => vsphere}/files/-etc-kubernetes-kubelet.conf (100%) rename pkg/controller/template/test_data/templates/master/01-master-kubelet/{vpshere => vsphere}/units/kubelet.service (100%) rename pkg/controller/template/test_data/templates/worker/00-worker/{vpshere => vsphere}/files/-etc-kubernetes-ca.crt (100%) rename pkg/controller/template/test_data/templates/worker/00-worker/{vpshere => vsphere}/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy (100%) rename pkg/controller/template/test_data/templates/worker/00-worker/{vpshere => vsphere}/files/-etc-sysconfig-crio-network (100%) rename pkg/controller/template/test_data/templates/worker/00-worker/{vpshere => vsphere}/files/-etc-sysctl.d-forward.conf (100%) rename pkg/controller/template/test_data/templates/worker/00-worker/{vpshere => vsphere}/files/-var-lib-kubelet-config.json (100%) rename pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/{vpshere => vsphere}/files/-etc-containers-registries.conf (100%) rename pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/{vpshere => vsphere}/files/-etc-containers-storage.conf (100%) rename pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/{vpshere => vsphere}/files/-etc-crio-crio.conf (100%) rename pkg/controller/template/test_data/templates/worker/01-worker-kubelet/{vpshere => vsphere}/files/-etc-kubernetes-kubelet.conf (100%) rename pkg/controller/template/test_data/templates/worker/01-worker-kubelet/{vpshere => vsphere}/units/kubelet.service (100%) diff --git a/pkg/controller/template/render_test.go b/pkg/controller/template/render_test.go index 45967f0990..6c6de0c43f 100644 --- a/pkg/controller/template/render_test.go +++ b/pkg/controller/template/render_test.go @@ -188,7 +188,7 @@ var ( "openstack": "./test_data/controller_config_openstack.yaml", "libvirt": "./test_data/controller_config_libvirt.yaml", "none": "./test_data/controller_config_none.yaml", - "vpshere": "./test_data/controller_config_vsphere.yaml", + "vsphere": "./test_data/controller_config_vsphere.yaml", } ) diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-ca.crt similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-ca.crt rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-ca.crt diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-manifests-etcd-member.yaml b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-manifests-etcd-member.yaml similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-manifests-etcd-member.yaml rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-manifests-etcd-member.yaml diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-ca.crt diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-kubernetes-static-pod-resources-etcd-member-root-ca.crt diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysconfig-crio-network similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysconfig-crio-network rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysconfig-crio-network diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysctl.d-forward.conf similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-etc-sysctl.d-forward.conf rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-etc-sysctl.d-forward.conf diff --git a/pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-var-lib-kubelet-config.json similarity index 100% rename from pkg/controller/template/test_data/templates/master/00-master/vpshere/files/-var-lib-kubelet-config.json rename to pkg/controller/template/test_data/templates/master/00-master/vsphere/files/-var-lib-kubelet-config.json diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-registries.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-registries.conf similarity index 100% rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-registries.conf rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-registries.conf diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-storage.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-storage.conf similarity index 100% rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-containers-storage.conf rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-containers-storage.conf diff --git a/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-crio-crio.conf b/pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-crio-crio.conf similarity index 100% rename from pkg/controller/template/test_data/templates/master/01-master-container-runtime/vpshere/files/-etc-crio-crio.conf rename to pkg/controller/template/test_data/templates/master/01-master-container-runtime/vsphere/files/-etc-crio-crio.conf diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf similarity index 100% rename from pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf rename to pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf diff --git a/pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet.service b/pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service similarity index 100% rename from pkg/controller/template/test_data/templates/master/01-master-kubelet/vpshere/units/kubelet.service rename to pkg/controller/template/test_data/templates/master/01-master-kubelet/vsphere/units/kubelet.service diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-ca.crt b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-ca.crt similarity index 100% rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-ca.crt rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-ca.crt diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy similarity index 100% rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-kubernetes-kubelet-plugins-volume-exec-.dummy diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysconfig-crio-network b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysconfig-crio-network similarity index 100% rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysconfig-crio-network rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysconfig-crio-network diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysctl.d-forward.conf b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysctl.d-forward.conf similarity index 100% rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-etc-sysctl.d-forward.conf rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-etc-sysctl.d-forward.conf diff --git a/pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-var-lib-kubelet-config.json b/pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-var-lib-kubelet-config.json similarity index 100% rename from pkg/controller/template/test_data/templates/worker/00-worker/vpshere/files/-var-lib-kubelet-config.json rename to pkg/controller/template/test_data/templates/worker/00-worker/vsphere/files/-var-lib-kubelet-config.json diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-registries.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-registries.conf similarity index 100% rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-registries.conf rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-registries.conf diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-storage.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-storage.conf similarity index 100% rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-containers-storage.conf rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-containers-storage.conf diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-crio-crio.conf b/pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-crio-crio.conf similarity index 100% rename from pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vpshere/files/-etc-crio-crio.conf rename to pkg/controller/template/test_data/templates/worker/01-worker-container-runtime/vsphere/files/-etc-crio-crio.conf diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf similarity index 100% rename from pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/files/-etc-kubernetes-kubelet.conf rename to pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/files/-etc-kubernetes-kubelet.conf diff --git a/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet.service b/pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service similarity index 100% rename from pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vpshere/units/kubelet.service rename to pkg/controller/template/test_data/templates/worker/01-worker-kubelet/vsphere/units/kubelet.service