.drone.yml

@@ -5,8 +5,6 @@ name: staging
 trigger:
   event:
     - push
-  branch:
-    - main
 
 # STAGING!!!!
 steps:
@@ -63,8 +61,6 @@ steps:
       - .drone/helm/staging-val.yaml
     values:
       - "image=dutchellie/proper-website-2:dev-${DRONE_COMMIT_SHA:0:8}"
-      - "baseURL=staging.quenten.nl"
-      - "name=newsite-staging"
     kube_api_server:
       from_secret: staging_api_server
     kube_token:
@@ -91,8 +87,6 @@ trigger:
     - promote
   target:
     - production
-  branch:
-    - main
 
 # PRODUCTION!!!!
 steps:
@@ -149,8 +143,6 @@ steps:
       - .drone/helm/prod-val.yaml
     values:
       - "image=dutchellie/proper-website-2:latest-${DRONE_COMMIT_SHA:0:8}"
-      - "baseURL=quenten.nl"
-      - "name=newsite-prod"
     kube_api_server:
       from_secret: prod_api_server
     kube_token:
@@ -165,86 +157,3 @@ steps:
 volumes:
   - name: build
     temp: {}
-
----
-
-kind: pipeline
-type: kubernetes
-name: feature-branch
-
-trigger:
-  event:
-    - push
-  branch:
-    exclude:
-      - main
-
-# FEATURE DEPLOY
-steps:
-- name: build-wasm
-  image: golang:1.17.8-alpine
-  volumes:
-    - name: build-feature
-      path: /drone/src/build
-  environment:
-    APIURL: https://api.quenten.nl/api/testing
-    CGO_ENABLED: 0
-  commands:
-    - mkdir ./build/web
-    - GOARCH=wasm GOOS=js go build -o ./build/web/app.wasm -ldflags="-X 'main.ApiURL=$APIURL'" ./src
-- name: build-server
-  image: golang:1.17.8-alpine
-  volumes:
-    - name: build-feature
-      path: /drone/src/build
-  environment:
-    APIURL: https://api.quenten.nl/api/testing
-    CGO_ENABLED: 0
-  commands:
-    - go build -o ./build/app -ldflags="-X 'main.ApiURL=$APIURL'" ./src
-- name: build-publish-image
-  image: plugins/docker
-  privileged: true
-  volumes:
-    - name: build-feature
-      path: /drone/src/build
-  settings:
-    username:
-      from_secret: docker_username
-    password:
-      from_secret: docker_password
-    dockerfile: Dockerfile
-    repo: dutchellie/proper-website-2
-    tags:
-      - feature-${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:8}
-  depends_on:
-    - build-wasm
-    - build-server
-- name: deploy-staging
-  image: pelotech/drone-helm3
-  settings:
-    mode: upgrade
-    chart: .drone/helm/chart
-    namespace: drone-staging
-    release: feature-${DRONE_BRANCH}
-    skip_tls_verify: true
-    values_files:
-      - .drone/helm/staging-val.yaml
-    values:
-      - "image=dutchellie/proper-website-2:feature-${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:8}"
-      - "baseURL=${DRONE_BRANCH}.quenten.nl"
-      - "name=${DRONE_BRANCH}-deployment"
-    kube_api_server:
-      from_secret: staging_api_server
-    kube_token:
-      from_secret: staging_kube_token
-    kube_certificate:
-      from_secret: staging_kube_certificate
-    kube_service_account: drone-deploy
-    dry_run: false
-  depends_on:
-    - build-publish-image
-
-volumes:
-  - name: build-feature
-    temp: {}

.drone/helm/chart/Chart.yaml

@@ -1,3 +1,3 @@
 apiVersion: v2
 name: newsite
-version: v0.0.2
+version: v0.0.1

.drone/helm/chart/templates/ingress.yaml

@@ -1,11 +1,11 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ tpl .Values.ingress.name . }}
+  name: {{ .Values.ingress.name }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.ingress.annotations }}
   annotations:
-    {{- tpl (. | toYaml) $  | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.className }}
@@ -14,14 +14,14 @@ spec:
   {{- range .Values.ingress.tls }}
     - hosts:
       {{- range .hosts }}
-        - {{ tpl . $ | quote }}
+        - {{ . | quote }}
       {{- end }}
-      secretName: {{ tpl (.secretName | toYaml) $ }}
+      secretName: {{ .secretName }}
   {{- end }}
 {{- end }}
   rules:
     {{- range .Values.ingress.hosts }}
-    - host: {{ tpl .host $ | quote }}
+    - host: {{ .host | quote }}
       http:
         paths:
           {{- range .paths }}
@@ -29,7 +29,7 @@ spec:
             pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ tpl $.Values.service.name $ }}
+                name: {{ $.Values.service.name }}
                 port:
                   number: 8000
           {{- end }}

.drone/helm/chart/templates/service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ tpl .Values.service.name . }}
+  name: {{ .Values.service.name }}
   namespace: {{ .Release.Namespace }}
   {{- with .Values.service.annotations }}
   annotations:

.drone/helm/prod-val.yaml

@@ -1,24 +1,23 @@
-baseURL: quenten.nl
 name: newsite-prod
 containerEnv:
   - name: APIURL
     value: https://api.quenten.nl/api
 service:
-  name: "{{ .Values.name }}"
+  name: newsite-prod
 ingress:
-  name: "{{ .Values.name }}"
+  name: newsite-prod
   annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-{{ .Values.name }}"
-    external-dns.alpha.kubernetes.io/hostname: "{{ .Values.baseURL }}"
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    external-dns.alpha.kubernetes.io/hostname: "quenten.nl"
     nginx.ingress.kubernetes.io/configuration-snippet: |   
       add_header Content-Security-Policy "frame-ancestors 'self' https://forestofunix.xyz";
       proxy_hide_header X-Frame-Options ;
   tls:
     - hosts:
-        - "{{ .Values.baseURL }}"
-      secretName: "{{ .Values.name }}-tls"
+        - quenten.nl
+      secretName: newsite-tls
   hosts:
-    - host: "{{ .Values.baseURL }}"
+    - host: quenten.nl
       paths:
         - path: /
           pathType: Prefix

.drone/helm/staging-val.yaml

@@ -1,24 +1,23 @@
-baseURL: staging.quenten.nl
 name: newsite-staging
 containerEnv:
   - name: APIURL
     value: https://api.quenten.nl/api/testing
 service:
-  name: "{{ .Values.name }}"
+  name: newsite-staging
 ingress:
-  name: "{{ .Values.name }}"
+  name: newsite-staging
   annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt-{{ .Values.name }}"
-    external-dns.alpha.kubernetes.io/hostname: "{{ .Values.baseURL }}"
+    cert-manager.io/cluster-issuer: letsencrypt-staging
+    external-dns.alpha.kubernetes.io/hostname: "staging.quenten.nl"
     nginx.ingress.kubernetes.io/configuration-snippet: |   
       add_header Content-Security-Policy "frame-ancestors 'self' https://forestofunix.xyz";
       proxy_hide_header X-Frame-Options ;
   tls:
     - hosts:
-        - "{{ .Values.baseURL }}"
-      secretName: "{{ .Values.name }}-tls"
+        - staging.quenten.nl
+      secretName: newsite-staging-tls
   hosts:
-    - host: "{{ .Values.baseURL }}"
+    - host: staging.quenten.nl
       paths:
         - path: /
           pathType: Prefix