restructure and cleanup to overlays for core.

bootstrap/00_1password/README.md

@@ -24,5 +24,5 @@ kubectl -n 1password create secret generic onepassword-token --from-literal=toke
 The following is used to apply the bootstrapping for 1password connect.
 
 ```
-kubectl kustomize --enable-helm | kubectl apply -f -
+kubectl kustomize --enable-helm --load-restrictor='LoadRestrictionNone' | kubectl apply -f -
 ```

bootstrap/00_1password/kustomization.yaml

@@ -1,14 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: 1password
 
 resources:
-- namespace.yaml
-
-helmCharts:
-- name: connect
-  includeCRDs: true
-  releaseName: connect
-  version: 1.15.1
-  valuesFile: customvalues.yaml
-  repo: https://1password.github.io/connect-helm-charts
+- ../../core/1password/overlays/prod

bootstrap/01_certmanager/kustomization.yaml

@@ -1,12 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-#namespace: cert-manager
-
-bases:
-  - https://github.com/cert-manager/cert-manager/releases/download/v1.15.3/cert-manager.yaml
 
 resources:
-  - hhouse-cloudflare-api-token-secret_secrets.yaml
-  - hhouse-clusterissuer.yaml
-  - hhouse-lets-encrypt-priviate-key_secrets.yaml
-  - cloudflare-ca-originissuer.yaml
+- ../../core/cert-manager/overlays/prod

bootstrap/01a_cloudflareoriginca/kustomization.yaml

@@ -2,9 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - 0-namespace.yaml
-  - https://raw.githubusercontent.com/cloudflare/origin-ca-issuer/v0.9.0/deploy/crds/cert-manager.k8s.cloudflare.com_originissuers.yaml
-  - deployment.yaml
-  - role-approver.yaml
-  - role.yaml
-  - serviceaccount.yaml
+#- overlays/ingress.yaml #ingress is now CFTunnel->Service
+- ../../core/origin-ca-issuer/overlays/prod

bootstrap/03_argocd/kustomization.yaml

@@ -2,24 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 namespace: argocd
-bases:
-  - base/non-ha #non-ha for temp microk8s small cluster
 
 resources:
 #- overlays/ingress.yaml #ingress is now CFTunnel->Service
-- op-secrets/dex-githubapp.yaml
-- op-secrets/github-repocreds.yaml
-- certificates/ingress-certificate.yaml
-- certificates/cloudflare-ca-originissuer.yaml
-- op-secrets/hhouse-cloudflare-api-token-secret_secrets.yaml
-- op-secrets/argo-secrets.yaml
-- overlays/argocd-github-appsets.yaml
-- overlays/argocd-github-core.yaml
-- overlays/argocd-project-core.yaml
-
-
-patchesStrategicMerge:
-  - overlays/argocd-cm.yaml
-  - overlays/argocd-cmd-params-cm.yaml
-  - overlays/argocd-ssh-known-hosts-cm.yaml
-  - overlays/argocd-rbac-cm.yaml
+- ../../core/argocd/overlays/prod

bootstrap/README.md

@@ -0,0 +1,3 @@
+# Bootstrap Process
+
+ `kubectl kustomize --enable-helm --load-restrictor='LoadRestrictionsNone'`

core/1password/overlays/prod/kustomization.yaml

@@ -0,0 +1,14 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: 1password
+
+resources:
+- namespace.yaml
+
+helmCharts:
+- name: connect
+  includeCRDs: true
+  releaseName: connect
+  version: 1.15.1
+  valuesFile: customvalues.yaml
+  repo: https://1password.github.io/connect-helm-charts

core/argo-rollouts/kustomization.yaml → core/argo-rollouts/overlays/prod/kustomization.yaml

@@ -5,5 +5,4 @@ namespace: argo-rollouts
 
 resources:
 - namespace.yaml
-- install.yaml
-- wf-install.yaml
+- ../../base/install.yaml

core/argo-rollouts/update.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-wget https://raw.githubusercontent.com/argoproj/argo-rollouts/master/manifests/install.yaml -O install.yaml
+wget https://raw.githubusercontent.com/argoproj/argo-rollouts/master/manifests/install.yaml -O base/install.yaml

core/argo-workflows/overlays/prod/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argo-workflows
+
+resources:
+- namespace.yaml
+- ../../base/wf-install.yaml

core/argo-workflows/overlays/prod/namespace.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    operator.1password.io/auto-restart: "true"
+  name: argo-workflows

core/argo-rollouts/workflow-update.sh → core/argo-workflows/workflow-update.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 #change the following version string to appropriate version to download
-wget https://github.com/argoproj/argo-workflows/releases/download/v3.4.5/install.yaml -O install.yaml
+wget https://github.com/argoproj/argo-workflows/releases/download/v3.4.5/install.yaml -O base/install.yaml

bootstrap/03_argocd/overlays/argocd-github-core.yaml → core/argocd/overlays/prod/appsets/argocd-github-core.yaml

@@ -10,10 +10,10 @@ spec:
       repoURL: https://github.com/jmhardison/hhouse-apps.git
       revision: HEAD
       directories:
-      - path: core/*
+      - path: core/*/overlays/prod
   template:
     metadata:
-      name: '{{path.basename}}'
+      name: '{{path[1]}}'
     spec:
       project: core
       source:
@@ -22,4 +22,4 @@ spec:
         path: '{{path}}'
       destination:
         server: https://kubernetes.default.svc
-        namespace: '{{path.basename}}'
+        namespace: '{{path[1]}}'

core/argocd/overlays/prod/appsets/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argocd
+
+resources:
+- argocd-github-appsets.yaml
+- argocd-github-core.yaml

core/argocd/overlays/prod/kustomization.yaml

@@ -0,0 +1,24 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argocd
+bases:
+  - ../../base/non-ha #non-ha for temp microk8s small cluster
+
+resources:
+#- overlays/ingress.yaml #ingress is now CFTunnel->Service
+- op-secrets/dex-githubapp.yaml
+- op-secrets/github-repocreds.yaml
+- certificates/ingress-certificate.yaml
+- certificates/cloudflare-ca-originissuer.yaml
+- op-secrets/hhouse-cloudflare-api-token-secret_secrets.yaml
+- op-secrets/argo-secrets.yaml
+- appsets/
+- projects/
+
+
+patchesStrategicMerge:
+  - argocd-cm.yaml
+  - argocd-cmd-params-cm.yaml
+  - argocd-ssh-known-hosts-cm.yaml
+  - argocd-rbac-cm.yaml

core/argocd/overlays/prod/projects/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: argocd
+
+resources:
+- argocd-project-core.yaml

core/cert-manager/overlays/prod/kustomization.yaml

@@ -0,0 +1,12 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+#namespace: cert-manager
+
+bases:
+  - https://github.com/cert-manager/cert-manager/releases/download/v1.15.3/cert-manager.yaml
+
+resources:
+  - hhouse-cloudflare-api-token-secret_secrets.yaml
+  - hhouse-clusterissuer.yaml
+  - hhouse-lets-encrypt-priviate-key_secrets.yaml
+  - cloudflare-ca-originissuer.yaml

core/cfargotunnel/base/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: cfargotunnel
+
+resources:
+  - deployment.yaml
+  - namespace.yaml
+

core/cfargotunnel/kustomization.yaml → core/cfargotunnel/overlays/prod/kustomization.yaml

@@ -3,9 +3,8 @@ kind: Kustomization
 namespace: cfargotunnel
 
 resources:
-  - base/deployment.yaml
-  - base/cf-configmap.yaml
-  - base/namespace.yaml
+  - ../../base/deployment.yaml
+  - cf-configmap.yaml
   - op-secrets/hhouse-cloudflare-json.yaml
 
 #get latest versions from https://github.com/cloudflare/cloudflared/releases

core/origin-ca-issuer/overlays/prod/kustomization.yaml

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - 0-namespace.yaml
+  - https://raw.githubusercontent.com/cloudflare/origin-ca-issuer/v0.9.0/deploy/crds/cert-manager.k8s.cloudflare.com_originissuers.yaml
+  - deployment.yaml
+  - role-approver.yaml
+  - role.yaml
+  - serviceaccount.yaml