diff --git a/deploy/Makefile b/deploy/Makefile index a5e3ceb..652a16a 100644 --- a/deploy/Makefile +++ b/deploy/Makefile @@ -1,4 +1,4 @@ -.PHONY: dev prod prod-ovh cert-manager inflate +.PHONY: dev prod prod-ovh cert-manager tailscale-operator inflate dev: @kubectl kustomize --enable-helm dev @@ -14,6 +14,9 @@ prod-ovh: cert-manager: @kubectl kustomize --enable-helm cert-manager +tailscale-operator: + @kubectl kustomize --enable-helm tailscale-operator + load-prod-env: $(eval include prod/secrets/env) $(eval export) diff --git a/deploy/prod-ovh/kustomization.yaml b/deploy/prod-ovh/kustomization.yaml index 6f1909b..c4db7cc 100644 --- a/deploy/prod-ovh/kustomization.yaml +++ b/deploy/prod-ovh/kustomization.yaml @@ -27,21 +27,9 @@ resources: - inflated/prometheus/templates/clusterrolebinding.yaml - inflated/prometheus/templates/pvc.yaml -# Tailscale -- inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml -- inflated/tailscale-operator/templates/connector.yaml -- inflated/tailscale-operator/templates/deployment.yaml -- inflated/tailscale-operator/templates/dnsconfig.yaml -- inflated/tailscale-operator/templates/ingressclass.yaml -- inflated/tailscale-operator/templates/oauth-secret.yaml -- inflated/tailscale-operator/templates/operator-rbac.yaml -- inflated/tailscale-operator/templates/proxy-rbac.yaml -- inflated/tailscale-operator/templates/proxyclass.yaml -- inflated/tailscale-operator/templates/proxygroup.yaml -- inflated/tailscale-operator/templates/recorder.yaml - - clusterissuer.yaml - cert-ingress-tls.yaml +- svc-db.yaml - ingress.yaml configMapGenerator: diff --git a/deploy/prod-ovh/svc-db.yaml b/deploy/prod-ovh/svc-db.yaml new file mode 100644 index 0000000..ee6bb2a --- /dev/null +++ b/deploy/prod-ovh/svc-db.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + tailscale.com/tailnet-fqdn: db.tail6afe.ts.net + name: db +spec: + externalName: 1401ba39-3eeb-4633-b727-bf5d3028da8c + type: ExternalName diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/connector.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/connector.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/connector.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/connector.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/deployment.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/deployment.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/deployment.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/deployment.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/dnsconfig.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/dnsconfig.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/dnsconfig.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/dnsconfig.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/ingressclass.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/ingressclass.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/ingressclass.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/ingressclass.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/oauth-secret.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/oauth-secret.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/oauth-secret.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/oauth-secret.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/operator-rbac.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/operator-rbac.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/operator-rbac.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/operator-rbac.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/proxy-rbac.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/proxy-rbac.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/proxy-rbac.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/proxy-rbac.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/proxyclass.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/proxyclass.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/proxyclass.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/proxyclass.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/proxygroup.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/proxygroup.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/proxygroup.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/proxygroup.yaml diff --git a/deploy/prod-ovh/inflated/tailscale-operator/templates/recorder.yaml b/deploy/tailscale-operator/inflated/tailscale-operator/templates/recorder.yaml similarity index 100% rename from deploy/prod-ovh/inflated/tailscale-operator/templates/recorder.yaml rename to deploy/tailscale-operator/inflated/tailscale-operator/templates/recorder.yaml diff --git a/deploy/tailscale-operator/kustomization.yaml b/deploy/tailscale-operator/kustomization.yaml new file mode 100644 index 0000000..b11c7a1 --- /dev/null +++ b/deploy/tailscale-operator/kustomization.yaml @@ -0,0 +1,14 @@ +--- +# Important: namePrefix must be blank. +resources: +- inflated/tailscale-operator/templates/apiserverproxy-rbac.yaml +- inflated/tailscale-operator/templates/proxyclass.yaml +- inflated/tailscale-operator/templates/ingressclass.yaml +- inflated/tailscale-operator/templates/proxy-rbac.yaml +- inflated/tailscale-operator/templates/operator-rbac.yaml +- inflated/tailscale-operator/templates/deployment.yaml +- inflated/tailscale-operator/templates/oauth-secret.yaml +- inflated/tailscale-operator/templates/proxygroup.yaml +- inflated/tailscale-operator/templates/dnsconfig.yaml +- inflated/tailscale-operator/templates/recorder.yaml +- inflated/tailscale-operator/templates/connector.yaml diff --git a/deploy/prod-ovh/values/tailscale-operator.yaml b/deploy/tailscale-operator/values/tailscale-operator.yaml similarity index 100% rename from deploy/prod-ovh/values/tailscale-operator.yaml rename to deploy/tailscale-operator/values/tailscale-operator.yaml