diff --git a/infra/argo-rollouts/config.yaml b/bootstrap/argo-rollouts/config.yaml similarity index 83% rename from infra/argo-rollouts/config.yaml rename to bootstrap/argo-rollouts/config.yaml index c796de5..4597b66 100644 --- a/infra/argo-rollouts/config.yaml +++ b/bootstrap/argo-rollouts/config.yaml @@ -1,11 +1,11 @@ { "name": "argo-rollouts", "namespace": "argo-rollouts", - "step": "2", + "step": "3", "source": { "repoURL": "https://argoproj.github.io/argo-helm", "chart": "argo-rollouts", - "targetRevision": 2.40.6 + "targetRevision": "2.40.6" }, "helm": { "values": "dashboard:\n enabled: true\n" diff --git a/infra/cert-manager/config.yaml b/bootstrap/cert-manager/config.yaml similarity index 87% rename from infra/cert-manager/config.yaml rename to bootstrap/cert-manager/config.yaml index ae6ec3a..bf9a8a5 100644 --- a/infra/cert-manager/config.yaml +++ b/bootstrap/cert-manager/config.yaml @@ -5,7 +5,7 @@ "source": { "repoURL": "https://charts.jetstack.io", "chart": "cert-manager", - "targetRevision": v1.19.4 + "targetRevision": "v1.19.4" }, "helm": { "values": "crds:\n enabled: true\n" diff --git a/infra/kargo-ci-pipeline/config.yaml b/bootstrap/kargo-ci-pipeline/config.yaml similarity index 100% rename from infra/kargo-ci-pipeline/config.yaml rename to bootstrap/kargo-ci-pipeline/config.yaml diff --git a/infra/kargo-infra-pipeline/config.yaml b/bootstrap/kargo-infra-pipeline/config.yaml similarity index 100% rename from infra/kargo-infra-pipeline/config.yaml rename to bootstrap/kargo-infra-pipeline/config.yaml diff --git a/infra/kargo-test-env-pipeline/config.yaml b/bootstrap/kargo-test-env-pipeline/config.yaml similarity index 100% rename from infra/kargo-test-env-pipeline/config.yaml rename to bootstrap/kargo-test-env-pipeline/config.yaml diff --git a/infra/kargo/config.yaml b/bootstrap/kargo/config.yaml similarity index 100% rename from infra/kargo/config.yaml rename to bootstrap/kargo/config.yaml diff --git a/infra/kargo/values/secret-values.dev.enc.yaml b/bootstrap/kargo/values/secret-values.dev.enc.yaml similarity index 100% rename from infra/kargo/values/secret-values.dev.enc.yaml rename to bootstrap/kargo/values/secret-values.dev.enc.yaml diff --git a/infra/kargo/values/secret-values.prod.enc.yaml b/bootstrap/kargo/values/secret-values.prod.enc.yaml similarity index 100% rename from infra/kargo/values/secret-values.prod.enc.yaml rename to bootstrap/kargo/values/secret-values.prod.enc.yaml diff --git a/infra/traefik-routes/config.yaml b/bootstrap/traefik-routes/config.yaml similarity index 93% rename from infra/traefik-routes/config.yaml rename to bootstrap/traefik-routes/config.yaml index fde26b0..e36170e 100644 --- a/infra/traefik-routes/config.yaml +++ b/bootstrap/traefik-routes/config.yaml @@ -1,7 +1,7 @@ { "name": "traefik-routes", "namespace": "kube-system", - "step": "3", + "step": "2", "source": { "repoURL": "https://github.com/Kargones/deploy-app-kargo-private.git", "path": "infra/traefik-routes/manifests", diff --git a/infra/traefik-routes/manifests/gitea-ingress.yaml b/bootstrap/traefik-routes/manifests/gitea-ingress.yaml similarity index 100% rename from infra/traefik-routes/manifests/gitea-ingress.yaml rename to bootstrap/traefik-routes/manifests/gitea-ingress.yaml diff --git a/infra/traefik-routes/manifests/gitea-ssh.yaml b/bootstrap/traefik-routes/manifests/gitea-ssh.yaml similarity index 100% rename from infra/traefik-routes/manifests/gitea-ssh.yaml rename to bootstrap/traefik-routes/manifests/gitea-ssh.yaml diff --git a/infra/traefik-routes/manifests/kargo-ingress.yaml b/bootstrap/traefik-routes/manifests/kargo-ingress.yaml similarity index 100% rename from infra/traefik-routes/manifests/kargo-ingress.yaml rename to bootstrap/traefik-routes/manifests/kargo-ingress.yaml diff --git a/infra/traefik-routes/manifests/kargo-transport.yaml b/bootstrap/traefik-routes/manifests/kargo-transport.yaml similarity index 100% rename from infra/traefik-routes/manifests/kargo-transport.yaml rename to bootstrap/traefik-routes/manifests/kargo-transport.yaml diff --git a/infra/traefik-routes/manifests/middlewares.yaml b/bootstrap/traefik-routes/manifests/middlewares.yaml similarity index 100% rename from infra/traefik-routes/manifests/middlewares.yaml rename to bootstrap/traefik-routes/manifests/middlewares.yaml diff --git a/infra/traefik-routes/manifests/namespaces.yaml b/bootstrap/traefik-routes/manifests/namespaces.yaml similarity index 100% rename from infra/traefik-routes/manifests/namespaces.yaml rename to bootstrap/traefik-routes/manifests/namespaces.yaml diff --git a/infra/traefik-routes/manifests/tls-store.yaml b/bootstrap/traefik-routes/manifests/tls-store.yaml similarity index 100% rename from infra/traefik-routes/manifests/tls-store.yaml rename to bootstrap/traefik-routes/manifests/tls-store.yaml diff --git a/infra/traefik-routes/manifests/traefik-dashboard.yaml b/bootstrap/traefik-routes/manifests/traefik-dashboard.yaml similarity index 100% rename from infra/traefik-routes/manifests/traefik-dashboard.yaml rename to bootstrap/traefik-routes/manifests/traefik-dashboard.yaml diff --git a/infra/gitea-custom/config.yaml b/infra/gitea-custom/config.yaml index d6ce90f..e11c8cb 100644 --- a/infra/gitea-custom/config.yaml +++ b/infra/gitea-custom/config.yaml @@ -1,7 +1,7 @@ { "name": "gitea-custom", "namespace": "gitea", - "step": "6", + "step": "2", "source": { "repoURL": "https://github.com/Kargones/deploy-app-kargo-private.git", "path": "infra/gitea-custom/manifests", diff --git a/infra/gitea/config.yaml b/infra/gitea/config.yaml index 367bcf5..5ca7050 100644 --- a/infra/gitea/config.yaml +++ b/infra/gitea/config.yaml @@ -1,7 +1,7 @@ { "name": "gitea", "namespace": "gitea", - "step": "4", + "step": "1", "source": { "repoURL": "https://dl.gitea.com/charts", "chart": "gitea", diff --git a/infra/kargo-credentials/config.yaml b/infra/kargo-credentials/config.yaml deleted file mode 100644 index 16cfd71..0000000 --- a/infra/kargo-credentials/config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "kargo-credentials", - "namespace": "default", - "step": "5", - "source": { - "repoURL": "https://github.com/Kargones/deploy-app-kargo-private.git", - "path": "kargo/credentials", - "targetRevision": "main" - } -} diff --git a/kargo/credentials/git-creds-ci.dev.enc.yaml b/kargo/credentials/dev/git-creds-ci.dev.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-ci.dev.enc.yaml rename to kargo/credentials/dev/git-creds-ci.dev.enc.yaml diff --git a/kargo/credentials/git-creds-infra.dev.enc.yaml b/kargo/credentials/dev/git-creds-infra.dev.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-infra.dev.enc.yaml rename to kargo/credentials/dev/git-creds-infra.dev.enc.yaml diff --git a/kargo/credentials/git-creds-test-env.dev.enc.yaml b/kargo/credentials/dev/git-creds-test-env.dev.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-test-env.dev.enc.yaml rename to kargo/credentials/dev/git-creds-test-env.dev.enc.yaml diff --git a/kargo/credentials/dev/ksops-generator.yaml b/kargo/credentials/dev/ksops-generator.yaml new file mode 100644 index 0000000..2ec060c --- /dev/null +++ b/kargo/credentials/dev/ksops-generator.yaml @@ -0,0 +1,12 @@ +apiVersion: viaduct.ai/v1 +kind: ksops +metadata: + name: kargo-git-credentials + annotations: + config.kubernetes.io/function: | + exec: + path: ksops +files: + - git-creds-infra.dev.enc.yaml + - git-creds-ci.dev.enc.yaml + - git-creds-test-env.dev.enc.yaml diff --git a/kargo/credentials/kustomization.yaml b/kargo/credentials/dev/kustomization.yaml similarity index 100% rename from kargo/credentials/kustomization.yaml rename to kargo/credentials/dev/kustomization.yaml diff --git a/kargo/credentials/ksops-generator.yaml b/kargo/credentials/ksops-generator.yaml deleted file mode 100644 index 9c2337e..0000000 --- a/kargo/credentials/ksops-generator.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# ksops generator: decrypts SOPS-encrypted K8s Secret manifests -# ArgoCD repo-server must have ksops + sops + age installed -# -# Dev cluster uses: *.dev.enc.yaml -# Prod cluster uses: *.prod.enc.yaml -# -# Which files to decrypt is controlled by the kustomization overlay -# in the cluster-specific branch (infra/stage/dev or infra/stage/prod) -apiVersion: viaduct.ai/v1 -kind: ksops -metadata: - name: kargo-git-credentials - annotations: - config.kubernetes.io/function: | - exec: - path: ksops -files: - - git-creds-infra.dev.enc.yaml - - git-creds-ci.dev.enc.yaml - - git-creds-test-env.dev.enc.yaml diff --git a/kargo/credentials/git-creds-ci.prod.enc.yaml b/kargo/credentials/prod/git-creds-ci.prod.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-ci.prod.enc.yaml rename to kargo/credentials/prod/git-creds-ci.prod.enc.yaml diff --git a/kargo/credentials/git-creds-infra.prod.enc.yaml b/kargo/credentials/prod/git-creds-infra.prod.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-infra.prod.enc.yaml rename to kargo/credentials/prod/git-creds-infra.prod.enc.yaml diff --git a/kargo/credentials/git-creds-test-env.prod.enc.yaml b/kargo/credentials/prod/git-creds-test-env.prod.enc.yaml similarity index 100% rename from kargo/credentials/git-creds-test-env.prod.enc.yaml rename to kargo/credentials/prod/git-creds-test-env.prod.enc.yaml diff --git a/kargo/credentials/ksops-generator.prod.yaml b/kargo/credentials/prod/ksops-generator.yaml similarity index 74% rename from kargo/credentials/ksops-generator.prod.yaml rename to kargo/credentials/prod/ksops-generator.yaml index 2c7c6b1..98ad171 100644 --- a/kargo/credentials/ksops-generator.prod.yaml +++ b/kargo/credentials/prod/ksops-generator.yaml @@ -1,5 +1,3 @@ -# ksops generator for PROD cluster -# Replace ksops-generator.yaml on infra/stage/prod branch apiVersion: viaduct.ai/v1 kind: ksops metadata: diff --git a/kargo/credentials/prod/kustomization.yaml b/kargo/credentials/prod/kustomization.yaml new file mode 100644 index 0000000..e87131a --- /dev/null +++ b/kargo/credentials/prod/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +generators: + - ksops-generator.yaml diff --git a/kargo/infra/stages/dev.yaml b/kargo/infra/stages/dev.yaml index 8207672..fade12b 100644 --- a/kargo/infra/stages/dev.yaml +++ b/kargo/infra/stages/dev.yaml @@ -30,20 +30,6 @@ spec: - uses: git-clear config: path: ./out - - uses: yaml-update - as: update-cert-manager - config: - path: ./src/infra/cert-manager/config.yaml - updates: - - key: source.targetRevision - value: ${{ chartFrom("https://charts.jetstack.io", "cert-manager").Version }} - - uses: yaml-update - as: update-argo-rollouts - config: - path: ./src/infra/argo-rollouts/config.yaml - updates: - - key: source.targetRevision - value: ${{ chartFrom("https://argoproj.github.io/argo-helm", "argo-rollouts").Version }} - uses: yaml-update as: update-gitea config: diff --git a/kargo/infra/warehouse.yaml b/kargo/infra/warehouse.yaml index 51dad23..c249041 100644 --- a/kargo/infra/warehouse.yaml +++ b/kargo/infra/warehouse.yaml @@ -5,16 +5,6 @@ metadata: namespace: infra spec: subscriptions: - - chart: - repoURL: https://charts.jetstack.io - name: cert-manager - semverConstraint: ">=1.17.0" - discoveryLimit: 5 - - chart: - repoURL: https://argoproj.github.io/argo-helm - name: argo-rollouts - semverConstraint: ">=2.39.0" - discoveryLimit: 5 - chart: repoURL: https://dl.gitea.com/charts name: gitea diff --git a/kargo/test-env/warehouse.yaml b/kargo/test-env/warehouse.yaml index 344cc18..92e0aed 100644 --- a/kargo/test-env/warehouse.yaml +++ b/kargo/test-env/warehouse.yaml @@ -4,5 +4,11 @@ metadata: name: test-env-images namespace: test-env spec: - subscriptions: [] - # TODO: Add container image subscriptions for test services + # Placeholder: no subscriptions yet. + # When test services are added, subscribe to their container images here. + subscriptions: + - chart: + repoURL: https://dl.gitea.com/charts + name: gitea + semverConstraint: ">=0.0.1" + discoveryLimit: 1