badhouseplants/badhouseplants-net-old
Archived
4
0
Fork 0
Code Issues 7 Pull Requests 2 Actions Packages Projects Releases Activity

fix: application set editing won't break applying anymore

Browse Source
This commit is contained in:
Nikolai Rodionov
2023-02-26 06:15:15 +01:00
parent 99a168644f
commit 3a6e3e4268
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.drone.yml
View File

@@ -34,6 +34,10 @@ steps:
- name: Build and push the docker image - name: Build and push the docker image
image: plugins/docker image: plugins/docker
when:
branch:
exclude:
- main
settings: settings:
registry: git.badhouseplants.net registry: git.badhouseplants.net
username: allanger username: allanger
@@ -42,6 +46,21 @@ steps:
repo: git.badhouseplants.net/allanger/badhouseplants-net repo: git.badhouseplants.net/allanger/badhouseplants-net
tags: ${DRONE_COMMIT_SHA} tags: ${DRONE_COMMIT_SHA}
- name: Build and push the docker image
image: plugins/docker
when:
branch:
- main
settings:
registry: git.badhouseplants.net
username: allanger
password:
from_secret: GITEA_TOKEN
repo: git.badhouseplants.net/allanger/badhouseplants-net
tags:
- ${DRONE_COMMIT_SHA}
- latest
- name: Deploy a preview ApplicationSet - name: Deploy a preview ApplicationSet
image: alpine/k8s:1.24.10 image: alpine/k8s:1.24.10
when: when:
@@ -60,6 +79,10 @@ steps:
- export ARGO_APP_HOSTNAME="${DRONE_BRANCH}-dev.badhouseplants.net" - export ARGO_APP_HOSTNAME="${DRONE_BRANCH}-dev.badhouseplants.net"
- export ARGO_APP_IMAGE_TAG=$DRONE_COMMIT_SHA - export ARGO_APP_IMAGE_TAG=$DRONE_COMMIT_SHA
- kubectl get -f ./kube/applicationset.yaml -o yaml > /tmp/old_appset.yaml - kubectl get -f ./kube/applicationset.yaml -o yaml > /tmp/old_appset.yaml
- yq -i "del(.metadata.resourceVersion)" /tmp/old_appset.yaml
- yq -i "del(.metadata.generation)" /tmp/old_appset.yaml
- yq -i "del(.metadata.uid)" /tmp/old_appset.yaml
- yq -i "del(.status)" /tmp/old_appset.yaml
- yq "del(.spec.generators[].list.elements[] | select(.name == \"$ARGO_APP_BRANCH\"))" /tmp/old_appset.yaml > /tmp/clean_appset.yaml - yq "del(.spec.generators[].list.elements[] | select(.name == \"$ARGO_APP_BRANCH\"))" /tmp/old_appset.yaml > /tmp/clean_appset.yaml
- envsubst < ./kube/template.yaml > /tmp/elements.yaml - envsubst < ./kube/template.yaml > /tmp/elements.yaml
- yq '.spec.generators[].list.elements += load("/tmp/elements.yaml")' /tmp/clean_appset.yaml > /tmp/new_appset.yaml - yq '.spec.generators[].list.elements += load("/tmp/elements.yaml")' /tmp/clean_appset.yaml > /tmp/new_appset.yaml
@@ -81,6 +104,10 @@ steps:
- export ARGO_APP_BRANCH=$DRONE_BRANCH - export ARGO_APP_BRANCH=$DRONE_BRANCH
- export ARGO_APP_IMAGE_TAG=$DRONE_COMMIT_SHA - export ARGO_APP_IMAGE_TAG=$DRONE_COMMIT_SHA
- kubectl get -f ./kube/applicationset.yaml -o yaml > /tmp/old_appset.yaml - kubectl get -f ./kube/applicationset.yaml -o yaml > /tmp/old_appset.yaml
- yq -i "del(.metadata.resourceVersion)" /tmp/old_appset.yaml
- yq -i "del(.metadata.generation)" /tmp/old_appset.yaml
- yq -i "del(.metadata.uid)" /tmp/old_appset.yaml
- yq -i "del(.status)" /tmp/old_appset.yaml
- yq "del(.spec.generators[].list.elements[] | select(.name == \"$ARGO_APP_BRANCH\"))" /tmp/old_appset.yaml > /tmp/clean_appset1.yaml - yq "del(.spec.generators[].list.elements[] | select(.name == \"$ARGO_APP_BRANCH\"))" /tmp/old_appset.yaml > /tmp/clean_appset1.yaml
- yq "del(.spec.generators[].list.elements[] | select(.commit_sha == \"$ARGO_APP_IMAGE_TAG\"))" /tmp/clean_appset1.yaml > /tmp/clean_appset.yaml - yq "del(.spec.generators[].list.elements[] | select(.commit_sha == \"$ARGO_APP_IMAGE_TAG\"))" /tmp/clean_appset1.yaml > /tmp/clean_appset.yaml
- envsubst < ./kube/main.yaml > /tmp/elements.yaml - envsubst < ./kube/main.yaml > /tmp/elements.yaml

7
kube/applicationset.yaml
View File

@@ -6,7 +6,11 @@ metadata:
spec: spec:
generators: generators:
- list: - list:
elements: [] elements:
- name: application
app: badhouseplants
branch: main
chart_version:
template: template:
metadata: metadata:
name: "{{ app }}-{{ name }}" name: "{{ app }}-{{ name }}"
@@ -27,3 +31,4 @@ spec:
destination: destination:
server: "https://kubernetes.default.svc" server: "https://kubernetes.default.svc"
namespace: "{{ app }}-{{ name }}" namespace: "{{ app }}-{{ name }}"