diff --git a/app-of-projects.yaml b/app-of-projects.yaml index ad9fcdd..bf73751 100644 --- a/app-of-projects.yaml +++ b/app-of-projects.yaml @@ -17,7 +17,7 @@ metadata: spec: project: default source: - repoURL: 'http://gitea.192.168.1.7.nip.io/mukul/devops-infra-argo-config.git' + repoURL: 'http://gitea-http.gitea.svc.cluster.local:3000/gitadmin/devops-infra-argo-config-gcp.git' targetRevision: main path: projects directory: diff --git a/incubator/incubator-infra-gke-toolshed-prd-usc1.yaml b/incubator/incubator-infra-gke-toolshed-prd-usc1.yaml new file mode 100644 index 0000000..6b9fe13 --- /dev/null +++ b/incubator/incubator-infra-gke-toolshed-prd-usc1.yaml @@ -0,0 +1,19 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: incubator-infra-gke-toolshed-prd-usc1 + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + project: default + source: + repoURL: 'http://gitea-http.gitea.svc.cluster.local:3000/gitadmin/devops-infra-argo-config-gcp.git' + targetRevision: main + path: generic-argo-apps-chart + helm: + valueFiles: + - ../values/incubator-infra-gke-toolshed-prd-usc1-values.yaml + destination: + name: in-cluster + namespace: argocd diff --git a/projects/devops-project.yaml b/projects/devops-project.yaml index d01c6e4..854e4df 100644 --- a/projects/devops-project.yaml +++ b/projects/devops-project.yaml @@ -3,13 +3,12 @@ kind: AppProject metadata: name: devops # Single ArgoCD instance — projects live in the same namespace as - # ArgoCD itself (see the argocd/argocd-admin note in - # values/incubator-infra-k8s-admin-prd-ase1-values.yaml). + # ArgoCD itself (see values/incubator-infra-gke-toolshed-prd-usc1-values.yaml). namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: - description: "devops project for infra apps on the homelab VM (team: devops in the appSpec labels)." + description: "devops project for infra apps on the GKE cluster (team: devops in the appSpec labels)." sourceRepos: - '*' destinations: diff --git a/values/incubator-infra-gke-toolshed-prd-usc1-values.yaml b/values/incubator-infra-gke-toolshed-prd-usc1-values.yaml new file mode 100644 index 0000000..f92b336 --- /dev/null +++ b/values/incubator-infra-gke-toolshed-prd-usc1-values.yaml @@ -0,0 +1,49 @@ +# GKE counterpart of incubator-infra-k8s-admin-prd-ase1-values.yaml. Starts +# with only the three components installed by hand at bootstrap; every +# other homelab component is added here as it is ported, each with its own +# helm-overrides/gke-toolshed-prd-usc1//custom-values.yaml. +clusterSpec: + destination: + server: "" + name: "in-cluster" + +argocdSpec: + namespace: argocd + +teamSpec: + devops: + source: + # Cluster DNS, not an Ingress: ArgoCD must be able to read this before + # Contour exists, because Contour is itself one of these Applications. + repoURL: http://gitea-http.gitea.svc.cluster.local:3000/gitadmin/devops-infra-helm-charts-gcp.git + targetRevision: main + path: helm-templates + valueFiles: ../../helm-overrides/gke-toolshed-prd-usc1 + labels: + bu: infra + team: devops + env: prd + cluster: gke-toolshed-prd-usc1 + +# nameOverride on every entry must equal the Helm release name used for the +# manual bootstrap install. ArgoCD uses the Application name as the release +# name, so a mismatch renders a second copy instead of adopting the first. +appSpec: + - name: argocd + nameOverride: argocd-admin-prd + namespace: argocd + chartDir: argo-cd + valuesDir: argocd-admin-prd + - name: gitea + nameOverride: gitea + namespace: gitea + chartDir: gitea + valuesDir: gitea + - name: cert-manager + nameOverride: cert-manager + namespace: cert-manager + chartDir: cert-manager + valuesDir: cert-manager + # cert-manager's CRDs embed large OpenAPI schemas; SSA avoids the + # 256KiB last-applied-configuration limit, same as external-secrets. + serverSideApply: true