installer: welcome
diff --git a/charts/certificate-issuer/Chart.yaml b/charts/certificate-issuer-private/Chart.yaml
similarity index 100%
copy from charts/certificate-issuer/Chart.yaml
copy to charts/certificate-issuer-private/Chart.yaml
diff --git a/charts/certificate-issuer-private/templates/certificate-wildcard.yaml b/charts/certificate-issuer-private/templates/certificate-wildcard.yaml
new file mode 100644
index 0000000..b478cc3
--- /dev/null
+++ b/charts/certificate-issuer-private/templates/certificate-wildcard.yaml
@@ -0,0 +1,14 @@
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+ name: wildcard-{{ .Values.issuer.domain }}
+ namespace: {{ .Release.Namespace }}
+ annotations:
+ helm.sh/resource-policy: keep
+spec:
+ dnsNames:
+ - '*.{{ .Values.issuer.domain }}'
+ issuerRef:
+ name: {{ .Values.issuer.name }}
+ kind: Issuer
+ secretName: cert-wildcard.{{ .Values.issuer.domain }}
diff --git a/charts/certificate-issuer/templates/gandi-credentials.yaml b/charts/certificate-issuer-private/templates/gandi-credentials.yaml
similarity index 67%
rename from charts/certificate-issuer/templates/gandi-credentials.yaml
rename to charts/certificate-issuer-private/templates/gandi-credentials.yaml
index c14d298..65c7076 100644
--- a/charts/certificate-issuer/templates/gandi-credentials.yaml
+++ b/charts/certificate-issuer-private/templates/gandi-credentials.yaml
@@ -5,4 +5,4 @@
name: gandi-credentials
namespace: {{ .Release.Namespace }}
data:
- api-token: {{ .Values.private.gandiAPIToken | b64enc }}
+ api-token: {{ .Values.issuer.gandiAPIToken | b64enc }}
diff --git a/charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml b/charts/certificate-issuer-private/templates/gandi-webhook-secret-reader.yaml
similarity index 100%
rename from charts/certificate-issuer/templates/gandi-webhook-secret-reader.yaml
rename to charts/certificate-issuer-private/templates/gandi-webhook-secret-reader.yaml
diff --git a/charts/certificate-issuer/templates/private.yaml b/charts/certificate-issuer-private/templates/issuer.yaml
similarity index 65%
rename from charts/certificate-issuer/templates/private.yaml
rename to charts/certificate-issuer-private/templates/issuer.yaml
index 1ab6e90..afc1ea4 100644
--- a/charts/certificate-issuer/templates/private.yaml
+++ b/charts/certificate-issuer-private/templates/issuer.yaml
@@ -1,14 +1,14 @@
apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
- name: {{ .Values.private.name }}
+ name: {{ .Values.issuer.name }}
namespace: {{ .Release.Namespace }}
spec:
acme:
- server: {{ .Values.private.server }}
- email: {{ .Values.private.contactEmail }}
+ server: {{ .Values.issuer.server }}
+ email: {{ .Values.issuer.contactEmail }}
privateKeySecretRef:
- name: issuer-{{ .Values.private.name }}-account-key
+ name: issuer-{{ .Values.issuer.name }}-account-key
solvers:
- dns01:
webhook:
diff --git a/charts/certificate-issuer-private/values.yaml b/charts/certificate-issuer-private/values.yaml
new file mode 100644
index 0000000..4d6234f
--- /dev/null
+++ b/charts/certificate-issuer-private/values.yaml
@@ -0,0 +1,10 @@
+certManager:
+ namespace: cert-manager
+ gandiWebhookSecretReader: cert-manager-webhook-gandi
+issuer:
+ name: selfsigned-private
+ server: https://acme-v02.api.letsencrypt.org/directory
+ contactEmail: admin@example.com
+ gandiAPIToken: token
+ domain: p.example.com
+
diff --git a/charts/certificate-issuer/Chart.yaml b/charts/certificate-issuer-public/Chart.yaml
similarity index 100%
rename from charts/certificate-issuer/Chart.yaml
rename to charts/certificate-issuer-public/Chart.yaml
diff --git a/charts/certificate-issuer-public/templates/issuer.yaml b/charts/certificate-issuer-public/templates/issuer.yaml
new file mode 100644
index 0000000..79f44f9
--- /dev/null
+++ b/charts/certificate-issuer-public/templates/issuer.yaml
@@ -0,0 +1,16 @@
+apiVersion: cert-manager.io/v1
+kind: ClusterIssuer
+metadata:
+ name: {{ .Values.issuer.name }}
+ namespace: {{ .Release.Namespace }}
+spec:
+ acme:
+ server: {{ .Values.issuer.server }}
+ email: {{ .Values.issuer.contactEmail }}
+ privateKeySecretRef:
+ name: cluster-issuer-{{ .Values.issuer.name }}-account-key
+ solvers:
+ - selector: {}
+ http01:
+ ingress:
+ class: {{ .Values.issuer.ingressClass }}
diff --git a/charts/certificate-issuer-public/values.yaml b/charts/certificate-issuer-public/values.yaml
new file mode 100644
index 0000000..cad147a
--- /dev/null
+++ b/charts/certificate-issuer-public/values.yaml
@@ -0,0 +1,6 @@
+issuer:
+ name: letsencrypt-prod
+ server: https://acme-v02.api.letsencrypt.org/directory
+ contactEmail: admin@example.com
+ ingressClass: ingress-nginx
+ domain: example.com
diff --git a/charts/certificate-issuer/templates/public.yaml b/charts/certificate-issuer/templates/public.yaml
deleted file mode 100644
index 4dbf6f7..0000000
--- a/charts/certificate-issuer/templates/public.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
- name: {{ .Values.public.name }}
- namespace: {{ .Release.Namespace }}
-spec:
- acme:
- server: {{ .Values.public.server }}
- email: {{ .Values.public.contactEmail }}
- privateKeySecretRef:
- name: cluster-issuer-{{ .Values.public.name }}-account-key
- solvers:
- - selector: {}
- http01:
- ingress:
- class: {{ .Values.public.ingressClass }}
diff --git a/charts/certificate-issuer/templates/wildcard-certificate-private.yaml b/charts/certificate-issuer/templates/wildcard-certificate-private.yaml
deleted file mode 100644
index 5d8c667..0000000
--- a/charts/certificate-issuer/templates/wildcard-certificate-private.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
- name: wildcard-{{ .Values.private.domain }}
- namespace: {{ .Release.Namespace }}
- annotations:
- helm.sh/resource-policy: keep
-spec:
- dnsNames:
- - '*.{{ .Values.private.domain }}'
- issuerRef:
- name: {{ .Values.private.name }}
- kind: Issuer
- secretName: cert-wildcard.{{ .Values.private.domain }}
- secretTemplate:
- annotations:
- kubed.appscode.com/sync: pcloud-instance-id={{ .Values.pcloudInstanceId }}
diff --git a/charts/certificate-issuer/templates/www-certificate-public.yaml b/charts/certificate-issuer/templates/www-certificate-public.yaml
deleted file mode 100644
index 7039cee..0000000
--- a/charts/certificate-issuer/templates/www-certificate-public.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# apiVersion: cert-manager.io/v1
-# kind: Certificate
-# metadata:
-# name: www-{{ .Values.public.domain }}
-# namespace: {{ .Release.Namespace }}
-# annotations:
-# helm.sh/resource-policy: keep
-# spec:
-# dnsNames:
-# - '{{ .Values.public.domain }}'
-# - 'www.{{ .Values.public.domain }}'
-# issuerRef:
-# name: {{ .Values.public.name }}
-# kind: ClusterIssuer
-# secretName: cert-www.{{ .Values.public.domain }}
-# secretTemplate:
-# annotations:
-# kubed.appscode.com/sync: "pcloud-instance-id={{ .Values.pcloudInstanceId }}"
diff --git a/charts/certificate-issuer/values.yaml b/charts/certificate-issuer/values.yaml
deleted file mode 100644
index b9660ae..0000000
--- a/charts/certificate-issuer/values.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-pcloudInstanceId: example
-certManager:
- namespace: cert-manager
- gandiWebhookSecretReader: cert-manager-webhook-gandi
-public:
- name: letsencrypt-prod
- server: https://acme-v02.api.letsencrypt.org/directory
- contactEmail: admin@example.com
- ingressClass: ingress-nginx
- domain: example.com
-private:
- name: selfsigned-private
- server: https://acme-v02.api.letsencrypt.org/directory
- contactEmail: admin@example.com
- gandiAPIToken: token
- domain: p.example.com
-
diff --git a/charts/welcome/.helmignore b/charts/welcome/.helmignore
new file mode 100644
index 0000000..0e8a0eb
--- /dev/null
+++ b/charts/welcome/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/charts/welcome/Chart.yaml b/charts/welcome/Chart.yaml
new file mode 100644
index 0000000..ad3ce6d
--- /dev/null
+++ b/charts/welcome/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v2
+name: welcome
+description: A Helm chart for PCloud welcome
+type: application
+version: 0.0.1
+appVersion: "0.0.1"
diff --git a/charts/welcome/templates/install.yaml b/charts/welcome/templates/install.yaml
new file mode 100644
index 0000000..9dd639a
--- /dev/null
+++ b/charts/welcome/templates/install.yaml
@@ -0,0 +1,86 @@
+apiVersion: v1
+kind: Secret
+metadata:
+ name: ssh-key
+type: Opaque
+data:
+ private: {{ .Values.sshPrivateKey }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: welcome
+ namespace: {{ .Release.Namespace }}
+spec:
+ type: ClusterIP
+ selector:
+ app: welcome
+ ports:
+ - name: http
+ port: 80
+ targetPort: http
+ protocol: TCP
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+ name: ingress
+ namespace: {{ .Release.Namespace }}
+ annotations:
+ acme.cert-manager.io/http01-edit-in-place: "true"
+ cert-manager.io/cluster-issuer: {{ .Values.ingress.certificateIssuer}}
+spec:
+ ingressClassName: {{ .Values.ingress.className }}
+ tls:
+ - hosts:
+ - {{ .Values.ingress.domain }}
+ secretName: cert-welcome
+ rules:
+ - host: {{ .Values.ingress.domain }}
+ http:
+ paths:
+ - path: /
+ pathType: Prefix
+ backend:
+ service:
+ name: welcome
+ port:
+ name: http
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: welcome
+ namespace: {{ .Release.Namespace }}
+spec:
+ selector:
+ matchLabels:
+ app: welcome
+ replicas: 1
+ template:
+ metadata:
+ labels:
+ app: welcome
+ spec:
+ volumes:
+ - name: ssh-key
+ secret:
+ secretName: ssh-key
+ containers:
+ - name: welcome
+ image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: http
+ containerPort: 8080
+ protocol: TCP
+ command:
+ - pcloud-installer
+ - welcome
+ - --repo-addr={{ .Values.repoAddr }}
+ - --ssh-key=/pcloud/ssh-key/private
+ - --port=8080
+ volumeMounts:
+ - name: ssh-key
+ readOnly: true
+ mountPath: /pcloud/ssh-key
diff --git a/charts/welcome/values.yaml b/charts/welcome/values.yaml
new file mode 100644
index 0000000..d83ffd1
--- /dev/null
+++ b/charts/welcome/values.yaml
@@ -0,0 +1,10 @@
+image:
+ repository: giolekva/pcloud-installer
+ tag: latest
+ pullPolicy: Always
+repoAddr: 192.168.0.11
+sshPrivateKey: key
+ingress:
+ className: pcloud-ingress-public
+ domain: welcome.example.com
+ certificateIssuer: example-public