From 9ac105a33c49dd1ccb31f62e60e212f9a06214fb Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 25 Sep 2023 16:28:30 -0700 Subject: [PATCH] addons: Fixed files having .tmpl that aren't templates --- ...aml.tmpl => ambassador-operator-crds.yaml} | 0 ....yaml.tmpl => ambassadorinstallation.yaml} | 0 deploy/addons/assets.go | 35 ++++---- .../{auto-pause.yaml.tmpl => auto-pause.yaml} | 0 .../{deployment.yaml => deployment.yaml.tmpl} | 0 ...yaml.tmpl => csi-hostpath-driverinfo.yaml} | 0 ...ml.tmpl => csi-hostpath-storageclass.yaml} | 0 ....yaml.tmpl => rbac-external-attacher.yaml} | 0 ...c-external-health-monitor-controller.yaml} | 0 ...ml.tmpl => rbac-external-provisioner.yaml} | 0 ...r.yaml.tmpl => rbac-external-resizer.yaml} | 0 ...ml.tmpl => rbac-external-snapshotter.yaml} | 0 ...-hostpath.yaml.tmpl => rbac-hostpath.yaml} | 0 ...h-svc.yaml.tmpl => elasticsearch-svc.yaml} | 0 ...ap.yaml.tmpl => fluentd-es-configmap.yaml} | 0 .../{kibana-svc.yaml.tmpl => kibana-svc.yaml} | 0 ...gcp-auth-ns.yaml.tmpl => gcp-auth-ns.yaml} | 0 ...ervice.yaml.tmpl => gcp-auth-service.yaml} | 0 ...iller-dp.tmpl => helm-tiller-dp.yaml.tmpl} | 0 ...tiller-rbac.tmpl => helm-tiller-rbac.yaml} | 0 ...m-tiller-svc.tmpl => helm-tiller-svc.yaml} | 0 ...e.yaml.tmpl => istio-default-profile.yaml} | 0 ...wer-rbac.yaml.tmpl => logviewer-rbac.yaml} | 0 ...vice.yaml.tmpl => metrics-apiservice.yaml} | 0 ...bac.yaml.tmpl => metrics-server-rbac.yaml} | 0 ....yaml.tmpl => metrics-server-service.yaml} | 0 .../addons/olm/{crds.yaml.tmpl => crds.yaml} | 0 ...icy.yaml.tmpl => pod-security-policy.yaml} | 0 deploy/addons/portainer/portainer.yaml.tmpl | 0 ...e.tmpl => node-etc-hosts-update.yaml.tmpl} | 0 ...s-job.tmpl => patch-coredns-job.yaml.tmpl} | 0 ...tmpl => registry-aliases-config.yaml.tmpl} | 0 ...-crb.tmpl => registry-aliases-sa-crb.yaml} | 0 ...iases-sa.tmpl => registry-aliases-sa.yaml} | 0 ...gistry-svc.yaml.tmpl => registry-svc.yaml} | 0 ...r-ns.yaml.tmpl => storage-gluster-ns.yaml} | 0 ...orageclass.yaml.tmpl => storageclass.yaml} | 0 ...l.tmpl => csi-hostpath-snapshotclass.yaml} | 0 ...l => rbac-volume-snapshot-controller.yaml} | 0 ...storage.k8s.io_volumesnapshotclasses.yaml} | 0 ...torage.k8s.io_volumesnapshotcontents.yaml} | 0 ...pshot.storage.k8s.io_volumesnapshots.yaml} | 0 pkg/minikube/assets/addons.go | 80 +++++++++---------- 43 files changed, 57 insertions(+), 58 deletions(-) rename deploy/addons/ambassador/{ambassador-operator-crds.yaml.tmpl => ambassador-operator-crds.yaml} (100%) rename deploy/addons/ambassador/{ambassadorinstallation.yaml.tmpl => ambassadorinstallation.yaml} (100%) rename deploy/addons/auto-pause/{auto-pause.yaml.tmpl => auto-pause.yaml} (100%) rename deploy/addons/cloud-spanner/{deployment.yaml => deployment.yaml.tmpl} (100%) rename deploy/addons/csi-hostpath-driver/deploy/{csi-hostpath-driverinfo.yaml.tmpl => csi-hostpath-driverinfo.yaml} (100%) rename deploy/addons/csi-hostpath-driver/deploy/{csi-hostpath-storageclass.yaml.tmpl => csi-hostpath-storageclass.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-external-attacher.yaml.tmpl => rbac-external-attacher.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-external-health-monitor-controller.yaml.tmpl => rbac-external-health-monitor-controller.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-external-provisioner.yaml.tmpl => rbac-external-provisioner.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-external-resizer.yaml.tmpl => rbac-external-resizer.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-external-snapshotter.yaml.tmpl => rbac-external-snapshotter.yaml} (100%) rename deploy/addons/csi-hostpath-driver/rbac/{rbac-hostpath.yaml.tmpl => rbac-hostpath.yaml} (100%) rename deploy/addons/efk/{elasticsearch-svc.yaml.tmpl => elasticsearch-svc.yaml} (100%) rename deploy/addons/efk/{fluentd-es-configmap.yaml.tmpl => fluentd-es-configmap.yaml} (100%) rename deploy/addons/efk/{kibana-svc.yaml.tmpl => kibana-svc.yaml} (100%) rename deploy/addons/gcp-auth/{gcp-auth-ns.yaml.tmpl => gcp-auth-ns.yaml} (100%) rename deploy/addons/gcp-auth/{gcp-auth-service.yaml.tmpl => gcp-auth-service.yaml} (100%) rename deploy/addons/helm-tiller/{helm-tiller-dp.tmpl => helm-tiller-dp.yaml.tmpl} (100%) rename deploy/addons/helm-tiller/{helm-tiller-rbac.tmpl => helm-tiller-rbac.yaml} (100%) rename deploy/addons/helm-tiller/{helm-tiller-svc.tmpl => helm-tiller-svc.yaml} (100%) rename deploy/addons/istio/{istio-default-profile.yaml.tmpl => istio-default-profile.yaml} (100%) rename deploy/addons/logviewer/{logviewer-rbac.yaml.tmpl => logviewer-rbac.yaml} (100%) rename deploy/addons/metrics-server/{metrics-apiservice.yaml.tmpl => metrics-apiservice.yaml} (100%) rename deploy/addons/metrics-server/{metrics-server-rbac.yaml.tmpl => metrics-server-rbac.yaml} (100%) rename deploy/addons/metrics-server/{metrics-server-service.yaml.tmpl => metrics-server-service.yaml} (100%) rename deploy/addons/olm/{crds.yaml.tmpl => crds.yaml} (100%) rename deploy/addons/pod-security-policy/{pod-security-policy.yaml.tmpl => pod-security-policy.yaml} (100%) mode change 100755 => 100644 deploy/addons/portainer/portainer.yaml.tmpl rename deploy/addons/registry-aliases/{node-etc-hosts-update.tmpl => node-etc-hosts-update.yaml.tmpl} (100%) rename deploy/addons/registry-aliases/{patch-coredns-job.tmpl => patch-coredns-job.yaml.tmpl} (100%) rename deploy/addons/registry-aliases/{registry-aliases-config.tmpl => registry-aliases-config.yaml.tmpl} (100%) rename deploy/addons/registry-aliases/{registry-aliases-sa-crb.tmpl => registry-aliases-sa-crb.yaml} (100%) rename deploy/addons/registry-aliases/{registry-aliases-sa.tmpl => registry-aliases-sa.yaml} (100%) rename deploy/addons/registry/{registry-svc.yaml.tmpl => registry-svc.yaml} (100%) rename deploy/addons/storage-provisioner-gluster/{storage-gluster-ns.yaml.tmpl => storage-gluster-ns.yaml} (100%) rename deploy/addons/storageclass/{storageclass.yaml.tmpl => storageclass.yaml} (100%) rename deploy/addons/volumesnapshots/{csi-hostpath-snapshotclass.yaml.tmpl => csi-hostpath-snapshotclass.yaml} (100%) rename deploy/addons/volumesnapshots/{rbac-volume-snapshot-controller.yaml.tmpl => rbac-volume-snapshot-controller.yaml} (100%) rename deploy/addons/volumesnapshots/{snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl => snapshot.storage.k8s.io_volumesnapshotclasses.yaml} (100%) rename deploy/addons/volumesnapshots/{snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl => snapshot.storage.k8s.io_volumesnapshotcontents.yaml} (100%) rename deploy/addons/volumesnapshots/{snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl => snapshot.storage.k8s.io_volumesnapshots.yaml} (100%) diff --git a/deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl b/deploy/addons/ambassador/ambassador-operator-crds.yaml similarity index 100% rename from deploy/addons/ambassador/ambassador-operator-crds.yaml.tmpl rename to deploy/addons/ambassador/ambassador-operator-crds.yaml diff --git a/deploy/addons/ambassador/ambassadorinstallation.yaml.tmpl b/deploy/addons/ambassador/ambassadorinstallation.yaml similarity index 100% rename from deploy/addons/ambassador/ambassadorinstallation.yaml.tmpl rename to deploy/addons/ambassador/ambassadorinstallation.yaml diff --git a/deploy/addons/assets.go b/deploy/addons/assets.go index 19b3221b8bed..2e44073b85c5 100644 --- a/deploy/addons/assets.go +++ b/deploy/addons/assets.go @@ -20,8 +20,7 @@ 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 @@ -29,11 +28,11 @@ var ( 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 @@ -41,11 +40,11 @@ var ( 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,15 +72,15 @@ 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 @@ -89,7 +88,7 @@ var ( 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,7 +104,7 @@ 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 @@ -113,7 +112,7 @@ var ( 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/deploy/addons/auto-pause/auto-pause.yaml.tmpl b/deploy/addons/auto-pause/auto-pause.yaml similarity index 100% rename from deploy/addons/auto-pause/auto-pause.yaml.tmpl rename to deploy/addons/auto-pause/auto-pause.yaml diff --git a/deploy/addons/cloud-spanner/deployment.yaml b/deploy/addons/cloud-spanner/deployment.yaml.tmpl similarity index 100% rename from deploy/addons/cloud-spanner/deployment.yaml rename to deploy/addons/cloud-spanner/deployment.yaml.tmpl diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml diff --git a/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml.tmpl b/deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-external-attacher.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-external-attacher.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-external-attacher.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-external-attacher.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-external-provisioner.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-external-provisioner.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-external-provisioner.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-external-provisioner.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-external-resizer.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-external-resizer.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-external-resizer.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-external-resizer.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml diff --git a/deploy/addons/csi-hostpath-driver/rbac/rbac-hostpath.yaml.tmpl b/deploy/addons/csi-hostpath-driver/rbac/rbac-hostpath.yaml similarity index 100% rename from deploy/addons/csi-hostpath-driver/rbac/rbac-hostpath.yaml.tmpl rename to deploy/addons/csi-hostpath-driver/rbac/rbac-hostpath.yaml diff --git a/deploy/addons/efk/elasticsearch-svc.yaml.tmpl b/deploy/addons/efk/elasticsearch-svc.yaml similarity index 100% rename from deploy/addons/efk/elasticsearch-svc.yaml.tmpl rename to deploy/addons/efk/elasticsearch-svc.yaml diff --git a/deploy/addons/efk/fluentd-es-configmap.yaml.tmpl b/deploy/addons/efk/fluentd-es-configmap.yaml similarity index 100% rename from deploy/addons/efk/fluentd-es-configmap.yaml.tmpl rename to deploy/addons/efk/fluentd-es-configmap.yaml diff --git a/deploy/addons/efk/kibana-svc.yaml.tmpl b/deploy/addons/efk/kibana-svc.yaml similarity index 100% rename from deploy/addons/efk/kibana-svc.yaml.tmpl rename to deploy/addons/efk/kibana-svc.yaml diff --git a/deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl b/deploy/addons/gcp-auth/gcp-auth-ns.yaml similarity index 100% rename from deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl rename to deploy/addons/gcp-auth/gcp-auth-ns.yaml diff --git a/deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl b/deploy/addons/gcp-auth/gcp-auth-service.yaml similarity index 100% rename from deploy/addons/gcp-auth/gcp-auth-service.yaml.tmpl rename to deploy/addons/gcp-auth/gcp-auth-service.yaml diff --git a/deploy/addons/helm-tiller/helm-tiller-dp.tmpl b/deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl similarity index 100% rename from deploy/addons/helm-tiller/helm-tiller-dp.tmpl rename to deploy/addons/helm-tiller/helm-tiller-dp.yaml.tmpl diff --git a/deploy/addons/helm-tiller/helm-tiller-rbac.tmpl b/deploy/addons/helm-tiller/helm-tiller-rbac.yaml similarity index 100% rename from deploy/addons/helm-tiller/helm-tiller-rbac.tmpl rename to deploy/addons/helm-tiller/helm-tiller-rbac.yaml diff --git a/deploy/addons/helm-tiller/helm-tiller-svc.tmpl b/deploy/addons/helm-tiller/helm-tiller-svc.yaml similarity index 100% rename from deploy/addons/helm-tiller/helm-tiller-svc.tmpl rename to deploy/addons/helm-tiller/helm-tiller-svc.yaml diff --git a/deploy/addons/istio/istio-default-profile.yaml.tmpl b/deploy/addons/istio/istio-default-profile.yaml similarity index 100% rename from deploy/addons/istio/istio-default-profile.yaml.tmpl rename to deploy/addons/istio/istio-default-profile.yaml diff --git a/deploy/addons/logviewer/logviewer-rbac.yaml.tmpl b/deploy/addons/logviewer/logviewer-rbac.yaml similarity index 100% rename from deploy/addons/logviewer/logviewer-rbac.yaml.tmpl rename to deploy/addons/logviewer/logviewer-rbac.yaml diff --git a/deploy/addons/metrics-server/metrics-apiservice.yaml.tmpl b/deploy/addons/metrics-server/metrics-apiservice.yaml similarity index 100% rename from deploy/addons/metrics-server/metrics-apiservice.yaml.tmpl rename to deploy/addons/metrics-server/metrics-apiservice.yaml diff --git a/deploy/addons/metrics-server/metrics-server-rbac.yaml.tmpl b/deploy/addons/metrics-server/metrics-server-rbac.yaml similarity index 100% rename from deploy/addons/metrics-server/metrics-server-rbac.yaml.tmpl rename to deploy/addons/metrics-server/metrics-server-rbac.yaml diff --git a/deploy/addons/metrics-server/metrics-server-service.yaml.tmpl b/deploy/addons/metrics-server/metrics-server-service.yaml similarity index 100% rename from deploy/addons/metrics-server/metrics-server-service.yaml.tmpl rename to deploy/addons/metrics-server/metrics-server-service.yaml diff --git a/deploy/addons/olm/crds.yaml.tmpl b/deploy/addons/olm/crds.yaml similarity index 100% rename from deploy/addons/olm/crds.yaml.tmpl rename to deploy/addons/olm/crds.yaml diff --git a/deploy/addons/pod-security-policy/pod-security-policy.yaml.tmpl b/deploy/addons/pod-security-policy/pod-security-policy.yaml similarity index 100% rename from deploy/addons/pod-security-policy/pod-security-policy.yaml.tmpl rename to deploy/addons/pod-security-policy/pod-security-policy.yaml diff --git a/deploy/addons/portainer/portainer.yaml.tmpl b/deploy/addons/portainer/portainer.yaml.tmpl old mode 100755 new mode 100644 diff --git a/deploy/addons/registry-aliases/node-etc-hosts-update.tmpl b/deploy/addons/registry-aliases/node-etc-hosts-update.yaml.tmpl similarity index 100% rename from deploy/addons/registry-aliases/node-etc-hosts-update.tmpl rename to deploy/addons/registry-aliases/node-etc-hosts-update.yaml.tmpl diff --git a/deploy/addons/registry-aliases/patch-coredns-job.tmpl b/deploy/addons/registry-aliases/patch-coredns-job.yaml.tmpl similarity index 100% rename from deploy/addons/registry-aliases/patch-coredns-job.tmpl rename to deploy/addons/registry-aliases/patch-coredns-job.yaml.tmpl diff --git a/deploy/addons/registry-aliases/registry-aliases-config.tmpl b/deploy/addons/registry-aliases/registry-aliases-config.yaml.tmpl similarity index 100% rename from deploy/addons/registry-aliases/registry-aliases-config.tmpl rename to deploy/addons/registry-aliases/registry-aliases-config.yaml.tmpl diff --git a/deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl b/deploy/addons/registry-aliases/registry-aliases-sa-crb.yaml similarity index 100% rename from deploy/addons/registry-aliases/registry-aliases-sa-crb.tmpl rename to deploy/addons/registry-aliases/registry-aliases-sa-crb.yaml diff --git a/deploy/addons/registry-aliases/registry-aliases-sa.tmpl b/deploy/addons/registry-aliases/registry-aliases-sa.yaml similarity index 100% rename from deploy/addons/registry-aliases/registry-aliases-sa.tmpl rename to deploy/addons/registry-aliases/registry-aliases-sa.yaml diff --git a/deploy/addons/registry/registry-svc.yaml.tmpl b/deploy/addons/registry/registry-svc.yaml similarity index 100% rename from deploy/addons/registry/registry-svc.yaml.tmpl rename to deploy/addons/registry/registry-svc.yaml diff --git a/deploy/addons/storage-provisioner-gluster/storage-gluster-ns.yaml.tmpl b/deploy/addons/storage-provisioner-gluster/storage-gluster-ns.yaml similarity index 100% rename from deploy/addons/storage-provisioner-gluster/storage-gluster-ns.yaml.tmpl rename to deploy/addons/storage-provisioner-gluster/storage-gluster-ns.yaml diff --git a/deploy/addons/storageclass/storageclass.yaml.tmpl b/deploy/addons/storageclass/storageclass.yaml similarity index 100% rename from deploy/addons/storageclass/storageclass.yaml.tmpl rename to deploy/addons/storageclass/storageclass.yaml diff --git a/deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl b/deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml similarity index 100% rename from deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl rename to deploy/addons/volumesnapshots/csi-hostpath-snapshotclass.yaml diff --git a/deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl b/deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml similarity index 100% rename from deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl rename to deploy/addons/volumesnapshots/rbac-volume-snapshot-controller.yaml diff --git a/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl b/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml similarity index 100% rename from deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl rename to deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml diff --git a/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl b/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml similarity index 100% rename from deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl rename to deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml diff --git a/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl b/deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml similarity index 100% rename from deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl rename to deploy/addons/volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index de8ceaf603ae..836bb6455330 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -99,7 +99,7 @@ var Addons = map[string]*Addon{ "auto-pause": NewAddon([]*BinAsset{ MustBinAsset( addons.AutoPauseAssets, - "auto-pause/auto-pause.yaml.tmpl", + "auto-pause/auto-pause.yaml", vmpath.GuestAddonsDir, "auto-pause.yaml", "0640"), @@ -155,14 +155,14 @@ var Addons = map[string]*Addon{ }), "default-storageclass": NewAddon([]*BinAsset{ MustBinAsset(addons.DefaultStorageClassAssets, - "storageclass/storageclass.yaml.tmpl", + "storageclass/storageclass.yaml", vmpath.GuestAddonsDir, "storageclass.yaml", "0640"), }, true, "default-storageclass", "Kubernetes", "", "https://minikube.sigs.k8s.io/docs/handbook/persistent_volumes/", nil, nil), "pod-security-policy": NewAddon([]*BinAsset{ MustBinAsset(addons.PodSecurityPolicyAssets, - "pod-security-policy/pod-security-policy.yaml.tmpl", + "pod-security-policy/pod-security-policy.yaml", vmpath.GuestAddonsDir, "pod-security-policy.yaml", "0640"), @@ -180,7 +180,7 @@ var Addons = map[string]*Addon{ }), "storage-provisioner-gluster": NewAddon([]*BinAsset{ MustBinAsset(addons.StorageProvisionerGlusterAssets, - "storage-provisioner-gluster/storage-gluster-ns.yaml.tmpl", + "storage-provisioner-gluster/storage-gluster-ns.yaml", vmpath.GuestAddonsDir, "storage-gluster-ns.yaml", "0640"), @@ -215,7 +215,7 @@ var Addons = map[string]*Addon{ "elasticsearch-rc.yaml", "0640"), MustBinAsset(addons.EfkAssets, - "efk/elasticsearch-svc.yaml.tmpl", + "efk/elasticsearch-svc.yaml", vmpath.GuestAddonsDir, "elasticsearch-svc.yaml", "0640"), @@ -225,7 +225,7 @@ var Addons = map[string]*Addon{ "fluentd-es-rc.yaml", "0640"), MustBinAsset(addons.EfkAssets, - "efk/fluentd-es-configmap.yaml.tmpl", + "efk/fluentd-es-configmap.yaml", vmpath.GuestAddonsDir, "fluentd-es-configmap.yaml", "0640"), @@ -235,7 +235,7 @@ var Addons = map[string]*Addon{ "kibana-rc.yaml", "0640"), MustBinAsset(addons.EfkAssets, - "efk/kibana-svc.yaml.tmpl", + "efk/kibana-svc.yaml", vmpath.GuestAddonsDir, "kibana-svc.yaml", "0640"), @@ -281,7 +281,7 @@ var Addons = map[string]*Addon{ }), "istio": NewAddon([]*BinAsset{ MustBinAsset(addons.IstioAssets, - "istio/istio-default-profile.yaml.tmpl", + "istio/istio-default-profile.yaml", vmpath.GuestAddonsDir, "istio-default-profile.yaml", "0640"), @@ -327,7 +327,7 @@ var Addons = map[string]*Addon{ }), "metrics-server": NewAddon([]*BinAsset{ MustBinAsset(addons.MetricsServerAssets, - "metrics-server/metrics-apiservice.yaml.tmpl", + "metrics-server/metrics-apiservice.yaml", vmpath.GuestAddonsDir, "metrics-apiservice.yaml", "0640"), @@ -337,12 +337,12 @@ var Addons = map[string]*Addon{ "metrics-server-deployment.yaml", "0640"), MustBinAsset(addons.MetricsServerAssets, - "metrics-server/metrics-server-rbac.yaml.tmpl", + "metrics-server/metrics-server-rbac.yaml", vmpath.GuestAddonsDir, "metrics-server-rbac.yaml", "0640"), MustBinAsset(addons.MetricsServerAssets, - "metrics-server/metrics-server-service.yaml.tmpl", + "metrics-server/metrics-server-service.yaml", vmpath.GuestAddonsDir, "metrics-server-service.yaml", "0640"), @@ -353,7 +353,7 @@ var Addons = map[string]*Addon{ }), "olm": NewAddon([]*BinAsset{ MustBinAsset(addons.OlmAssets, - "olm/crds.yaml.tmpl", + "olm/crds.yaml", vmpath.GuestAddonsDir, "crds.yaml", "0640"), @@ -377,7 +377,7 @@ var Addons = map[string]*Addon{ "registry-rc.yaml", "0640"), MustBinAsset(addons.RegistryAssets, - "registry/registry-svc.yaml.tmpl", + "registry/registry-svc.yaml", vmpath.GuestAddonsDir, "registry-svc.yaml", "0640"), @@ -406,27 +406,27 @@ var Addons = map[string]*Addon{ }), "registry-aliases": NewAddon([]*BinAsset{ MustBinAsset(addons.RegistryAliasesAssets, - "registry-aliases/registry-aliases-sa.tmpl", + "registry-aliases/registry-aliases-sa.yaml", vmpath.GuestAddonsDir, "registry-aliases-sa.yaml", "0640"), MustBinAsset(addons.RegistryAliasesAssets, - "registry-aliases/registry-aliases-sa-crb.tmpl", + "registry-aliases/registry-aliases-sa-crb.yaml", vmpath.GuestAddonsDir, "registry-aliases-sa-crb.yaml", "0640"), MustBinAsset(addons.RegistryAliasesAssets, - "registry-aliases/registry-aliases-config.tmpl", + "registry-aliases/registry-aliases-config.yaml.tmpl", vmpath.GuestAddonsDir, "registry-aliases-config.yaml", "0640"), MustBinAsset(addons.RegistryAliasesAssets, - "registry-aliases/node-etc-hosts-update.tmpl", + "registry-aliases/node-etc-hosts-update.yaml.tmpl", vmpath.GuestAddonsDir, "node-etc-hosts-update.yaml", "0640"), MustBinAsset(addons.RegistryAliasesAssets, - "registry-aliases/patch-coredns-job.tmpl", + "registry-aliases/patch-coredns-job.yaml.tmpl", vmpath.GuestAddonsDir, "patch-coredns-job.yaml", "0640"), @@ -481,7 +481,7 @@ var Addons = map[string]*Addon{ "logviewer-dp-and-svc.yaml", "0640"), MustBinAsset(addons.LogviewerAssets, - "logviewer/logviewer-rbac.yaml.tmpl", + "logviewer/logviewer-rbac.yaml", vmpath.GuestAddonsDir, "logviewer-rbac.yaml", "0640"), @@ -508,17 +508,17 @@ var Addons = map[string]*Addon{ }), "helm-tiller": NewAddon([]*BinAsset{ MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-dp.tmpl", + "helm-tiller/helm-tiller-dp.yaml.tmpl", vmpath.GuestAddonsDir, "helm-tiller-dp.yaml", "0640"), MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-rbac.tmpl", + "helm-tiller/helm-tiller-rbac.yaml", vmpath.GuestAddonsDir, "helm-tiller-rbac.yaml", "0640"), MustBinAsset(addons.HelmTillerAssets, - "helm-tiller/helm-tiller-svc.tmpl", + "helm-tiller/helm-tiller-svc.yaml", vmpath.GuestAddonsDir, "helm-tiller-svc.yaml", "0640"), @@ -560,7 +560,7 @@ var Addons = map[string]*Addon{ }), "ambassador": NewAddon([]*BinAsset{ MustBinAsset(addons.AmbassadorAssets, - "ambassador/ambassador-operator-crds.yaml.tmpl", + "ambassador/ambassador-operator-crds.yaml", vmpath.GuestAddonsDir, "ambassador-operator-crds.yaml", "0640"), @@ -570,7 +570,7 @@ var Addons = map[string]*Addon{ "ambassador-operator.yaml", "0640"), MustBinAsset(addons.AmbassadorAssets, - "ambassador/ambassadorinstallation.yaml.tmpl", + "ambassador/ambassadorinstallation.yaml", vmpath.GuestAddonsDir, "ambassadorinstallation.yaml", "0640"), @@ -581,12 +581,12 @@ var Addons = map[string]*Addon{ }), "gcp-auth": NewAddon([]*BinAsset{ MustBinAsset(addons.GcpAuthAssets, - "gcp-auth/gcp-auth-ns.yaml.tmpl", + "gcp-auth/gcp-auth-ns.yaml", vmpath.GuestAddonsDir, "gcp-auth-ns.yaml", "0640"), MustBinAsset(addons.GcpAuthAssets, - "gcp-auth/gcp-auth-service.yaml.tmpl", + "gcp-auth/gcp-auth-service.yaml", vmpath.GuestAddonsDir, "gcp-auth-service.yaml", "0640"), @@ -606,27 +606,27 @@ var Addons = map[string]*Addon{ // make sure the order of apply. `csi-hostpath-snapshotclass` must be the first position, because it depends on `snapshot.storage.k8s.io_volumesnapshotclasses` // if user disable volumesnapshots addon and delete `csi-hostpath-snapshotclass` after `snapshot.storage.k8s.io_volumesnapshotclasses`, kubernetes will return the error MustBinAsset(addons.VolumeSnapshotsAssets, - "volumesnapshots/csi-hostpath-snapshotclass.yaml.tmpl", + "volumesnapshots/csi-hostpath-snapshotclass.yaml", vmpath.GuestAddonsDir, "csi-hostpath-snapshotclass.yaml", "0640"), MustBinAsset(addons.VolumeSnapshotsAssets, - "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml.tmpl", + "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotclasses.yaml", vmpath.GuestAddonsDir, "snapshot.storage.k8s.io_volumesnapshotclasses.yaml", "0640"), MustBinAsset(addons.VolumeSnapshotsAssets, - "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml.tmpl", + "volumesnapshots/snapshot.storage.k8s.io_volumesnapshotcontents.yaml", vmpath.GuestAddonsDir, "snapshot.storage.k8s.io_volumesnapshotcontents.yaml", "0640"), MustBinAsset(addons.VolumeSnapshotsAssets, - "volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml.tmpl", + "volumesnapshots/snapshot.storage.k8s.io_volumesnapshots.yaml", vmpath.GuestAddonsDir, "snapshot.storage.k8s.io_volumesnapshots.yaml", "0640"), MustBinAsset(addons.VolumeSnapshotsAssets, - "volumesnapshots/rbac-volume-snapshot-controller.yaml.tmpl", + "volumesnapshots/rbac-volume-snapshot-controller.yaml", vmpath.GuestAddonsDir, "rbac-volume-snapshot-controller.yaml", "0640"), @@ -642,32 +642,32 @@ var Addons = map[string]*Addon{ }), "csi-hostpath-driver": NewAddon([]*BinAsset{ MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-external-attacher.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-external-attacher.yaml", vmpath.GuestAddonsDir, "rbac-external-attacher.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-hostpath.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-hostpath.yaml", vmpath.GuestAddonsDir, "rbac-hostpath.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-external-health-monitor-controller.yaml", vmpath.GuestAddonsDir, "rbac-external-health-monitor-controller.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-external-provisioner.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-external-provisioner.yaml", vmpath.GuestAddonsDir, "rbac-external-provisioner.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-external-resizer.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-external-resizer.yaml", vmpath.GuestAddonsDir, "rbac-external-resizer.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml.tmpl", + "csi-hostpath-driver/rbac/rbac-external-snapshotter.yaml", vmpath.GuestAddonsDir, "rbac-external-snapshotter.yaml", "0640"), @@ -677,7 +677,7 @@ var Addons = map[string]*Addon{ "csi-hostpath-attacher.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml.tmpl", + "csi-hostpath-driver/deploy/csi-hostpath-driverinfo.yaml", vmpath.GuestAddonsDir, "csi-hostpath-driverinfo.yaml", "0640"), @@ -692,7 +692,7 @@ var Addons = map[string]*Addon{ "csi-hostpath-resizer.yaml", "0640"), MustBinAsset(addons.CsiHostpathDriverAssets, - "csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml.tmpl", + "csi-hostpath-driver/deploy/csi-hostpath-storageclass.yaml", vmpath.GuestAddonsDir, "csi-hostpath-storageclass.yaml", "0640"), @@ -751,7 +751,7 @@ var Addons = map[string]*Addon{ "Headlamp": "ghcr.io", }), "cloud-spanner": NewAddon([]*BinAsset{ - MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), + MustBinAsset(addons.CloudSpanner, "cloud-spanner/deployment.yaml.tmpl", vmpath.GuestAddonsDir, "deployment.yaml", "0640"), }, false, "cloud-spanner", "Google", "", "https://minikube.sigs.k8s.io/docs/handbook/addons/cloud-spanner/", map[string]string{ "CloudSpanner": "cloud-spanner-emulator/emulator:1.5.10@sha256:3800613e4bd68abd47ecb35e0f16eeb6748629c6beef63b2a561297cc482a3c4", }, map[string]string{