Skip to content

Commit

Permalink
fix: migrate to applicationset (#425)
Browse files Browse the repository at this point in the history
* fix: reset everything

* feat: add a generator app set

* remove resource limitations

* rename and update docs

* update pathname

* add sealed secrets

* create namespace

* change namespace

* enable cert-manager

* add root application for appset

* add root application

* add runner set

* multisource application

* add values

* combine into one application

* transform configuration

* separate apps

* combine into one

* add service account

* add token definition

* add token

* add container mode

* add container definition

* add gitea

* add kustomization back

* add temporal

* separate app code from cluster code

* add cloudnative-pg

* add server-side apply

* add sync option

* ignore differences

* lowercaseignore

* update secrets
  • Loading branch information
gregkonush authored Oct 1, 2024
1 parent d25012d commit f3cd293
Show file tree
Hide file tree
Showing 120 changed files with 276 additions and 348 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/docker-build-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
uses: ./.github/workflows/docker-build-common.yaml
with:
image_name: ecran
dockerfile: ./apps/ecran/Dockerfile
context: ./apps/ecran
dockerfile: ./packages/ecran/Dockerfile
context: ./packages/ecran
new_tag: ${{ needs.version.outputs.new_tag }}
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
Expand All @@ -45,8 +45,8 @@ jobs:
uses: ./.github/workflows/docker-build-common.yaml
with:
image_name: ecran-worker
dockerfile: ./apps/ecran/Dockerfile.worker
context: ./apps/ecran
dockerfile: ./packages/ecran/Dockerfile.worker
context: ./packages/ecran
new_tag: ${{ needs.version.outputs.new_tag }}
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
Expand All @@ -57,8 +57,8 @@ jobs:
uses: ./.github/workflows/docker-build-common.yaml
with:
image_name: ecran-migrator
dockerfile: ./apps/ecran/Dockerfile.migrator
context: ./apps/ecran
dockerfile: ./packages/ecran/Dockerfile.migrator
context: ./packages/ecran
new_tag: ${{ needs.version.outputs.new_tag }}
secrets:
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
Expand Down
109 changes: 109 additions & 0 deletions apps/arc/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: arc-controller
namespace: argocd
spec:
project: default
sources:
- repoURL: ghcr.io
chart: actions/actions-runner-controller-charts/gha-runner-scale-set-controller
targetRevision: 0.9.1
helm:
releaseName: arc-controller
skipCrds: false
- repoURL: ghcr.io
chart: actions/actions-runner-controller-charts/gha-runner-scale-set
targetRevision: 0.9.1
helm:
releaseName: arc-runner-set
skipCrds: false
valuesObject:
controllerServiceAccount:
name: arc-controller-gha-rs-controller
namespace: arc
githubConfigUrl: https://github.com/gregkonush/lab
githubConfigSecret: github-token
runnerScaleSetName: arc-arm64
minRunners: 3
maxRunners: 9
containerMode:
type: "kubernetes"
kubernetesModeWorkVolumeClaim:
accessModes: ["ReadWriteOnce"]
storageClassName: "local-path"
resources:
requests:
storage: 1Gi
template:
spec:
initContainers:
- name: init-dind-externals
image: ghcr.io/actions/actions-runner:latest
command: ["cp", "-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"]
volumeMounts:
- name: dind-externals
mountPath: /home/runner/tmpDir
containers:
- name: runner
image: ghcr.io/actions/actions-runner:latest
command: ["/home/runner/run.sh"]
env:
- name: ACTIONS_RUNNER_CONTAINER_HOOKS
value: /home/runner/k8s/index.js
- name: ACTIONS_RUNNER_POD_NAME
valueFrom:
fieldRef:
fieldPath: metadata.name
- name: DOCKER_HOST
value: unix:///var/run/docker.sock
- name: ACTIONS_RUNNER_REQUIRE_JOB_CONTAINER
value: "false"
volumeMounts:
- name: work
mountPath: /home/runner/_work
- name: dind-sock
mountPath: /var/run
- name: dind
image: docker:dind
args:
- dockerd
- --host=unix:///var/run/docker.sock
- --group=$(DOCKER_GROUP_GID)
env:
- name: DOCKER_GROUP_GID
value: "123"
securityContext:
privileged: true
volumeMounts:
- name: work
mountPath: /home/runner/_work
- name: dind-sock
mountPath: /var/run
- name: dind-externals
mountPath: /home/runner/externals
volumes:
- name: work
ephemeral:
volumeClaimTemplate:
spec:
accessModes: ["ReadWriteOnce"]
storageClassName: "local-path"
resources:
requests:
storage: 5Gi
- name: dind-sock
emptyDir: {}
- name: dind-externals
emptyDir: {}

destination:
server: https://kubernetes.default.svc
namespace: arc

syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- ServerSideApply=true
20 changes: 0 additions & 20 deletions apps/arc/controller/application.yaml

This file was deleted.

16 changes: 16 additions & 0 deletions apps/arc/github-token.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: github-token
namespace: arc
spec:
encryptedData:
github_token: AgCDMoKW9mDZ9Mk/8ugd1xZqsS/LlfbriU19XvqS7O0CQopDB6ETe8hu3Mxc/n+uthM5IDD04CinxLV3ChCNKiG5ZFADdpg18tbio1XnYb8ZjcQh/EKjfOfNfC+9i0BYTCpyNplKPHvE7+3tkgGyjToUNBXhdk0nzCCa5+4AnQwumpvgz0wrXPQaUeU6joUHmOnUUk1LVhlatbUwlf806rwVSLejLQTZhRVvf2xN/UWtvPaI5mgbJyTS075JADm00J7T+VU/KRJQWzLdtkHllTo5gPcXNmpzRam+iMff3H4ptZUpmWOGv7xnUzHtDxjiB9/3rw25B7dOILgWpJr6gGKlSg6nXcrVhMKzJ4j9OOYx0+ezZOPXni3uwY4SxPJrCfHPoUOXoMga8y1C+ZHU/d5VJ7wiEcn7d3q6rdMqnRurR+eDmLs3vL/wJNzpUhXse2T+LXe7vXt7aZ2Irm5HjOhhl5RyH7rvfw+Nj/owAPAF3Kao3WVzW5WDOu//5qsbg7shE6n9rs/+hnvEsyYIvZ6ZS8gVDG/fLXCzVVnz/vKgiMmTrBJpzFtP7chWttOOnxhTjk9QpzxC3Ew6/8DhWlOeDMciPaRQ5kau+oOVDa2piyVYDi7hocUcGOO2HIFJorkl+lDRRb4pIe9LwlVY2eP9+5g6eVxuXLdF6tAetD3Zxna0JGypfqy4z18kDbygvAAwhpEsKR1yOBpvqnDGuaBeoPFck/y5Ts/mIHohpcW+vuTu5AJtacQe
template:
metadata:
creationTimestamp: null
name: github-token
namespace: arc
type: Opaque
7 changes: 0 additions & 7 deletions apps/argocd/overlays/argocd-lovely-plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ spec:
# mitigate path traversal attacks.
- mountPath: /tmp
name: lovely-tmp
resources:
limits:
cpu: "500m"
memory: "512Mi"
requests:
cpu: "250m"
memory: "256Mi"
volumes:
# A temporary directory for the tool to work in.
- emptyDir: {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
valueFrom:
secretKeyRef:
name: ecran-secrets
key: resend-api-key
key: data
- name: DB_URI
valueFrom:
secretKeyRef:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
48 changes: 48 additions & 0 deletions apps/ecran/sealed-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: ecran-secrets
namespace: ecran
spec:
encryptedData:
data: AgCPPbjkm+cs7uziec7RaUvKCMjwn6joEWV+3Gl+bPpu//eHdLP8d97LZJziugfRJ/FOmrXOgEho2vk8rcJ4beTF9xvASyz4d06qb/1QuRL8M3N3sW27LJ0sAYxtpSKivPYFlOhZBdndby/j0/FcEIVtNX81MdIpuzX2W2WLdhPXZrKhD1HFA5cCLDJ8WbdYitHPU762crNO5nbVvM6Z8shXMxRekag2PR0wuarke9dvEPeWTdtFYL8PBIjj+gQ8x1wlcFltpBx6c/ojUfmWdgV7aKy3j4ZUi3O1grxfhk/MBcVrLlhgqGr2aNVYbQRDQb6mN0ulKK7/twQvQsJTmmFflnvC5YbeoHD+zBJTjQnX2SiEBCMzfLrsK98TYDEybTIs3hh9HVEYqgSBLc22+F9XFz4Nosal81vCl3qY9cKyNi1GE7T9ZoRDOue8dg5AT7RoSNXdBL4Z/CPtnH8Ytrjf0yU+qWDbl5HBJTpmZm3QreUSn2mP4xdR08k5us3qnABmHRDixmDrQYpFclVb7x1CUEyBwi0cEooDBINoEdamyJZYT3XWMMtXWPvn0Mc4BnCEovChPGlaPHSaNsA9hOXOZtfhFqsC80Y7oQsOGAZQisiIMHH/tGdrRjvMMlvGvQAwktyN3uefhvv3pnFXoS1nap6cvnjuSkaWoChuluXV7P9ZLTe5DkoD6kyKpHOjE6TaXCjPs+GDmy1cS0kARDvFMoL7Rupjp2MNpb25UcbAbcS7uzM=
template:
metadata:
creationTimestamp: null
name: ecran-secrets
namespace: ecran
type: Opaque
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: anthropic-api-key
namespace: ecran
spec:
encryptedData:
data: AgB3QJcD+dg9euFG03ooEctvqkoenjnREcM+wNJuV6qtdUNSikMumM3+itsDmRxaihK6uNALbXdT32wUoJpjpvC7Pno64aHG6saKBu0TlH18hX1P/uT8mH2SYO9pcKu2GH72ijSVzAeM6rnq4XbfD6m6ar8m3UvxSbG/j/5P57y3bN/hEj9OaStTo3MIv1TuEgPWo7B7dkPzYzKm12df5bEaIGD9iREn/sJn/sCGnenPEMXBJkUxfQlATs0dDHBAHnU7DuhEG5ZRFBrxgUSXc72VbgRtYxGU8yUYRISU3yKD/HEuaPrp9YDiL+pgiAAOHmZVca3wYZFI0gXkf/25GybN+BwvzgPILalnAJc5clhR2YDbaRJ9xDolqyYhP83ztsYjhg6Sv/V09X1OiMi+hVBH+0+ICxjKzXU7k2km4fd/HNF+PcFAi5+5GZr2HovD9vZzBOfpsgoCBJJUXV37o6dJvlsBDcTZ3O7ocwhPR5nebbsFOX4BbAttig1tjQjmc4N8yE5XUkbq+AAxyX/DEVa0L3Ch/SlUGiCVYaT604xdQ6Bw8nPsy5Lzrh0iNWxYTLrsLj79rR2vVYkXC7up9mDtWLix9ao3M4e+IlpW58/tE2bY3cDmB5K4uISxsTxuTdRWNGtHheOVdhwDu+UJLUNPeo8xVuC9Ap7zxaCvIly+xLucZfPeLHQpKfClF2JckWChEx2JNcxCC1nbJWGYlbJNlwTYGf2F8tIUVQYz538gEyrTqwPhmNSVriuMt1PgAZbwP+SPCYsNa5U3Qd1sGqn+kvwr2XitPJqdSSrKGnT+9spbCCmvojwAZElqkc6iQKDQQwTcgommO+Pc2CA=
template:
metadata:
creationTimestamp: null
name: anthropic-api-key
namespace: ecran
type: Opaque
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: kalmyk-registry
namespace: ecran
spec:
encryptedData:
.dockerconfigjson: AgCFWdT+FoEzfSeJXtqrnXSEh1eyTFvvu/dshgW/3mfqqZl4PZiNqBq/nPt54qfB3ffLeDVR1d5017ntNOaKUlaaXDaZ3NfISlzki6n9GFzsOZQTenR6ZbA3z1Z89qxcIY87FRML53ciUSVLFkUpLofy0RkI5HPhveOWC7abwFDLEA9bqeZe6QyxToL3/L3lQy38EBN/ucbgh0MG6oXM9RAMhKJ+GjRAWmXjCFC/oFyskALoIrI9OzG+2fkaR+Yvou6SD/flQhFX8MJoWIORe9mxJBWR8dzsq9Szfynn8tSgcPlVptpMfKbGcpAbR9PHS+an+vlGzd4h72nSETEh/pGaVgcTMJzOZzo/f6aw5fGIIGWbnvuwNToBa8/d4RGbLxvP0qTY6gvej4PPkRTNbUJodWCdUbDbLx6+J7lJ23d1DzutBUEGf6C6DwGdC5gvXA0G3MLQdk7NAaX8iKWSVLXzC0mOMy9bOX8sIYObc83Bmw/eqjwAa4m2S1RrpO9KR7g8hBhqDSGCcUk+9jxMRbEFch1Xgju0ntBZqFRDRomNHEzTksgkHxCL0SLglabT/kmo0D2yRASdT3vcAKKXtoYIEEgWIce1sOv5OKBqLQjQaN1kYEWuhNBdqjkU/ReKlO1jUrVtFDI7AieLBinWuWrprrYPan8lTnn11KR4EEB/il6M524cudBLD1t9cYu6G0lppfv33dVxaT9Bnbb8c7zntTH7BImIqCMRNsmGmXAy6iYrbFwyTduYoXPHMO6KjMJiYifgNAfttPvdZPZeuig11epNec7R1WjdqtuxYQk7q2VxNXVB04ahI38CpCRQPh/8cQHWrc16s1EBAoTE98eQRyQH/zPGr8YcTvY6mpk=
template:
metadata:
creationTimestamp: null
name: kalmyk-registry
namespace: ecran
type: kubernetes.io/dockerconfigjson
File renamed without changes.
File renamed without changes.
19 changes: 0 additions & 19 deletions apps/gitea/base/gitea-admin-secret.yaml

This file was deleted.

19 changes: 19 additions & 0 deletions apps/gitea/gitea-admin-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
apiVersion: bitnami.com/v1alpha1
kind: SealedSecret
metadata:
creationTimestamp: null
name: gitea-admin-secret
namespace: gitea
spec:
encryptedData:
email: AgCWng7BUI/avteb3k9ivRYIgC1aYiXNAO/yEX3+D5uMbQXJFYY4LVIM3gHXdVEfYeo+kndoM1riGsflz8iyjUNwummXBc5zbCbMDJjIoFF8cowo00FiQmBEyw1DIkJEybFik0heHggCnpE6rVkDj9RTN/PyUQR6eX2X/Qv7ORsocYSwoi1Kw9u7XKGDW9sAh3EKKxDzMJKrUnlun8GQJYWdSJ88w3RTv8g6kdMArtdvKOsIVyVSHV2elgeuERlR3wcKs+24SQCjk/dY+pT8iKrQMQUHz/pBxKM1nUBhmcXZXIw/hpFBhj+hwngq0MthYAuPqXukvRUQ+cTYO5GPMIhitnEtytd4RXyqK+pr1+snK4sVvxgwXNsK4SHX4jZ7sFTwEuy5PCJDm/g9vsYjVMCn3X9V54yyv/xvlMimR3qTAao7fVqXJJ5UBzPuiybSruR4ohEhvtbF85em03E55Fsqi6B+qJcCQjOPKJEfyGGxYEfx/rUXUfchJOjvmvwzG6FXKCbcA+pqUURej/FiDBNJx67+hLDZeRIiAPKbk4P4r+kry727jM44MgXKU7XBW8kJ6DuDCOogzHb/2fDUVYp0xcTuBZe411Qz5Wu3d/93ZhtFdpMLHgz1pmnCGO+GMTUz9DOgn7XfHcgVmR7B57awKrt913U/aBzYL7TQaUF97tzuSEOYu2AR7LHnU+D5Ers70Dzy6j7vucc+4ITtVCnNem0=
password: AgBHdLBPtAOx/InqNU9vJ/5nKDySOU5NHvT/tcSx9ZU4Asdnai7niwWSofzJ8fyuoT08jcUhyqEgDHI0sGK5msPNXeHdrnkSP6luQBn7DA1Qhtl8MjX/RNnX0R5H2s4NIf/RE3Vz2FvaFJrrgrbeWf36z+O0kgvqUoa1n9ZQ2SxfAcoqlWu37Kd+FtV4hZ/hs8eN2uF3y9KO6J12LY959mnbnWG4mGJIl0T0+ebdRj1xAWEbs/hZERuCd+ig2W0QApQW0ZYR34CR99O9qoY9wMasfwHyftn8BGYffAzKJGVXWnrIogVfhfPe2obvkC3ghuGBLcgPCqArcW9LGQa9zsKNecMBrqhE72kcUNfzsTpcLRlUF9PVkGjhmyV0eaEoeYrJxxasLP49uSjh0V2eIVZ9LN9NSrRXmTWXmqV5pLAP1799VBnSBEdip/t24H1Vd983CaFz6kppl0xNRWTPydJiQ2visEDZvAMK6HdYb06V08p2H/Tpf1A8NLOYUDEE8E35wvYS8fQv7Pm5vVUD3VqTjRDSmkgG8SuzDcfVKnDePX0+6wpq9gNFnG1zuL2zQKRL372SzJslv7l54w1smbCogEdlL3oDZmjALGk485s6Kd6umv5n+NG99kARMvo7yxOubkwjv3hxCyEY9ZfTvXB+pev4TP37tu/4VEoYUM6jnmf8V1jQi+Zn32bKk1+SQ0UT32mqEXCe8QKtU02PwyJV3e1E
passwordMode: AgBvxI/jj5Xw+n8qFEcJ4af94JOaLxSwBNLSlA/zJc+ok9L/nWPTsG4F04K9CvJApzrvXOheia9kdwTpbk1ELiQPbh0zuX1hREVRCvbvjmKmOuHdg8I9cutxaZXUBbMVCKoWPu7JvR6KsyAMVnHKO/D890gUyC/CMvDd0ah5kgZTSnN0qkzQlyeVLzRKS2q7GhwjFfLRr33DJP1dbRrSJmalpSQLKWitov/UNr+Ris9dYq0H468OX1ZetikQXHQsOKhOtxEDM5Ydyz6X9gNZr4p5CjMH+uH1CW7pGrUnRqdCOGT94kTFXCW3S2fJvJ9yrIzsn8W8C+MaUzgjimxDl6Y7P1/Bpe9AvbnrxxD0HOC/BnQsEUfWKO6vKBm/Mg3y53mTNM+9nuxa4CUtDR9pMty0p1Vn+hCuZCH0K5clQEPX7tiZ0FRzcXjxtvbnh/bfh7BcX2FfLimbT+6KEosNotzHBqMt9YY3vv0IHMU338SqVFCffxBwvuXrcaiaPx2AW0C4jSamkvfZke0pUyO6LWos6+JArexFGgtGc0BdMjzCQ0cbvavtGVmt0DbOiXKsErI+0XP5cMdQHrze65rZA3TKK36aD7yotYRq8qqPdqEKlWVHnOc4s5k01MWZxsw9u2TdczIUiri2OSdRR/rnzSNeM8XeliUaV8blrvhSzNC1Pp0yGeQdvjMObB9EEIsBitiKLXZ89DHO6ApGMQ==
username: AgBNaytKuU5eNezDMZs1mpEQsoDaBVGHPH9Tuyj7Oi3+3we1xIYWJij0N7DlPbiqNer2POllLzID5RZDUQ8IzZxbiDE6yBcptxD+jF+ecwQRAQ4hT3b7Dz7jv4oZJJwUIhJ0Zs4c1iadVGKh1Riy/BIvFTn9nfltPCFoAlA31GSN4wC0wpYfQFhKOe4IJ+Iv6MHAKYp5DrL/ygsBzsVYd8eEs7XUSeyN0ogovwJtUWLUKVvmezaImMI/fif3X91IxpRf63RO+bozgTVDwYVRcfeNH826GpxsjsQRk5f5mM0gnUkVDFZzXRCAjjt1t/X/KaGNHOEL90qmbFlJMRw1D1dfZuEEe7/YFXqT3qkUXuaxBw0MMlqRsS8U6IIQqNgzHPkV9mxur1NJCvzW6Wh4KMI0XXjuYB257BPrpTqd4QQOptPt8rqS05yX5Le+0ggh3ouPLHX1u0b1DvLKhU1PWn5g+7u3/cVTnDxp/DTgIyokOqK0lszGhQ5SgLcMDKiNMVc06oxVcQ5wmb89TiLHU3JbIHj5Uwz2DlrL18Ybuux50AW2hvXFKgL3QBT4YqNd3iyBR914FsHJmP9PaaVVihZ4W6KNFMoibuNVMtKOj5E/8vxn8AanQfIaK43t233alV/pAmOJ8Xk29I6K8tBGhht11a14H0OTJ0+flwGMSRFY51CleeJ0iCvH9D3QRYEoYp7orBQv
template:
metadata:
creationTimestamp: null
name: gitea-admin-secret
namespace: gitea
type: Opaque
2 changes: 1 addition & 1 deletion apps/gitea/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: gitea
resources:
- base/gitea-admin-secret.yaml
- gitea-admin-secret.yaml
4 changes: 4 additions & 0 deletions apps/gitea/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ gitea:
paths:
- path: /
pathType: Prefix
tls:
- secretName: gitea-tls
hosts:
- kalmyk.duckdns.org
14 changes: 14 additions & 0 deletions apps/root/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: root
namespace: argocd
spec:
project: default
source:
repoURL: https://github.com/gregkonush/lab.git
targetRevision: dev
path: bootstrap
destination:
server: https://kubernetes.default.svc
namespace: argocd
2 changes: 1 addition & 1 deletion apps/sealed-secrets/values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sealed-secrets-web:
sealedSecrets:
namespace: kube-system
namespace: sealed-secrets
serviceName: sealed-secrets
ingress:
enabled: true
Expand Down
9 changes: 0 additions & 9 deletions archive/coder/coder-cluster.yaml

This file was deleted.

28 changes: 0 additions & 28 deletions archive/coder/kustomization.yaml

This file was deleted.

Loading

0 comments on commit f3cd293

Please sign in to comment.