New version of zdm-proxy helm chart using StatefulSets #89
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,46 +5,71 @@ | |
|
|
||
| # calculate a variable that contains all proxy service addresses | ||
| {{ $service_addresses := "" -}} | ||
| {{- range $index := until (.Values.count | int) -}} | ||
| {{- $service_addresses = printf "%s,$(%s_%s_SERVICE_HOST)" $service_addresses ($zdm_fullname | upper | replace "-" "_") ($index | toString) -}} | ||
| {{- end -}} | ||
| {{- $service_addresses = $service_addresses | trimPrefix "," -}} | ||
|
|
||
weideng1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| apiVersion: apps/v1 | ||
| kind: StatefulSet | ||
| metadata: | ||
| labels: | ||
| {{- $zdm_labels | nindent 4 }} | ||
| app: {{ $zdm_fullname }} | ||
| name: {{ $zdm_fullname }} | ||
| namespace: {{ $.Values.namespace }} | ||
| spec: | ||
| serviceName: {{ $zdm_fullname }} | ||
| replicas: {{ $.Values.count | int }} | ||
| selector: | ||
| matchLabels: | ||
| {{- $zdm_selectorLabels | nindent 6 }} | ||
| app: {{ $zdm_fullname }} | ||
|
There was a problem hiding this comment. Consider these recommended labels from the k8s docs. https://kubernetes.io/docs/concepts/overview/working-with-objects/common-labels/ |
||
| template: | ||
| metadata: | ||
| labels: | ||
| {{- $zdm_selectorLabels | nindent 8 }} | ||
| app: {{ $zdm_fullname }} | ||
| spec: | ||
| containers: | ||
| - image: "{{ $.Values.imageRepository }}:{{ $.Values.imageTag | default $.Chart.AppVersion }}" | ||
| name: {{ $zdm_fullname }} | ||
| command: | ||
| - sh | ||
| - "-c" | ||
| - "ZDM_PROXY_TOPOLOGY_INDEX=`echo ${HOSTNAME##*-}` /main" | ||
|
Comment on lines
+38
to
+40
There was a problem hiding this comment. It's surprising that you're specifying a command here vs just passing in arguments to the command specified in the Docker image (or relying on arguments there).
Comment on lines
+38
to
+40
There was a problem hiding this comment. You should be able to populate an environment variable with a There was a problem hiding this comment. Hmm, it looks like you're extracting the ordinal index which is not available to the pod directly. It's frustrating that this isn't available. (I see the link to kubernetes/kubernetes#40651 as well) There was a problem hiding this comment. @bradfordcp Yes exactly. That was the route I explored and ended up using the workaround as you pointed out. Should we resolve this comment? |
||
| livenessProbe: | ||
| httpGet: | ||
| path: /health/liveness | ||
| port: httpproxy | ||
| initialDelaySeconds: 10 | ||
| periodSeconds: 10 | ||
| readinessProbe: | ||
| httpGet: | ||
| path: /health/readiness | ||
| port: httpproxy | ||
| initialDelaySeconds: 10 | ||
| periodSeconds: 10 | ||
| ports: | ||
| - name: httpproxy | ||
| containerPort: 14001 | ||
| protocol: TCP | ||
| - name: cql | ||
| containerPort: 9042 | ||
| protocol: TCP | ||
| resources: | ||
weideng1 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| {{- toYaml .Values.resources | nindent 10 }} | ||
| env: | ||
| - name: ZDM_PRIMARY_CLUSTER | ||
| value: {{ $.Values.primaryCluster | upper | quote }} | ||
| - name: ZDM_READ_MODE | ||
| value: {{ $.Values.readMode | upper | quote }} | ||
| - name: ZDM_LOG_LEVEL | ||
| value: {{ $.Values.logLevel | upper | quote }} | ||
| - name: ZDM_PROXY_MAX_CLIENT_CONNECTIONS | ||
| value: {{ $.Values.maxClientConnections | quote }} | ||
| - name: ZDM_METRICS_ENABLED | ||
| value: {{ $.Values.metricsEnabled | quote }} | ||
| - name: ZDM_PROXY_LISTEN_ADDRESS | ||
| valueFrom: | ||
| fieldRef: | ||
|
|
@@ -57,8 +82,6 @@ spec: | |
| fieldPath: status.podIP | ||
| - name: ZDM_METRICS_PORT | ||
| value: "14001" | ||
| - name: ZDM_PROXY_TOPOLOGY_ADDRESSES | ||
| value: {{ $service_addresses }} | ||
| - name: ZDM_TARGET_SECURE_CONNECT_BUNDLE_PATH | ||
|
|
@@ -93,8 +116,6 @@ spec: | |
| secretKeyRef: | ||
| name: zdmproxy | ||
| key: target_password | ||
| volumeMounts: | ||
| - name: scb | ||
| mountPath: "/tmp/scb" | ||
|
|
@@ -106,5 +127,3 @@ spec: | |
| items: | ||
| - key: secure-connect-target.zip | ||
| path: target.zip | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are you trying to match a per-pod label?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jsanda The reason for us to create individual services and match them 1:1 at pod level is because unlike C*, zdm-proxy processes don't have gossip protocol to detect/notify topology changes among themselves; whatever set of IP addresses and their respective ordinal index (see here) specified at the start of the proxy process is going to stuck for the rest of its lifecycle. To allow dynamical IP address change to the pods due to reschedule/cordon/crash, we decided to for N number of proxies, implement N number of services, and them map 1-on-1. Given that pods managed by k8s Deployment object doesn't have a static pod name, we switched to using StatefulSets. In StatefulSets, each pod has a unique/static pod-name that we can map the service to. This will allow orderly rolling restart of the zdm-proxy pods to happen.