diff --git a/registry/clusters/dev/components/external-secret-stores.yaml b/registry/clusters/dev/components/external-secret-stores.yaml deleted file mode 100644 index 6cf03c4..0000000 --- a/registry/clusters/dev/components/external-secret-stores.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: external-secret-stores-components - namespace: argocd - annotations: - argocd.argoproj.io/sync-wave: "20" - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: https://github.com/mrsimonemms/infrastructure - path: registry/components/external-secret-stores - targetRevision: HEAD - kustomize: - patches: - - target: - group: external-secrets.io - version: v1beta1 - kind: ClusterSecretStore - name: infisical - patch: |- - - op: replace - path: /spec/provider/infisical/secretsScope/environmentSlug - value: dev - destination: - server: https://kubernetes.default.svc - namespace: external-secrets - syncPolicy: - automated: - prune: true - selfHeal: true diff --git a/registry/clusters/prod/components/external-secret-stores.yaml b/registry/clusters/prod/components/external-secret-stores.yaml deleted file mode 100644 index d291437..0000000 --- a/registry/clusters/prod/components/external-secret-stores.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: external-secret-stores-components - namespace: argocd - annotations: - argocd.argoproj.io/sync-wave: "20" - finalizers: - - resources-finalizer.argocd.argoproj.io -spec: - project: default - source: - repoURL: https://github.com/mrsimonemms/infrastructure - path: registry/components/external-secret-stores - targetRevision: HEAD - destination: - server: https://kubernetes.default.svc - namespace: external-secrets - syncPolicy: - automated: - prune: true - selfHeal: true diff --git a/registry/components/cert-manager/application.yaml b/registry/components/cert-manager/application.yaml index bb597f6..d3e498e 100644 --- a/registry/components/cert-manager/application.yaml +++ b/registry/components/cert-manager/application.yaml @@ -8,12 +8,12 @@ metadata: spec: project: default source: + chart: cert-manager repoURL: https://charts.jetstack.io targetRevision: v1.16.1 helm: valuesObject: installCRDs: true - chart: cert-manager destination: server: https://kubernetes.default.svc namespace: cert-manager diff --git a/registry/components/cert-manager/kustomization.yaml b/registry/components/cert-manager/kustomization.yaml index 83109d5..79cf4d0 100644 --- a/registry/components/cert-manager/kustomization.yaml +++ b/registry/components/cert-manager/kustomization.yaml @@ -3,3 +3,4 @@ kind: Kustomization resources: - application.yaml - clusterissuers.yaml + - namespace.yaml diff --git a/registry/components/cert-manager/namespace.yaml b/registry/components/cert-manager/namespace.yaml new file mode 100644 index 0000000..754d6c3 --- /dev/null +++ b/registry/components/cert-manager/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: cert-manager + annotations: + argocd.argoproj.io/sync-wave: "-1" diff --git a/registry/components/external-dns/kustomization.yaml b/registry/components/external-dns/kustomization.yaml index f4a5b2c..a048ccd 100644 --- a/registry/components/external-dns/kustomization.yaml +++ b/registry/components/external-dns/kustomization.yaml @@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - application.yaml + - namespace.yaml - secret.yaml diff --git a/registry/components/external-dns/namespace.yaml b/registry/components/external-dns/namespace.yaml new file mode 100644 index 0000000..4bc82b1 --- /dev/null +++ b/registry/components/external-dns/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: external-dns + annotations: + argocd.argoproj.io/sync-wave: "-1" diff --git a/registry/components/external-secret-stores/kustomization.yaml b/registry/components/external-secret-stores/kustomization.yaml deleted file mode 100644 index 430a5fb..0000000 --- a/registry/components/external-secret-stores/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - infisical.yaml diff --git a/registry/components/external-secret-stores/infisical.yaml b/registry/components/external-secrets/infisical.yaml similarity index 90% rename from registry/components/external-secret-stores/infisical.yaml rename to registry/components/external-secrets/infisical.yaml index 7a72e63..1814d66 100644 --- a/registry/components/external-secret-stores/infisical.yaml +++ b/registry/components/external-secrets/infisical.yaml @@ -3,6 +3,7 @@ kind: ClusterSecretStore metadata: name: infisical annotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true argocd.argoproj.io/sync-wave: "20" spec: provider: diff --git a/registry/components/external-secrets/kustomization.yaml b/registry/components/external-secrets/kustomization.yaml index 977dcfe..233b90e 100644 --- a/registry/components/external-secrets/kustomization.yaml +++ b/registry/components/external-secrets/kustomization.yaml @@ -2,3 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - application.yaml + - infisical.yaml + - namespace.yaml diff --git a/registry/components/reloader/application.yaml b/registry/components/reloader/application.yaml index 82a4118..198a53a 100644 --- a/registry/components/reloader/application.yaml +++ b/registry/components/reloader/application.yaml @@ -8,13 +8,13 @@ metadata: spec: project: default source: + chart: reloader repoURL: https://stakater.github.io/stakater-charts targetRevision: 1.1.0 helm: valuesObject: reloader: watchGlobally: true - chart: reloader destination: server: https://kubernetes.default.svc namespace: reloader diff --git a/registry/components/reloader/kustomization.yaml b/registry/components/reloader/kustomization.yaml index 977dcfe..0e0a709 100644 --- a/registry/components/reloader/kustomization.yaml +++ b/registry/components/reloader/kustomization.yaml @@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - application.yaml + - namespace.yaml diff --git a/registry/components/reloader/namespace.yaml b/registry/components/reloader/namespace.yaml new file mode 100644 index 0000000..c94a527 --- /dev/null +++ b/registry/components/reloader/namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: reloader + annotations: + argocd.argoproj.io/sync-wave: "-1"