.drone.yml

@@ -1,86 +1,86 @@
-#kind: pipeline
+kind: pipeline
-#type: kubernetes
+type: kubernetes
-#name: staging
+name: staging
-#
+
-#trigger:
+trigger:
-#  event:
+  event:
-#    - push
+    - push
-#  branch:
+  branch:
-#    - main
+    - main
-#
+
-## STAGING!!!!
+# STAGING!!!!
-#steps:
+steps:
-#- name: build-wasm
+- name: build-wasm
-#  image: golang:1.17.8-alpine
+  image: golang:1.17.8-alpine
-#  volumes:
+  volumes:
-#    - name: build-staging
+    - name: build-staging
-#      path: /drone/src/build
+      path: /drone/src/build
-#  environment:
+  environment:
-#    APIURL: https://api.quenten.nl/api/testing
+    APIURL: https://api.quenten.nl/api/testing
-#    CGO_ENABLED: 0
+    CGO_ENABLED: 0
-#  commands:
+  commands:
-#    - mkdir ./build/web
+    - mkdir ./build/web
-#    - GOARCH=wasm GOOS=js go build -o ./build/web/app.wasm -ldflags="-X 'main.ApiURL=$APIURL'" ./src
+    - GOARCH=wasm GOOS=js go build -o ./build/web/app.wasm -ldflags="-X 'main.ApiURL=$APIURL'" ./src
-#- name: build-server
+- name: build-server
-#  image: golang:1.17.8-alpine
+  image: golang:1.17.8-alpine
-#  volumes:
+  volumes:
-#    - name: build-staging
+    - name: build-staging
-#      path: /drone/src/build
+      path: /drone/src/build
-#  environment:
+  environment:
-#    APIURL: https://api.quenten.nl/api/testing
+    APIURL: https://api.quenten.nl/api/testing
-#    CGO_ENABLED: 0
+    CGO_ENABLED: 0
-#  commands:
+  commands:
-#    - go build -o ./build/app -ldflags="-X 'main.ApiURL=$APIURL'" ./src
+    - go build -o ./build/app -ldflags="-X 'main.ApiURL=$APIURL'" ./src
-#- name: build-publish-image
+- name: build-publish-image
-#  image: plugins/docker
+  image: plugins/docker
-#  privileged: true
+  privileged: true
-#  volumes:
+  volumes:
-#    - name: build-staging
+    - name: build-staging
-#      path: /drone/src/build
+      path: /drone/src/build
-#  settings:
+  settings:
-#    cache_from:
+    cache_from:
-#      - "dutchellie/proper-website-2:dev"
+      - "dutchellie/proper-website-2:dev"
-#    username:
+    username:
-#      from_secret: docker_username
+      from_secret: docker_username
-#    password:
+    password:
-#      from_secret: docker_password
+      from_secret: docker_password
-#    dockerfile: Dockerfile
+    dockerfile: Dockerfile
-#    repo: dutchellie/proper-website-2
+    repo: dutchellie/proper-website-2
-#    tags:
+    tags:
-#      - dev-${DRONE_COMMIT_SHA:0:8}
+      - dev-${DRONE_COMMIT_SHA:0:8}
-#  depends_on:
+  depends_on:
-#    - build-wasm
+    - build-wasm
-#    - build-server
+    - build-server
-#- name: deploy-staging
+- name: deploy-staging
-#  image: pelotech/drone-helm3
+  image: pelotech/drone-helm3
-#  settings:
+  settings:
-#    mode: upgrade
+    mode: upgrade
-#    chart: .drone/helm/chart
+    chart: .drone/helm/chart
-#    namespace: drone-staging
+    namespace: drone-staging
-#    release: newsite-staging
+    release: newsite-staging
-#    skip_tls_verify: true
+    skip_tls_verify: true
-#    values_files:
+    values_files:
-#      - .drone/helm/staging-val.yaml
+      - .drone/helm/staging-val.yaml
-#    values:
+    values:
-#      - "image=dutchellie/proper-website-2:dev-${DRONE_COMMIT_SHA:0:8}"
+      - "image=dutchellie/proper-website-2:dev-${DRONE_COMMIT_SHA:0:8}"
-#      - "baseURL=staging.quenten.nl"
+      - "baseURL=staging.quenten.nl"
-#      - "name=newsite-staging"
+      - "name=newsite-staging"
-#    kube_api_server:
+    kube_api_server:
-#      from_secret: staging_api_server
+      from_secret: staging_api_server
-#    kube_token:
+    kube_token:
-#      from_secret: staging_kube_token
+      from_secret: staging_kube_token
-#    kube_certificate:
+    kube_certificate:
-#      from_secret: staging_kube_certificate
+      from_secret: staging_kube_certificate
-#    kube_service_account: drone-deploy
+    kube_service_account: drone-deploy
-#    dry_run: false
+    dry_run: false
-#  depends_on:
+  depends_on:
-#    - build-publish-image
+    - build-publish-image
-#
+
-#volumes:
+volumes:
-#  - name: build-staging
+  - name: build-staging
-#    temp: {}
+    temp: {}
-#
+
-#---
+---
 
 kind: pipeline
 type: kubernetes
@@ -88,7 +88,9 @@ name: production
 
 trigger:
   event:
-    - push
+    - promote
+  target:
+    - production
   branch:
     - main
 
@@ -147,7 +149,7 @@ steps:
       - .drone/helm/prod-val.yaml
     values:
       - "image=dutchellie/proper-website-2:latest-${DRONE_COMMIT_SHA:0:8}"
-      - "baseURL=old.quenten.nl"
+      - "baseURL=quenten.nl"
       - "name=newsite-prod"
     kube_api_server:
       from_secret: prod_api_server
@@ -246,42 +248,3 @@ steps:
 volumes:
   - name: build-feature
     temp: {}
-
----
-
-kind: pipeline
-type: kubernetes
-name: remove-feature-branch
-
-trigger:
-  event:
-    - promote
-  target:
-    - destroy
-  branch:
-    exclude:
-      - main
-
-steps:
-  - name: destroy
-    image: pelotech/drone-helm3
-    settings:
-      mode: uninstall
-      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

.drone/helm/prod-val.yaml

@@ -1,4 +1,4 @@
-baseURL: old.quenten.nl
+baseURL: quenten.nl
 name: newsite-prod
 containerEnv:
   - name: APIURL