diff --git a/bootstrap/Makefile b/bootstrap/Makefile index 21a3e080..c84979b6 100644 --- a/bootstrap/Makefile +++ b/bootstrap/Makefile @@ -7,7 +7,8 @@ default: argocd root-app .PHONY: argocd argocd: - kustomize build ./argocd | kubectl apply -f - + helm dependencies update ./argocd + helm template ./argocd | kubectl apply -f - # TODO wait for argocd .PHONY: root-app diff --git a/bootstrap/argocd/Chart.yaml b/bootstrap/argocd/Chart.yaml new file mode 100644 index 00000000..6094b49c --- /dev/null +++ b/bootstrap/argocd/Chart.yaml @@ -0,0 +1,7 @@ +apiVersion: v2 +name: argo-cd +version: 3.13.0 +dependencies: +- name: argo-cd + version: 3.13.0 + repository: https://argoproj.github.io/argo-helm diff --git a/bootstrap/argocd/ingress.yaml b/bootstrap/argocd/ingress.yaml deleted file mode 100644 index 1adff434..00000000 --- a/bootstrap/argocd/ingress.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: argocd-server - labels: - cert-manager.io/cluster-issuer: "selfsigned-cluster-issuer" - nginx.ingress.kubernetes.io/backend-protocol: "HTTPS" - nginx.ingress.kubernetes.io/ssl-passthrough: "true" -spec: - rules: - - host: argocd.khuedoan.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: argocd-server - port: - name: https - tls: - - hosts: - - argocd.khuedoan.com - secretName: argocd-secret diff --git a/bootstrap/argocd/kustomization.yaml b/bootstrap/argocd/kustomization.yaml deleted file mode 100644 index 7c880552..00000000 --- a/bootstrap/argocd/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- namespace.yaml -- https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml -- https://raw.githubusercontent.com/argoproj-labs/applicationset/stable/manifests/install.yaml -- ingress.yaml - -namespace: argocd diff --git a/bootstrap/argocd/namespace.yaml b/bootstrap/argocd/namespace.yaml deleted file mode 100644 index a040f2ba..00000000 --- a/bootstrap/argocd/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: argocd diff --git a/bootstrap/argocd/values.yaml b/bootstrap/argocd/values.yaml new file mode 100644 index 00000000..f30cfc04 --- /dev/null +++ b/bootstrap/argocd/values.yaml @@ -0,0 +1,14 @@ +argo-cd: + server: + ingress: + enabled: true + annotations: + cert-manager.io/cluster-issuer: "selfsigned-cluster-issuer" + hosts: + - argocd.khuedoan.com + tls: + - secretName: argocd-tls-certificate + hosts: + - argocd.khuedoan.com + extraArgs: + - --insecure