addons: Fixed files having .tmpl that aren't templates

kubernetes · Sep 25, 2023 · 9ac105a · 9ac105a
1 parent 368677e
commit 9ac105a
Show file tree

Hide file tree

Showing 43 changed files with 57 additions and 58 deletions.
diff --git a/...ssador/ambassador-operator-crds.yaml.tmpl → .../ambassador/ambassador-operator-crds.yaml b/...ssador/ambassador-operator-crds.yaml.tmpl → .../ambassador/ambassador-operator-crds.yaml
diff --git a/...bassador/ambassadorinstallation.yaml.tmpl → ...ns/ambassador/ambassadorinstallation.yaml b/...bassador/ambassadorinstallation.yaml.tmpl → ...ns/ambassador/ambassadorinstallation.yaml
diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go
@@ -20,32 +20,31 @@ import "embed"
 
 var (
 	// AutoPauseAssets assets for auto-pause addon
-	//go:embed auto-pause/*.tmpl
-	//go:embed auto-pause/unpause.lua
+	//go:embed auto-pause/*.tmpl auto-pause/*.yaml auto-pause/unpause.lua
 	AutoPauseAssets embed.FS
 
 	// DashboardAssets assets for dashboard addon
 	//go:embed dashboard/*.yaml dashboard/*.tmpl
 	DashboardAssets embed.FS
 
 	// DefaultStorageClassAssets assets for default-storageclass addon
-	//go:embed storageclass/storageclass.yaml.tmpl
+	//go:embed storageclass/storageclass.yaml
 	DefaultStorageClassAssets embed.FS
 
 	// PodSecurityPolicyAssets assets for pod-security-policy addon
-	//go:embed pod-security-policy/pod-security-policy.yaml.tmpl
+	//go:embed pod-security-policy/pod-security-policy.yaml
 	PodSecurityPolicyAssets embed.FS
 
 	// StorageProvisionerAssets assets for storage-provisioner addon
 	//go:embed storage-provisioner/storage-provisioner.yaml.tmpl
 	StorageProvisionerAssets embed.FS
 
 	// StorageProvisionerGlusterAssets assets for storage-provisioner-gluster addon
-	//go:embed storage-provisioner-gluster/*.tmpl
+	//go:embed storage-provisioner-gluster/*.tmpl storage-provisioner-gluster/*.yaml
 	StorageProvisionerGlusterAssets embed.FS
 
 	// EfkAssets assets for efk addon
-	//go:embed efk/*.tmpl
+	//go:embed efk/*.tmpl efk/*.yaml
 	EfkAssets embed.FS
 
 	// IngressAssets assets for ingress addon
@@ -57,7 +56,7 @@ var (
 	IstioProvisionerAssets embed.FS
 
 	// IstioAssets assets for istio addon
-	//go:embed istio/istio-default-profile.yaml.tmpl
+	//go:embed istio/istio-default-profile.yaml
 	IstioAssets embed.FS
 
 	// InspektorGadgetAssets assets for inspektor-gadget addon
@@ -73,23 +72,23 @@ var (
 	KubevirtAssets embed.FS
 
 	// MetricsServerAssets assets for metrics-server addon
-	//go:embed metrics-server/*.tmpl
+	//go:embed metrics-server/*.tmpl metrics-server/*.yaml
 	MetricsServerAssets embed.FS
 
 	// OlmAssets assets for olm addon
-	//go:embed olm/*.tmpl
+	//go:embed olm/*.tmpl olm/*.yaml
 	OlmAssets embed.FS
 
 	// RegistryAssets assets for registry addon
-	//go:embed registry/*.tmpl
+	//go:embed registry/*.tmpl registry/*.yaml
 	RegistryAssets embed.FS
 
 	// RegistryCredsAssets assets for registry-creds addon
 	//go:embed registry-creds/registry-creds-rc.yaml.tmpl
 	RegistryCredsAssets embed.FS
 
 	// RegistryAliasesAssets assets for registry-aliases addon
-	//go:embed registry-aliases/*.tmpl
+	//go:embed registry-aliases/*.tmpl registry-aliases/*.yaml
 	RegistryAliasesAssets embed.FS
 
 	// FreshpodAssets assets for freshpod addon
@@ -105,15 +104,15 @@ var (
 	NvidiaGpuDevicePluginAssets embed.FS
 
 	// LogviewerAssets assets for logviewer addon
-	//go:embed logviewer/*.tmpl
+	//go:embed logviewer/*.tmpl logviewer/*.yaml
 	LogviewerAssets embed.FS
 
 	// GvisorAssets assets for gvisor addon
 	//go:embed gvisor/*.tmpl
 	GvisorAssets embed.FS
 
 	// HelmTillerAssets assets for helm-tiller addon
-	//go:embed helm-tiller/*.tmpl
+	//go:embed helm-tiller/*.tmpl helm-tiller/*.yaml
 	HelmTillerAssets embed.FS
 
 	// IngressDNSAssets assets for ingress-dns addon
@@ -125,19 +124,19 @@ var (
 	MetallbAssets embed.FS
 
 	// AmbassadorAssets assets for ambassador addon
-	//go:embed ambassador/*.tmpl
+	//go:embed ambassador/*.tmpl ambassador/*.yaml
 	AmbassadorAssets embed.FS
 
 	// GcpAuthAssets assets for gcp-auth addon
-	//go:embed gcp-auth/*.tmpl
+	//go:embed gcp-auth/*.tmpl gcp-auth/*.yaml
 	GcpAuthAssets embed.FS
 
 	// VolumeSnapshotsAssets assets for volumesnapshots addon
-	//go:embed volumesnapshots/*.tmpl
+	//go:embed volumesnapshots/*.tmpl volumesnapshots/*.yaml
 	VolumeSnapshotsAssets embed.FS
 
 	// CsiHostpathDriverAssets assets for csi-hostpath-driver addon
-	//go:embed csi-hostpath-driver/deploy/*.tmpl csi-hostpath-driver/rbac/*.tmpl
+	//go:embed csi-hostpath-driver/deploy/*.tmpl csi-hostpath-driver/deploy/*.yaml csi-hostpath-driver/rbac/*.yaml
 	CsiHostpathDriverAssets embed.FS
 
 	// PortainerAssets assets for portainer addon
@@ -157,6 +156,6 @@ var (
 	HeadlampAssets embed.FS
 
 	// CloudSpanner assets for cloud-spanner addon
-	//go:embed cloud-spanner/*.yaml
+	//go:embed cloud-spanner/*.tmpl
 	CloudSpanner embed.FS
 )
diff --git a/...oy/addons/auto-pause/auto-pause.yaml.tmpl → deploy/addons/auto-pause/auto-pause.yaml b/...oy/addons/auto-pause/auto-pause.yaml.tmpl → deploy/addons/auto-pause/auto-pause.yaml
diff --git a/deploy/addons/cloud-spanner/deployment.yaml → ...addons/cloud-spanner/deployment.yaml.tmpl b/deploy/addons/cloud-spanner/deployment.yaml → ...addons/cloud-spanner/deployment.yaml.tmpl
diff --git a/.../deploy/csi-hostpath-driverinfo.yaml.tmpl → ...river/deploy/csi-hostpath-driverinfo.yaml b/.../deploy/csi-hostpath-driverinfo.yaml.tmpl → ...river/deploy/csi-hostpath-driverinfo.yaml
diff --git a/...eploy/csi-hostpath-storageclass.yaml.tmpl → ...ver/deploy/csi-hostpath-storageclass.yaml b/...eploy/csi-hostpath-storageclass.yaml.tmpl → ...ver/deploy/csi-hostpath-storageclass.yaml
diff --git a/...ver/rbac/rbac-external-attacher.yaml.tmpl → ...h-driver/rbac/rbac-external-attacher.yaml b/...ver/rbac/rbac-external-attacher.yaml.tmpl → ...h-driver/rbac/rbac-external-attacher.yaml
diff --git a/...ernal-health-monitor-controller.yaml.tmpl → ...c-external-health-monitor-controller.yaml b/...ernal-health-monitor-controller.yaml.tmpl → ...c-external-health-monitor-controller.yaml
diff --git a/.../rbac/rbac-external-provisioner.yaml.tmpl → ...river/rbac/rbac-external-provisioner.yaml b/.../rbac/rbac-external-provisioner.yaml.tmpl → ...river/rbac/rbac-external-provisioner.yaml
diff --git a/...iver/rbac/rbac-external-resizer.yaml.tmpl → ...th-driver/rbac/rbac-external-resizer.yaml b/...iver/rbac/rbac-external-resizer.yaml.tmpl → ...th-driver/rbac/rbac-external-resizer.yaml
diff --git a/.../rbac/rbac-external-snapshotter.yaml.tmpl → ...river/rbac/rbac-external-snapshotter.yaml b/.../rbac/rbac-external-snapshotter.yaml.tmpl → ...river/rbac/rbac-external-snapshotter.yaml
diff --git a/...tpath-driver/rbac/rbac-hostpath.yaml.tmpl → ...i-hostpath-driver/rbac/rbac-hostpath.yaml b/...tpath-driver/rbac/rbac-hostpath.yaml.tmpl → ...i-hostpath-driver/rbac/rbac-hostpath.yaml
diff --git a/...oy/addons/efk/elasticsearch-svc.yaml.tmpl → deploy/addons/efk/elasticsearch-svc.yaml b/...oy/addons/efk/elasticsearch-svc.yaml.tmpl → deploy/addons/efk/elasticsearch-svc.yaml
diff --git a/...addons/efk/fluentd-es-configmap.yaml.tmpl → deploy/addons/efk/fluentd-es-configmap.yaml b/...addons/efk/fluentd-es-configmap.yaml.tmpl → deploy/addons/efk/fluentd-es-configmap.yaml
diff --git a/deploy/addons/efk/kibana-svc.yaml.tmpl → deploy/addons/efk/kibana-svc.yaml b/deploy/addons/efk/kibana-svc.yaml.tmpl → deploy/addons/efk/kibana-svc.yaml
diff --git a/deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-ns.yaml b/deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-ns.yaml
diff --git a/...ddons/gcp-auth/gcp-auth-service.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-service.yaml b/...ddons/gcp-auth/gcp-auth-service.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-service.yaml
diff --git a/...oy/addons/helm-tiller/helm-tiller-dp.tmpl → ...dons/helm-tiller/helm-tiller-dp.yaml.tmpl b/...oy/addons/helm-tiller/helm-tiller-dp.tmpl → ...dons/helm-tiller/helm-tiller-dp.yaml.tmpl
diff --git a/.../addons/helm-tiller/helm-tiller-rbac.tmpl → .../addons/helm-tiller/helm-tiller-rbac.yaml b/.../addons/helm-tiller/helm-tiller-rbac.tmpl → .../addons/helm-tiller/helm-tiller-rbac.yaml
diff --git a/...y/addons/helm-tiller/helm-tiller-svc.tmpl → ...y/addons/helm-tiller/helm-tiller-svc.yaml b/...y/addons/helm-tiller/helm-tiller-svc.tmpl → ...y/addons/helm-tiller/helm-tiller-svc.yaml
diff --git a/...ons/istio/istio-default-profile.yaml.tmpl → ...y/addons/istio/istio-default-profile.yaml b/...ons/istio/istio-default-profile.yaml.tmpl → ...y/addons/istio/istio-default-profile.yaml
diff --git a/...addons/logviewer/logviewer-rbac.yaml.tmpl → deploy/addons/logviewer/logviewer-rbac.yaml b/...addons/logviewer/logviewer-rbac.yaml.tmpl → deploy/addons/logviewer/logviewer-rbac.yaml
diff --git a/...trics-server/metrics-apiservice.yaml.tmpl → ...ns/metrics-server/metrics-apiservice.yaml b/...trics-server/metrics-apiservice.yaml.tmpl → ...ns/metrics-server/metrics-apiservice.yaml
diff --git a/...rics-server/metrics-server-rbac.yaml.tmpl → ...s/metrics-server/metrics-server-rbac.yaml b/...rics-server/metrics-server-rbac.yaml.tmpl → ...s/metrics-server/metrics-server-rbac.yaml
diff --git a/...s-server/metrics-server-service.yaml.tmpl → ...etrics-server/metrics-server-service.yaml b/...s-server/metrics-server-service.yaml.tmpl → ...etrics-server/metrics-server-service.yaml
diff --git a/deploy/addons/olm/crds.yaml.tmpl → deploy/addons/olm/crds.yaml b/deploy/addons/olm/crds.yaml.tmpl → deploy/addons/olm/crds.yaml
diff --git a/...rity-policy/pod-security-policy.yaml.tmpl → ...-security-policy/pod-security-policy.yaml b/...rity-policy/pod-security-policy.yaml.tmpl → ...-security-policy/pod-security-policy.yaml
diff --git a/deploy/addons/portainer/portainer.yaml.tmpl b/deploy/addons/portainer/portainer.yaml.tmpl
diff --git a/...gistry-aliases/node-etc-hosts-update.tmpl → ...y-aliases/node-etc-hosts-update.yaml.tmpl b/...gistry-aliases/node-etc-hosts-update.tmpl → ...y-aliases/node-etc-hosts-update.yaml.tmpl
diff --git a/...s/registry-aliases/patch-coredns-job.tmpl → ...istry-aliases/patch-coredns-job.yaml.tmpl b/...s/registry-aliases/patch-coredns-job.tmpl → ...istry-aliases/patch-coredns-job.yaml.tmpl
diff --git a/...stry-aliases/registry-aliases-config.tmpl → ...aliases/registry-aliases-config.yaml.tmpl b/...stry-aliases/registry-aliases-config.tmpl → ...aliases/registry-aliases-config.yaml.tmpl
diff --git a/...stry-aliases/registry-aliases-sa-crb.tmpl → ...stry-aliases/registry-aliases-sa-crb.yaml b/...stry-aliases/registry-aliases-sa-crb.tmpl → ...stry-aliases/registry-aliases-sa-crb.yaml
diff --git a/...registry-aliases/registry-aliases-sa.tmpl → ...registry-aliases/registry-aliases-sa.yaml b/...registry-aliases/registry-aliases-sa.tmpl → ...registry-aliases/registry-aliases-sa.yaml
diff --git a/...oy/addons/registry/registry-svc.yaml.tmpl → deploy/addons/registry/registry-svc.yaml b/...oy/addons/registry/registry-svc.yaml.tmpl → deploy/addons/registry/registry-svc.yaml
diff --git a/...oner-gluster/storage-gluster-ns.yaml.tmpl → ...ovisioner-gluster/storage-gluster-ns.yaml b/...oner-gluster/storage-gluster-ns.yaml.tmpl → ...ovisioner-gluster/storage-gluster-ns.yaml
diff --git a/...ddons/storageclass/storageclass.yaml.tmpl → deploy/addons/storageclass/storageclass.yaml b/...ddons/storageclass/storageclass.yaml.tmpl → deploy/addons/storageclass/storageclass.yaml
diff --git a/...hots/csi-hostpath-snapshotclass.yaml.tmpl → ...snapshots/csi-hostpath-snapshotclass.yaml b/...hots/csi-hostpath-snapshotclass.yaml.tmpl → ...snapshots/csi-hostpath-snapshotclass.yaml
diff --git a/...rbac-volume-snapshot-controller.yaml.tmpl → ...hots/rbac-volume-snapshot-controller.yaml b/...rbac-volume-snapshot-controller.yaml.tmpl → ...hots/rbac-volume-snapshot-controller.yaml
diff --git a/...ge.k8s.io_volumesnapshotclasses.yaml.tmpl → ...storage.k8s.io_volumesnapshotclasses.yaml b/...ge.k8s.io_volumesnapshotclasses.yaml.tmpl → ...storage.k8s.io_volumesnapshotclasses.yaml
diff --git a/...e.k8s.io_volumesnapshotcontents.yaml.tmpl → ...torage.k8s.io_volumesnapshotcontents.yaml b/...e.k8s.io_volumesnapshotcontents.yaml.tmpl → ...torage.k8s.io_volumesnapshotcontents.yaml
diff --git a/....storage.k8s.io_volumesnapshots.yaml.tmpl → ...pshot.storage.k8s.io_volumesnapshots.yaml b/....storage.k8s.io_volumesnapshots.yaml.tmpl → ...pshot.storage.k8s.io_volumesnapshots.yaml