ReplicaSet, node ID, AWS NLB (#37)

* ReplicaSet

* Chart version

Author: levkk

Chart.yaml

@@ -1,3 +1,3 @@
 apiVersion: v1
 name: pgdog
-version: v0.22
+version: v0.23

templates/deployment.yaml

@@ -1,10 +1,17 @@
 apiVersion: apps/v1
+{{- if .Values.statefulSet.enabled }}
+kind: StatefulSet
+{{- else }}
 kind: Deployment
+{{- end }}
 metadata:
   name: {{ include "pgdog.fullname" . }}
   labels:
     {{- include "pgdog.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.statefulSet.enabled }}
+  serviceName: {{ include "pgdog.fullname" . }}-headless
+  {{- end }}
   replicas: {{ .Values.replicas }}
   selector:
     matchLabels:
@@ -35,6 +42,11 @@ spec:
             - "/etc/pgdog/pgdog.toml"
             - "--users"
             - "/etc/secrets/pgdog/users.toml"
+          env:
+            - name: NODE_ID
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
           ports:
             - name: pgdog
               containerPort: {{ .Values.port }}

templates/service-headless.yaml

@@ -0,0 +1,22 @@
+{{- if .Values.statefulSet.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "pgdog.fullname" . }}-headless
+  labels:
+    {{- include "pgdog.labels" . | nindent 4 }}
+spec:
+  type: ClusterIP
+  clusterIP: None
+  selector:
+    {{- include "pgdog.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: pgdog
+      protocol: TCP
+      port: {{ .Values.port }}
+      targetPort: {{ .Values.port }}
+    - name: openmetrics
+      protocol: TCP
+      port: {{ .Values.openMetricsPort }}
+      targetPort: {{ .Values.openMetricsPort }}
+{{- end }}

templates/service.yaml

@@ -2,14 +2,29 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "pgdog.fullname" . }}
-  {{- if .Values.service.annotations }}
+  {{- if or .Values.service.annotations .Values.service.aws.enabled }}
   annotations:
-    {{- toYaml .Values.service.annotations | nindent 4 }}
+    {{- if .Values.service.aws.enabled }}
+    service.beta.kubernetes.io/aws-load-balancer-scheme: {{ .Values.service.aws.scheme | quote }}
+    service.beta.kubernetes.io/aws-load-balancer-cross-zone-load-balancing-enabled: "true"
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+    service.beta.kubernetes.io/aws-load-balancer-type: "external"
+    service.beta.kubernetes.io/aws-load-balancer-manage-backend-security-group-rules: "true"
+    service.beta.kubernetes.io/aws-load-balancer-listener-attributes.TCP-{{ .Values.port }}: tcp.idle_timeout.seconds=1800
+    {{- end }}
+    {{- with .Values.service.annotations }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
   {{- end }}
   labels:
     {{- include "pgdog.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.service.aws.enabled }}
+  type: LoadBalancer
+  loadBalancerClass: service.k8s.aws/nlb
+  {{- else }}
   type: {{ .Values.service.type }}
+  {{- end }}
   selector:
     {{- include "pgdog.selectorLabels" . | nindent 4 }}
   {{- if .Values.service.trafficDistribution }}

values.yaml

@@ -40,6 +40,12 @@ port: 6432
 # replicas indicates how many instances of PgDog will run (HA).
 replicas: 2
 
+# statefulSet controls whether to deploy as StatefulSet instead of Deployment
+# StatefulSet provides stable DNS hostnames for each pod (e.g., pgdog-0, pgdog-1)
+statefulSet:
+  # enabled switches from Deployment to StatefulSet
+  enabled: false
+
 # resources define resource requests and limits for the pgdog container
 # Note: requests and limits are set to the same values for Guaranteed QoS
 # Ratio: 1GB memory per 1 CPU (1000m CPU = 1Gi memory)
@@ -106,6 +112,14 @@ service:
   # (PreferClose, PreferSameZone, PreferSameNode)
   # see https://kubernetes.io/docs/reference/networking/virtual-ips/#traffic-distribution for more details.
   trafficDistribution: ""
+  # aws configures AWS Load Balancer Controller annotations
+  # When enabled, service type is automatically set to LoadBalancer
+  aws:
+    # enabled controls whether to add AWS LB annotations
+    enabled: false
+    # scheme controls whether the load balancer is internet-facing or internal
+    # Valid values: "internet-facing" or "internal"
+    scheme: "internal"
 
 
 # nodeSelector allows scheduling pods on nodes with specific labels