From 1b7ea0c2ea04e7b58fe945bd3b0b9d1de5aa0fb7 Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Mon, 17 Jun 2024 09:46:32 -0800 Subject: [PATCH] rename containerName to imageName --- Makefile | 4 ++-- apps/base/fp/release.yaml | 14 +++++++------- charts/fp/templates-staging/capture.yaml | 2 +- .../fp/templates-staging/link2cid.yaml.noexec | 2 +- charts/fp/templates-staging/realtime.yaml | 2 +- charts/fp/templates-staging/scout.yaml | 2 +- charts/fp/templates/next.yaml | 2 +- charts/fp/templates/scout.yaml | 4 ++-- charts/fp/templates/strapi.yaml | 2 +- charts/fp/values-dev.yaml | 14 +++++++------- charts/fp/values-prod.yaml | 12 ++++++------ scripts/flux-bootstrap.sh | 18 +++++++++++++----- scripts/k8s-secrets.sh | 4 ---- 13 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index a81cc1c..dc13ecc 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ cert-manager: secrets: ./scripts/k8s-secrets.sh -# flux: -# flux bootstrap git --url="ssh://git@gitea.futureporn.net:2222/futureporn/fp" --branch=main --path="clusters/production" --private-key-file=/home/cj/.ssh/fp-flux +flux: + flux bootstrap git --url="ssh://git@gitea.futureporn.net:2222/futureporn/fp" --branch=main --path="clusters/production" --private-key-file=/home/cj/.ssh/fp-flux cluster: ./scripts/kind-with-local-registry.sh diff --git a/apps/base/fp/release.yaml b/apps/base/fp/release.yaml index ace6c25..d0e9164 100644 --- a/apps/base/fp/release.yaml +++ b/apps/base/fp/release.yaml @@ -18,18 +18,18 @@ spec: values: storageClassName: vultr-block-storage-hdd link2cid: - containerName: gitea.futureporn.net/futureporn/link2cid:latest + imageName: gitea.futureporn.net/futureporn/link2cid:latest next: - containerName: gitea.futureporn.net/futureporn/next:latest + imageName: gitea.futureporn.net/futureporn/next:latest certIssuer: letsencrypt-staging hostname: next.futureporn.svc.cluster.local capture: - containerName: gitea.futureporn.net/futureporn/capture:latest + imageName: gitea.futureporn.net/futureporn/capture:latest scout: manager: - containerName: gitea.futureporn.net/futureporn/scout-manager:latest + imageName: gitea.futureporn.net/futureporn/scout-manager:latest worker: - containerName: gitea.futureporn.net/futureporn/scout-worker:latest + imageName: gitea.futureporn.net/futureporn/scout-worker:latest replicas: 1 pubsubServerUrl: https://realtime.futureporn.svc.cluster.local/faye certIssuer: letsencrypt-staging @@ -37,7 +37,7 @@ spec: cdnBucketUrl: https://fp-dev.b-cdn.net s3BucketName: fp-dev strapi: - containerName: gitea.futureporn.net/futureporn/strapi:latest + imageName: gitea.futureporn.net/futureporn/strapi:latest port: 1339 url: https://strapi.piko.sbtp.xyz certIssuer: letsencrypt-staging @@ -46,7 +46,7 @@ spec: ngrok: hostname: grateful-engaging-cicada.ngrok-free.app realtime: - containerName: gitea.futureporn.net/futureporn/realtime:latest + imageName: gitea.futureporn.net/futureporn/realtime:latest adminEmail: cj@futureporn.net chisel: exitNodeIp: "155.138.254.201" diff --git a/charts/fp/templates-staging/capture.yaml b/charts/fp/templates-staging/capture.yaml index d62a959..633cecb 100644 --- a/charts/fp/templates-staging/capture.yaml +++ b/charts/fp/templates-staging/capture.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: capture - image: "{{ .Values.capture.containerName }}" + image: "{{ .Values.capture.imageName }}" ports: - containerPort: 5566 diff --git a/charts/fp/templates-staging/link2cid.yaml.noexec b/charts/fp/templates-staging/link2cid.yaml.noexec index 6a87f08..7b1e727 100644 --- a/charts/fp/templates-staging/link2cid.yaml.noexec +++ b/charts/fp/templates-staging/link2cid.yaml.noexec @@ -33,7 +33,7 @@ spec: app: link2cid spec: containers: - - image: {{ .Values.link2cid.containerName }} + - image: {{ .Values.link2cid.imageName }} name: link2cid ports: - containerPort: 3939 diff --git a/charts/fp/templates-staging/realtime.yaml b/charts/fp/templates-staging/realtime.yaml index 2b7753c..66d0020 100644 --- a/charts/fp/templates-staging/realtime.yaml +++ b/charts/fp/templates-staging/realtime.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: realtime - image: "{{ .Values.realtime.containerName }}" + image: "{{ .Values.realtime.imageName }}" ports: - containerPort: 5535 diff --git a/charts/fp/templates-staging/scout.yaml b/charts/fp/templates-staging/scout.yaml index a2e4d79..12e9e50 100644 --- a/charts/fp/templates-staging/scout.yaml +++ b/charts/fp/templates-staging/scout.yaml @@ -31,7 +31,7 @@ spec: spec: containers: - name: scout - image: "{{ .Values.scout.containerName }}" + image: "{{ .Values.scout.imageName }}" ports: - containerPort: 5000 env: diff --git a/charts/fp/templates/next.yaml b/charts/fp/templates/next.yaml index fb8441a..a5d83c9 100644 --- a/charts/fp/templates/next.yaml +++ b/charts/fp/templates/next.yaml @@ -45,7 +45,7 @@ metadata: spec: containers: - name: next - image: "{{ .Values.next.containerName }}" + image: "{{ .Values.next.imageName }}" env: - name: HOSTNAME value: 0.0.0.0 diff --git a/charts/fp/templates/scout.yaml b/charts/fp/templates/scout.yaml index d9cdbc6..db1a08d 100644 --- a/charts/fp/templates/scout.yaml +++ b/charts/fp/templates/scout.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: scout-worker - image: fp/scout-worker:latest + image: "{{ .Values.scout.worker.imageName }}" imagePullPolicy: Always ports: - containerPort: 8080 @@ -117,7 +117,7 @@ spec: spec: containers: - name: scout-manager - image: "{{ .Values.scout.manager.containerName }}" + image: "{{ .Values.scout.manager.imageName }}" ports: - name: http containerPort: 3000 diff --git a/charts/fp/templates/strapi.yaml b/charts/fp/templates/strapi.yaml index 72df6bb..ecdaa87 100644 --- a/charts/fp/templates/strapi.yaml +++ b/charts/fp/templates/strapi.yaml @@ -44,7 +44,7 @@ metadata: spec: containers: - name: strapi - image: "{{ .Values.strapi.containerName }}" + image: "{{ .Values.strapi.imageName }}" ports: - name: http containerPort: 1339 diff --git a/charts/fp/values-dev.yaml b/charts/fp/values-dev.yaml index c1b91ce..03bbc18 100644 --- a/charts/fp/values-dev.yaml +++ b/charts/fp/values-dev.yaml @@ -2,18 +2,18 @@ storageClassName: standard # used by Kind managedBy: tilt link2cid: - containerName: fp/link2cid + imageName: fp/link2cid next: - containerName: fp/next + imageName: fp/next certIssuer: letsencrypt-staging hostname: next.futureporn.svc.cluster.local capture: - containerName: fp/capture + imageName: fp/capture scout: manager: - containerName: fp/scout-manager + imageName: fp/scout-manager worker: - containerName: fp/scout-worker + imageName: fp/scout-worker replicas: 1 pubsubServerUrl: https://realtime.futureporn.svc.cluster.local/faye certIssuer: letsencrypt-staging @@ -21,7 +21,7 @@ scout: cdnBucketUrl: https://fp-dev.b-cdn.net s3BucketName: fp-dev strapi: - containerName: fp/strapi + imageName: fp/strapi port: 1339 url: https://strapi.piko.sbtp.xyz certIssuer: letsencrypt-staging @@ -30,7 +30,7 @@ strapi: ngrok: hostname: grateful-engaging-cicada.ngrok-free.app realtime: - containerName: fp/realtime + imageName: fp/realtime adminEmail: cj@futureporn.net chisel: exitNodeIp: "155.138.254.201" \ No newline at end of file diff --git a/charts/fp/values-prod.yaml b/charts/fp/values-prod.yaml index 4495559..0e9ca44 100644 --- a/charts/fp/values-prod.yaml +++ b/charts/fp/values-prod.yaml @@ -1,23 +1,23 @@ storageClassName: vultr-block-storage-hdd link2cid: - containerName: gitea.futureporn.net/futureporn/link2cid:latest + imageName: gitea.futureporn.net/futureporn/link2cid:latest scout: manager: - containerName: gitea.futureporn.net/futureporn/scout-manager:latest + imageName: gitea.futureporn.net/futureporn/scout-manager:latest worker: - containerName: gitea.futureporn.net/futureporn/scout-worker:latest + imageName: gitea.futureporn.net/futureporn/scout-worker:latest replicas: 2 pubsubServerUrl: https://realtime.futureporn.net/faye cdnBucketUrl: https://futureporn-b2.b-cdn.net s3BucketName: futureporn next: - containerName: gitea.futureporn.net/futureporn/next:latest + imageName: gitea.futureporn.net/futureporn/next:latest certIssuer: letsencrypt-staging hostname: next.sbtp.xyz capture: - containerName: gitea.futureporn.net/futureporn/capture:latest + imageName: gitea.futureporn.net/futureporn/capture:latest strapi: - containerName: sjc.vultrcr.com/fpcontainers/strapi + imageName: sjc.vultrcr.com/fpcontainers/strapi port: 1339 url: https://portal.futureporn.net certIssuer: letsencrypt-prod diff --git a/scripts/flux-bootstrap.sh b/scripts/flux-bootstrap.sh index 08e5e94..a92698e 100755 --- a/scripts/flux-bootstrap.sh +++ b/scripts/flux-bootstrap.sh @@ -1,9 +1,17 @@ #!/bin/bash +## this way is annoying because deployment asks for git password +# flux bootstrap git \ +# --kubeconfig /home/cj/.kube/vke.yaml \ +# --url=https://gitea.futureporn.net/futureporn/fp.git \ +# --branch=main \ +# --username=cj_clippy \ +# --token-auth=true \ +# --path=clusters/production + +## this way is more automatic although it does ask for yes/no confirmation that the ssh key has repo access flux bootstrap git \ - --kubeconfig /home/cj/.kube/vke.yaml \ - --url=https://gitea.futureporn.net/futureporn/fp.git \ + --url="ssh://git@gitea.futureporn.net:2222/futureporn/fp" \ --branch=main \ - --username=cj_clippy \ - --token-auth=true \ - --path=clusters/production \ No newline at end of file + --path="clusters/production" \ + --private-key-file=/home/cj/.ssh/fp-flux \ No newline at end of file diff --git a/scripts/k8s-secrets.sh b/scripts/k8s-secrets.sh index 3279d57..e701337 100755 --- a/scripts/k8s-secrets.sh +++ b/scripts/k8s-secrets.sh @@ -2,10 +2,6 @@ source .env -kubectl --namespace futureporn delete secret uwu-auth --ignore-not-found -kubectl --namespace futureporn create secret generic uwu-auth \ ---from-literal=auth=${CHISEL_AUTH} - kubectl --namespace futureporn delete secret frp --ignore-not-found kubectl --namespace futureporn create secret generic frp \