Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ssador/ambassador-operator-crds.yaml.tmpl → .../ambassador/ambassador-operator-crds.yaml
View file
Open in desktop
File renamed without changes.
0 ...bassador/ambassadorinstallation.yaml.tmpl → ...ns/ambassador/ambassadorinstallation.yaml
View file
Open in desktop
File renamed without changes.
35 changes: 17 additions & 18 deletions deploy/addons/assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
)
0 ...oy/addons/auto-pause/auto-pause.yaml.tmpl → deploy/addons/auto-pause/auto-pause.yaml
View file
Open in desktop
File renamed without changes.
0 deploy/addons/cloud-spanner/deployment.yaml → ...addons/cloud-spanner/deployment.yaml.tmpl
View file
Open in desktop
File renamed without changes.
0 .../deploy/csi-hostpath-driverinfo.yaml.tmpl → ...river/deploy/csi-hostpath-driverinfo.yaml
View file
Open in desktop
File renamed without changes.
0 ...eploy/csi-hostpath-storageclass.yaml.tmpl → ...ver/deploy/csi-hostpath-storageclass.yaml
View file
Open in desktop
File renamed without changes.
0 ...ver/rbac/rbac-external-attacher.yaml.tmpl → ...h-driver/rbac/rbac-external-attacher.yaml
View file
Open in desktop
File renamed without changes.
0 ...ernal-health-monitor-controller.yaml.tmpl → ...c-external-health-monitor-controller.yaml
View file
Open in desktop
File renamed without changes.
0 .../rbac/rbac-external-provisioner.yaml.tmpl → ...river/rbac/rbac-external-provisioner.yaml
View file
Open in desktop
File renamed without changes.
0 ...iver/rbac/rbac-external-resizer.yaml.tmpl → ...th-driver/rbac/rbac-external-resizer.yaml
View file
Open in desktop
File renamed without changes.
0 .../rbac/rbac-external-snapshotter.yaml.tmpl → ...river/rbac/rbac-external-snapshotter.yaml
View file
Open in desktop
File renamed without changes.
0 ...tpath-driver/rbac/rbac-hostpath.yaml.tmpl → ...i-hostpath-driver/rbac/rbac-hostpath.yaml
View file
Open in desktop
File renamed without changes.
0 ...oy/addons/efk/elasticsearch-svc.yaml.tmpl → deploy/addons/efk/elasticsearch-svc.yaml
View file
Open in desktop
File renamed without changes.
0 ...addons/efk/fluentd-es-configmap.yaml.tmpl → deploy/addons/efk/fluentd-es-configmap.yaml
View file
Open in desktop
File renamed without changes.
0 deploy/addons/efk/kibana-svc.yaml.tmpl → deploy/addons/efk/kibana-svc.yaml
View file
Open in desktop
File renamed without changes.
0 deploy/addons/gcp-auth/gcp-auth-ns.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-ns.yaml
View file
Open in desktop
File renamed without changes.
0 ...ddons/gcp-auth/gcp-auth-service.yaml.tmpl → deploy/addons/gcp-auth/gcp-auth-service.yaml
View file
Open in desktop
File renamed without changes.
0 ...oy/addons/helm-tiller/helm-tiller-dp.tmpl → ...dons/helm-tiller/helm-tiller-dp.yaml.tmpl
View file
Open in desktop
File renamed without changes.
0 .../addons/helm-tiller/helm-tiller-rbac.tmpl → .../addons/helm-tiller/helm-tiller-rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...y/addons/helm-tiller/helm-tiller-svc.tmpl → ...y/addons/helm-tiller/helm-tiller-svc.yaml
View file
Open in desktop
File renamed without changes.
0 ...ons/istio/istio-default-profile.yaml.tmpl → ...y/addons/istio/istio-default-profile.yaml
View file
Open in desktop
File renamed without changes.
0 ...addons/logviewer/logviewer-rbac.yaml.tmpl → deploy/addons/logviewer/logviewer-rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...trics-server/metrics-apiservice.yaml.tmpl → ...ns/metrics-server/metrics-apiservice.yaml
View file
Open in desktop
File renamed without changes.
0 ...rics-server/metrics-server-rbac.yaml.tmpl → ...s/metrics-server/metrics-server-rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...s-server/metrics-server-service.yaml.tmpl → ...etrics-server/metrics-server-service.yaml
View file
Open in desktop
File renamed without changes.
0 deploy/addons/olm/crds.yaml.tmpl → deploy/addons/olm/crds.yaml
View file
Open in desktop
File renamed without changes.
0 ...rity-policy/pod-security-policy.yaml.tmpl → ...-security-policy/pod-security-policy.yaml
View file
Open in desktop
File renamed without changes.
Empty file modified deploy/addons/portainer/portainer.yaml.tmpl
100755 → 100644
View file
Open in desktop
Empty file.
0 ...gistry-aliases/node-etc-hosts-update.tmpl → ...y-aliases/node-etc-hosts-update.yaml.tmpl
View file
Open in desktop
File renamed without changes.
0 ...s/registry-aliases/patch-coredns-job.tmpl → ...istry-aliases/patch-coredns-job.yaml.tmpl
View file
Open in desktop
File renamed without changes.
0 ...stry-aliases/registry-aliases-config.tmpl → ...aliases/registry-aliases-config.yaml.tmpl
View file
Open in desktop
File renamed without changes.
0 ...stry-aliases/registry-aliases-sa-crb.tmpl → ...stry-aliases/registry-aliases-sa-crb.yaml
View file
Open in desktop
File renamed without changes.
0 ...registry-aliases/registry-aliases-sa.tmpl → ...registry-aliases/registry-aliases-sa.yaml
View file
Open in desktop
File renamed without changes.
0 ...oy/addons/registry/registry-svc.yaml.tmpl → deploy/addons/registry/registry-svc.yaml
View file
Open in desktop
File renamed without changes.
0 ...oner-gluster/storage-gluster-ns.yaml.tmpl → ...ovisioner-gluster/storage-gluster-ns.yaml
View file
Open in desktop
File renamed without changes.
0 ...ddons/storageclass/storageclass.yaml.tmpl → deploy/addons/storageclass/storageclass.yaml
View file
Open in desktop
File renamed without changes.
0 ...hots/csi-hostpath-snapshotclass.yaml.tmpl → ...snapshots/csi-hostpath-snapshotclass.yaml
View file
Open in desktop
File renamed without changes.
0 ...rbac-volume-snapshot-controller.yaml.tmpl → ...hots/rbac-volume-snapshot-controller.yaml
View file
Open in desktop
File renamed without changes.
0 ...ge.k8s.io_volumesnapshotclasses.yaml.tmpl → ...storage.k8s.io_volumesnapshotclasses.yaml
View file
Open in desktop
File renamed without changes.
0 ...e.k8s.io_volumesnapshotcontents.yaml.tmpl → ...torage.k8s.io_volumesnapshotcontents.yaml
View file
Open in desktop
File renamed without changes.
0 ....storage.k8s.io_volumesnapshots.yaml.tmpl → ...pshot.storage.k8s.io_volumesnapshots.yaml
View file
Open in desktop
File renamed without changes.
Loading
Loading