fix: correct load balancer annotation

AtomiCloud · Aug 11, 2024 · 98e5b50 · 98e5b50
1 parent 6838879
commit 98e5b50
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/chart/values.entei.amber.yaml b/chart/values.entei.amber.yaml
@@ -7,18 +7,28 @@ tags: &tags
   atomi.cloud/landscape: *landscape
 
 ingress-nginx:
-
   commonLabels:
     <<: *tags
+
   controller:
     config:
       enable-opentelemetry: "true"
+      skip-access-log-urls: "/healthz"
+    #      use-proxy-protocol: "true"
     opentelemetry:
       enabled: true
     service:
       annotations:
         external-dns.alpha.kubernetes.io/hostname: amber.lb.atomi.cloud
         external-dns.alpha.kubernetes.io/ttl: "120"
+        service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+        service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing"
+        service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp"
+        service.beta.kubernetes.io/aws-load-balancer-type: "external"
+        service.beta.kubernetes.io/aws-load-balancer-attributes: "deletion_protection.enabled=true"
+        #        service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+        service.beta.kubernetes.io/aws-load-balancer-name: "entei-amber-sulfoxide-gold"
+        service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: "atomi.cloud/landscape=entei,atomi.cloud/cluster=amber,atomi.cloud/platform=sulfoxide,atomi.cloud/service=gold,atomi.cloud/module=load-balancer,atomi.cloud/layer=1"
     annotations:
       <<: *tags
     podAnnotations:
@@ -27,11 +37,11 @@ ingress-nginx:
       <<: *tags
     resources:
       limits:
-        cpu: 2
+        cpu: '2'
         memory: 4Gi
       requests:
-        cpu: 250m
-        memory: 256Mi
-    replicaCount: 2
+        cpu: 500m
+        memory: 512Mi
+
     podLabels:
       <<: *tags
diff --git a/chart/values.entei.topaz.yaml b/chart/values.entei.topaz.yaml
@@ -7,18 +7,28 @@ tags: &tags
   atomi.cloud/landscape: *landscape
 
 ingress-nginx:
-
   commonLabels:
     <<: *tags
+
   controller:
     config:
       enable-opentelemetry: "true"
+      skip-access-log-urls: "/healthz"
+    #      use-proxy-protocol: "true"
     opentelemetry:
       enabled: true
     service:
       annotations:
         external-dns.alpha.kubernetes.io/hostname: topaz.lb.atomi.cloud
         external-dns.alpha.kubernetes.io/ttl: "120"
+        service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+        service.beta.kubernetes.io/aws-load-balancer-scheme: "internet-facing"
+        service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "tcp"
+        service.beta.kubernetes.io/aws-load-balancer-type: "external"
+        service.beta.kubernetes.io/aws-load-balancer-attributes: "deletion_protection.enabled=true"
+        #        service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: "*"
+        service.beta.kubernetes.io/aws-load-balancer-name: "entei-topaz-sulfoxide-gold"
+        service.beta.kubernetes.io/aws-load-balancer-additional-resource-tags: "atomi.cloud/landscape=entei,atomi.cloud/cluster=topaz,atomi.cloud/platform=sulfoxide,atomi.cloud/service=gold,atomi.cloud/module=load-balancer,atomi.cloud/layer=1"
     annotations:
       <<: *tags
     podAnnotations:
@@ -27,11 +37,11 @@ ingress-nginx:
       <<: *tags
     resources:
       limits:
-        cpu: 2
+        cpu: '2'
         memory: 4Gi
       requests:
-        cpu: 250m
-        memory: 256Mi
-    replicaCount: 2
+        cpu: 500m
+        memory: 512Mi
+
     podLabels:
       <<: *tags