diff options
| author |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2018-06-03 17:07:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-06-03 17:07:06 +0000 |
| commit | 112a077412effc2703482c535910c4fd916f63e3 (patch) | |
| tree | 5f2ce2046cd3305547fa78eb73aea5cb4d77898f | |
| parent | 3dd1b4004420360d2643977690da07dc3368bf0d (diff) | |
| parent | 1a62b66badfe2fe081020443dc1805ce89e0e547 (diff) | |
Merge "Add port variable for appc cdt"
| -rw-r--r-- | kubernetes/appc/charts/appc-cdt/templates/deployment.yaml | 7 | ||||
| -rw-r--r-- | kubernetes/appc/templates/service.yaml | 1 | ||||
| -rw-r--r-- | kubernetes/appc/values.yaml | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml index 2226b75bbf..a2cb9fc83a 100644 --- a/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml +++ b/kubernetes/appc/charts/appc-cdt/templates/deployment.yaml @@ -21,6 +21,8 @@ spec: - name: {{ include "common.name" . }} image: "{{ include "common.repository" . }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /opt/startCdt.sh ports: - containerPort: {{ .Values.service.internalPort }} name: {{ .Values.service.name }} @@ -39,6 +41,11 @@ spec: initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} env: + # This sets the port that CDT will use to connect to the main appc container. + # The 32 is the node port suffix that is used in the main appc oom templates + # for nodePort3. + - name: CDT_PORT + value: "{{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.nodePort3 }}" volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml index 0ba73e3984..733c4ca3be 100644 --- a/kubernetes/appc/templates/service.yaml +++ b/kubernetes/appc/templates/service.yaml @@ -32,6 +32,7 @@ spec: nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }} name: "{{ .Values.service.portName }}-1830" - port: {{ .Values.service.externalPort3 }} + targetPort: {{ .Values.service.internalPort3 }} nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }} name: "{{ .Values.service.portName }}-9090" {{- else -}} diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 1bb7e231bb..9b7b54706a 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -69,7 +69,8 @@ dgbuilder: dbServiceName: appc-dbhost service: name: appc-dgbuilder - +appc-cdt: + nodePort3: 32 # default number of instances replicaCount: 1 |