feat: convert nautobot to AppSet

apps/appsets/components.yaml

@@ -68,9 +68,42 @@ spec:
                     <<: *uc_component
                     path: 'components/undersync'
                 - component: nautobot
-                  source:
-                    <<: *uc_component
-                    path: 'components/nautobot'
+                  sources:
+                    - repoURL: '{{index .metadata.annotations "uc_repo_git_url"}}'
+                      targetRevision: '{{index .metadata.annotations "uc_repo_ref"}}'
+                      path: 'components/nautobot'
+                      ref: understack
+                    - repoURL: '{{index .metadata.annotations "uc_deploy_git_url"}}'
+                      targetRevision: '{{index .metadata.annotations "uc_deploy_ref"}}'
+                      ref: secrets
+                      path: 'secrets/{{.name}}'
+                      directory:
+                        include: 'secret-nautobot.yaml'
+                        exclude: 'secret-nautobot-sso-dex.yaml'
+                    - repoURL: https://nautobot.github.io/helm-charts/
+                      chart: nautobot
+                      targetRevision: 2.1.0
+                      helm:
+                        releaseName: nautobot
+                        valuesObject:
+                          ingress:
+                            annotations:
+                              cert-manager.io/cluster-issuer: '{{.name }}-cluster-issuer'
+                              nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+                            hostname: 'nautobot.{{index .metadata.annotations "dns_zone" }}'
+                          nautobot:
+                            extraEnvVars:
+                              - name: SOCIAL_AUTH_OIDC_OIDC_ENDPOINT
+                                value: 'https://dex.{{index .metadata.annotations "dns_zone" }}'
+                        valueFiles:
+                          - $understack/components/nautobot/nautobot-values.yaml
+                          - $secrets/helm-configs/{{.name}}/nautobot.yaml
+                        ignoreMissingValueFiles: true
+                        fileParameters:
+                          - name: nautobot.config
+                            # until ArgoCD 2.13.0 is released we cannot use a reference
+                            # path: $understack/components/nautobot/nautobot_config.py
+                            path: 'https://raw.githubusercontent.com/rackerlabs/understack/{{index .metadata.annotations "uc_repo_ref" }}/components/nautobot/nautobot_config.py'
                 - component: argo
                   source:
                     <<: *uc_component

components/nautobot/kustomization.yaml

@@ -10,7 +10,7 @@ resources:
 helmCharts:
 - name: redis
   repo: https://charts.bitnami.com/bitnami
-  version: 18.12.1
+  version: 18.19.4
   namespace: nautobot
-  releaseName: nautobot-redis
+  releaseName: nautobot
   valuesFile: redis-values.yaml

docs/deploy-guide/gitops-install.md

@@ -189,7 +189,6 @@ kubectl -n argocd apply -f "${UC_DEPLOY}/secrets/${DEPLOY_NAME}/argocd/secret-de
 Finally run the following to have ArgoCD deploy the system:
 
 ```bash
-kubectl apply -f "${UC_DEPLOY}/clusters/${DEPLOY_NAME}/app-of-apps.yaml"
 # from your understack checkout
 kubectl apply -f apps/cluster-setup.yaml
 ```

scripts/gitops-deploy.sh

@@ -59,19 +59,9 @@ export DEPLOY_NAME
 export UC_REPO_REF="${UC_REPO_REF:-HEAD}"
 export UC_DEPLOY_REF="${UC_DEPLOY_REF:-HEAD}"
 
-for part in operators components; do
-    echo "Creating ${part} configs"
-    mkdir -p "${UC_DEPLOY_CLUSTER}/${part}"
-    for tmpl in $(find "${UC_REPO_APPS}/${part}" -type f); do
-        outfile=$(basename "${tmpl}")
-        template "${tmpl}" "${UC_DEPLOY_CLUSTER}/${part}/${outfile}"
-    done
-    rm -rf "${UC_DEPLOY_CLUSTER}/${part}/kustomization.yaml"
-done
-
 # create helm-configs directory for values.yaml overrides
 mkdir -p "${UC_DEPLOY_HELM_CFG}"
-for component in dex nautobot; do
+for component in dex; do
     helmvals="${UC_DEPLOY_HELM_CFG}/${component}.yaml"
     if [ -f "${helmvals}" ]; then
         echo "You have ${helmvals} already, not overwriting"
@@ -83,6 +73,3 @@ for component in dex nautobot; do
         echo "# add your values.yaml overrides for the helm chart here" > "${helmvals}"
     fi
 done
-
-echo "Creating app-of-apps config"
-template "${UC_REPO_APPS}/app-of-apps.yaml" "${UC_DEPLOY_CLUSTER}/app-of-apps.yaml"