diff --git a/infrastructure/01-metallb/base/01-metallb-pool.yaml b/infrastructure/01-metallb/base/01-metallb-pool.yaml index 9e54b3d..4bdf6bf 100644 --- a/infrastructure/01-metallb/base/01-metallb-pool.yaml +++ b/infrastructure/01-metallb/base/01-metallb-pool.yaml @@ -5,4 +5,4 @@ metadata: spec: addresses: - 192.168.178.101-192.168.178.105 - - 82.165.0.71/32 + - 82.165.0.71/ diff --git a/infrastructure/02-argocd/applications/infrastructure-traefik.yaml b/infrastructure/02-argocd/applications/infrastructure-traefik.yaml new file mode 100644 index 0000000..2c4fc8f --- /dev/null +++ b/infrastructure/02-argocd/applications/infrastructure-traefik.yaml @@ -0,0 +1,17 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: traefik + namespace: argocd +spec: + destination: + name: in-cluster + namespace: traefik + project: default + source: + path: infrastructure/03-traefik + repoURL: https://github.com/illiumst/kubedeploy.git + targetRevision: HEAD + syncPolicy: + syncOptions: + - CreateNamespace=true diff --git a/infrastructure/02-argocd/patches/argocd-server-service.yaml b/infrastructure/02-argocd/base/argocd-server-service.yaml similarity index 86% rename from infrastructure/02-argocd/patches/argocd-server-service.yaml rename to infrastructure/02-argocd/base/argocd-server-service.yaml index 95e027b..5cd8444 100644 --- a/infrastructure/02-argocd/patches/argocd-server-service.yaml +++ b/infrastructure/02-argocd/base/argocd-server-service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: argocd-server + namespace: argocd spec: type: LoadBalancer loadBalancerIP: 192.168.178.103 diff --git a/infrastructure/02-argocd/kustomization.yaml b/infrastructure/02-argocd/kustomization.yaml index 30dcf60..f127394 100644 --- a/infrastructure/02-argocd/kustomization.yaml +++ b/infrastructure/02-argocd/kustomization.yaml @@ -8,12 +8,12 @@ resources: # Applications - applications/projects-website.yaml # Base functionality +- argocd-server-service.yaml - base/argo-cd-k-with-helm.yaml - https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml - base/argo-cd-namespace.yaml patches: -- path: patches/argocd-server-service.yaml - path: patches/argocd-cm-patch.yaml - path: patches/argocd-cmd-params-cm.yaml - path: patches/nodeselector.yaml diff --git a/infrastructure/03-traefik/base/kustomization.yaml b/infrastructure/03-traefik/base/kustomization.yaml index 571954d..4f5cc1c 100644 --- a/infrastructure/03-traefik/base/kustomization.yaml +++ b/infrastructure/03-traefik/base/kustomization.yaml @@ -5,7 +5,6 @@ kind: Kustomization components: - crds - resources: # Deployment - deployment-traefik.yaml