untrim srgocd after adding 2nd worker
This commit is contained in:
parent
8c07e3f27b
commit
7a0a54b60b
|
|
@ -1105,7 +1105,19 @@ resource "helm_release" "argocd" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
applicationSet = {
|
applicationSet = {
|
||||||
replicas = 0
|
nodeSelector = local.argocd_node_selector
|
||||||
|
affinity = local.argocd_component_affinity.application_set
|
||||||
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.application_set
|
||||||
|
resources = {
|
||||||
|
requests = {
|
||||||
|
cpu = "100m"
|
||||||
|
memory = "256Mi"
|
||||||
|
}
|
||||||
|
limits = {
|
||||||
|
cpu = "300m"
|
||||||
|
memory = "512Mi"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
controller = {
|
controller = {
|
||||||
nodeSelector = local.argocd_node_selector
|
nodeSelector = local.argocd_node_selector
|
||||||
|
|
@ -1113,8 +1125,8 @@ resource "helm_release" "argocd" {
|
||||||
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.controller
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.controller
|
||||||
resources = {
|
resources = {
|
||||||
requests = {
|
requests = {
|
||||||
cpu = "75m"
|
cpu = "100m"
|
||||||
memory = "192Mi"
|
memory = "256Mi"
|
||||||
}
|
}
|
||||||
limits = {
|
limits = {
|
||||||
cpu = "300m"
|
cpu = "300m"
|
||||||
|
|
@ -1123,10 +1135,34 @@ resource "helm_release" "argocd" {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dex = {
|
dex = {
|
||||||
enabled = false
|
nodeSelector = local.argocd_node_selector
|
||||||
|
affinity = local.argocd_component_affinity.dex
|
||||||
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.dex
|
||||||
|
resources = {
|
||||||
|
requests = {
|
||||||
|
cpu = "100m"
|
||||||
|
memory = "256Mi"
|
||||||
|
}
|
||||||
|
limits = {
|
||||||
|
cpu = "300m"
|
||||||
|
memory = "512Mi"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
notifications = {
|
notifications = {
|
||||||
enabled = false
|
nodeSelector = local.argocd_node_selector
|
||||||
|
affinity = local.argocd_component_affinity.notifications
|
||||||
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.notifications
|
||||||
|
resources = {
|
||||||
|
requests = {
|
||||||
|
cpu = "100m"
|
||||||
|
memory = "256Mi"
|
||||||
|
}
|
||||||
|
limits = {
|
||||||
|
cpu = "300m"
|
||||||
|
memory = "512Mi"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
redis = {
|
redis = {
|
||||||
nodeSelector = local.argocd_node_selector
|
nodeSelector = local.argocd_node_selector
|
||||||
|
|
@ -1134,12 +1170,12 @@ resource "helm_release" "argocd" {
|
||||||
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.redis
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.redis
|
||||||
resources = {
|
resources = {
|
||||||
requests = {
|
requests = {
|
||||||
cpu = "25m"
|
cpu = "100m"
|
||||||
memory = "64Mi"
|
memory = "256Mi"
|
||||||
}
|
}
|
||||||
limits = {
|
limits = {
|
||||||
cpu = "100m"
|
cpu = "300m"
|
||||||
memory = "128Mi"
|
memory = "512Mi"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1149,12 +1185,12 @@ resource "helm_release" "argocd" {
|
||||||
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.repo_server
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.repo_server
|
||||||
resources = {
|
resources = {
|
||||||
requests = {
|
requests = {
|
||||||
cpu = "50m"
|
cpu = "100m"
|
||||||
memory = "128Mi"
|
memory = "256Mi"
|
||||||
}
|
}
|
||||||
limits = {
|
limits = {
|
||||||
cpu = "300m"
|
cpu = "300m"
|
||||||
memory = "384Mi"
|
memory = "512Mi"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1164,12 +1200,12 @@ resource "helm_release" "argocd" {
|
||||||
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.server
|
topologySpreadConstraints = local.argocd_component_topology_spread_constraints.server
|
||||||
resources = {
|
resources = {
|
||||||
requests = {
|
requests = {
|
||||||
cpu = "50m"
|
cpu = "100m"
|
||||||
memory = "128Mi"
|
memory = "256Mi"
|
||||||
}
|
}
|
||||||
limits = {
|
limits = {
|
||||||
cpu = "300m"
|
cpu = "300m"
|
||||||
memory = "384Mi"
|
memory = "512Mi"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1185,7 +1221,7 @@ resource "null_resource" "argocd_ready" {
|
||||||
namespace = var.argocd.namespace
|
namespace = var.argocd.namespace
|
||||||
version = var.argocd.version
|
version = var.argocd.version
|
||||||
node_selector = jsonencode(local.argocd_node_selector)
|
node_selector = jsonencode(local.argocd_node_selector)
|
||||||
readiness_check = "5"
|
readiness_check = "6"
|
||||||
}
|
}
|
||||||
|
|
||||||
provisioner "local-exec" {
|
provisioner "local-exec" {
|
||||||
|
|
@ -1248,7 +1284,10 @@ wait_for_argocd_component() {
|
||||||
}
|
}
|
||||||
|
|
||||||
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" wait --for=condition=Established --timeout=180s crd/applications.argoproj.io
|
kubectl --kubeconfig "${self.triggers.kubeconfig_path}" wait --for=condition=Established --timeout=180s crd/applications.argoproj.io
|
||||||
|
wait_for_argocd_component deployment/argocd-applicationset-controller app.kubernetes.io/name=argocd-applicationset-controller
|
||||||
wait_for_argocd_component statefulset/argocd-application-controller app.kubernetes.io/name=argocd-application-controller
|
wait_for_argocd_component statefulset/argocd-application-controller app.kubernetes.io/name=argocd-application-controller
|
||||||
|
wait_for_argocd_component deployment/argocd-dex-server app.kubernetes.io/name=argocd-dex-server
|
||||||
|
wait_for_argocd_component deployment/argocd-notifications-controller app.kubernetes.io/name=argocd-notifications-controller
|
||||||
wait_for_argocd_component deployment/argocd-redis app.kubernetes.io/name=argocd-redis
|
wait_for_argocd_component deployment/argocd-redis app.kubernetes.io/name=argocd-redis
|
||||||
wait_for_argocd_component deployment/argocd-repo-server app.kubernetes.io/name=argocd-repo-server
|
wait_for_argocd_component deployment/argocd-repo-server app.kubernetes.io/name=argocd-repo-server
|
||||||
wait_for_argocd_component deployment/argocd-server app.kubernetes.io/name=argocd-server
|
wait_for_argocd_component deployment/argocd-server app.kubernetes.io/name=argocd-server
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue