diff --git a/scripts/1.install_cilium.sh b/scripts/1.install_cilium.sh new file mode 100644 index 0000000..62d5d11 --- /dev/null +++ b/scripts/1.install_cilium.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -e + +sudo ip link delete cilium_host || true && \ +sudo ip link delete cilium_net || true && \ +sudo ip link delete cilium_vxlan || true && \ +helm repo add cilium https://helm.cilium.io || echo "Cilium repo already exists" && \ +helm repo update || echo "Failed to update helm repos" && \ +kubectl create namespace cilium || echo "Namespace cilium already exists" && \ +helm install cilium cilium/cilium --version 1.15.6 \ + --namespace kube-system \ + --set operator.replicas=1 + diff --git a/scripts/install-argocd.sh b/scripts/2.install-argocd.sh similarity index 78% rename from scripts/install-argocd.sh rename to scripts/2.install-argocd.sh index c3e552b..2c0723b 100644 --- a/scripts/install-argocd.sh +++ b/scripts/2.install-argocd.sh @@ -5,4 +5,4 @@ kubectl apply -k "https://github.com/argoproj/argo-cd/manifests/crds?ref=v2.11.4 kubectl create namespace argocd || echo "Namespace argocd already exists" helm repo add argo https://argoproj.github.io/argo-helm || echo "Argo repo already exists" helm repo update || echo "Failed to update helm repos" -helm install argocd -n argocd -f argocd-values.yaml argo/argo-cd --version 7.3.6 \ No newline at end of file +helm upgrade --install argocd -n argocd -f argocd-values.yaml argo/argo-cd --version 7.3.6 \ No newline at end of file diff --git a/scripts/argocd-values.yaml b/scripts/argocd-values.yaml index a3439ed..e5da317 100644 --- a/scripts/argocd-values.yaml +++ b/scripts/argocd-values.yaml @@ -16,18 +16,26 @@ redis-ha: enabled: true server: - service: - type: NodePort autoscaling: enabled: true minReplicas: 2 - # ingress: - # enabled: true - # annotations: - # nginx.ingress.kubernetes.io/force-ssl-redirect: "true" - # nginx.ingress.kubernetes.io/ssl-passthrough: "true" - # nginx.ingress.kubernetes.io/ssl-redirect: "false" - # nginx.ingress.kubernetes.io/use-regex: "true" + # -- Resource limits and requests for the argocd-extensions container + resources: + limits: + cpu: 100m + memory: 256Mi + requests: + cpu: 20m + memory: 138Mi + service: + type: NodePort + ingress: +# enabled: true + annotations: + nginx.ingress.kubernetes.io/force-ssl-redirect: "true" + nginx.ingress.kubernetes.io/ssl-passthrough: "true" + nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/use-regex: "true" ingressClassName: nginx hostname: argocd.cluster.edward.sydney extraTls: @@ -47,6 +55,14 @@ repoServer: autoscaling: enabled: true minReplicas: 2 + # -- Resource limits and requests for the repo server pods + resources: + limits: + cpu: 100m + memory: 258Mi + requests: + cpu: 20m + memory: 128Mi applicationSet: replicas: 2 \ No newline at end of file