diff --git a/apps/argocd/patches/argocd-cm.yaml b/apps/argocd/patches/argocd-cm.yaml index 1987789..a5ccd6e 100644 --- a/apps/argocd/patches/argocd-cm.yaml +++ b/apps/argocd/patches/argocd-cm.yaml @@ -14,6 +14,9 @@ data: clientID: $dex.github.clientId clientSecret: $dex.github.clientSecret repositories: | + - name: ingress-nginx + type: helm + url: https://kubernetes.github.io/ingress-nginx - name: jetstack type: helm url: https://charts.jetstack.io diff --git a/apps/system/nginx-ingress/.gitignore b/apps/system/ingress-nginx/.gitignore similarity index 100% rename from apps/system/nginx-ingress/.gitignore rename to apps/system/ingress-nginx/.gitignore diff --git a/apps/system/ingress-nginx/Chart.yaml b/apps/system/ingress-nginx/Chart.yaml new file mode 100644 index 0000000..3cf5a71 --- /dev/null +++ b/apps/system/ingress-nginx/Chart.yaml @@ -0,0 +1 @@ +name: ingress-nginx diff --git a/apps/system/ingress-nginx/requirements.yaml b/apps/system/ingress-nginx/requirements.yaml new file mode 100644 index 0000000..700ba60 --- /dev/null +++ b/apps/system/ingress-nginx/requirements.yaml @@ -0,0 +1,4 @@ +dependencies: +- name: ingress-nginx + version: 3.15.2 + repository: https://kubernetes.github.io/ingress-nginx diff --git a/apps/system/nginx-ingress/values.yaml b/apps/system/ingress-nginx/values.yaml similarity index 96% rename from apps/system/nginx-ingress/values.yaml rename to apps/system/ingress-nginx/values.yaml index 112bd23..f8fb30a 100644 --- a/apps/system/nginx-ingress/values.yaml +++ b/apps/system/ingress-nginx/values.yaml @@ -1,4 +1,4 @@ -nginx-ingress: +ingress-nginx: controller: metrics: enabled: true diff --git a/apps/system/nginx-ingress/Chart.yaml b/apps/system/nginx-ingress/Chart.yaml deleted file mode 100644 index 37b5b6a..0000000 --- a/apps/system/nginx-ingress/Chart.yaml +++ /dev/null @@ -1 +0,0 @@ -name: nginx-ingress diff --git a/apps/system/nginx-ingress/requirements.yaml b/apps/system/nginx-ingress/requirements.yaml deleted file mode 100644 index 0639662..0000000 --- a/apps/system/nginx-ingress/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: -- name: nginx-ingress - version: 1.24.4 - repository: '@stable' diff --git a/main/apps/nginx-ingress.yaml b/main/apps/ingress-nginx.yaml similarity index 79% rename from main/apps/nginx-ingress.yaml rename to main/apps/ingress-nginx.yaml index 5968841..c1b1598 100644 --- a/main/apps/nginx-ingress.yaml +++ b/main/apps/ingress-nginx.yaml @@ -1,17 +1,17 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: nginx-ingress + name: ingress-nginx namespace: argocd finalizers: - resources-finalizer.argocd.argoproj.io spec: destination: - namespace: nginx-ingress + namespace: ingress-nginx server: https://kubernetes.default.svc project: default source: - path: apps/system/nginx-ingress + path: apps/system/ingress-nginx repoURL: git@github.com:gorilych/gf-k8s syncPolicy: automated: