From d3bc08f62b6fc71f672f26d3df0d19c335856abc Mon Sep 17 00:00:00 2001 From: vaibhav_16dec Date: Thu, 15 Mar 2018 07:05:10 +0000 Subject: Robot Helm Chart Standardization Issue-ID: OOM-728 Change-Id: I2e6b298a78e7d10c47ce1d531bf089c928a40284 Signed-off-by: vaibhav_16dec --- kubernetes/robot/templates/NOTES.txt | 19 +++++ kubernetes/robot/templates/all-services.yaml | 16 ----- kubernetes/robot/templates/configmap.yaml | 23 ++++++ kubernetes/robot/templates/deployment.yaml | 82 ++++++++++++++++++++++ .../robot/templates/robot-dep-configmap.yaml | 25 ------- kubernetes/robot/templates/robot-deployment.yaml | 63 ----------------- kubernetes/robot/templates/service.yaml | 25 +++++++ 7 files changed, 149 insertions(+), 104 deletions(-) create mode 100644 kubernetes/robot/templates/NOTES.txt delete mode 100644 kubernetes/robot/templates/all-services.yaml create mode 100644 kubernetes/robot/templates/configmap.yaml create mode 100644 kubernetes/robot/templates/deployment.yaml delete mode 100644 kubernetes/robot/templates/robot-dep-configmap.yaml delete mode 100644 kubernetes/robot/templates/robot-deployment.yaml create mode 100644 kubernetes/robot/templates/service.yaml (limited to 'kubernetes/robot/templates') diff --git a/kubernetes/robot/templates/NOTES.txt b/kubernetes/robot/templates/NOTES.txt new file mode 100644 index 0000000000..91d8ed42f1 --- /dev/null +++ b/kubernetes/robot/templates/NOTES.txt @@ -0,0 +1,19 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range .Values.ingress.hosts }} + http://{{ . }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ include "common.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ include "common.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.externalPort }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ template "so.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }} +{{- end }} diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml deleted file mode 100644 index 604982b1e4..0000000000 --- a/kubernetes/robot/templates/all-services.yaml +++ /dev/null @@ -1,16 +0,0 @@ -#{{ if not .Values.disableRobotRobot }} -apiVersion: v1 -kind: Service -metadata: - labels: - app: robot - name: robot - namespace: "{{ .Values.nsPrefix }}" -spec: - ports: - - port: 88 - nodePort: {{ .Values.nodePortPrefix }}09 - selector: - app: robot - type: NodePort -#{{ end }} \ No newline at end of file diff --git a/kubernetes/robot/templates/configmap.yaml b/kubernetes/robot/templates/configmap.yaml new file mode 100644 index 0000000000..fd26992273 --- /dev/null +++ b/kubernetes/robot/templates/configmap.yaml @@ -0,0 +1,23 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.name" . }}-eteshare-configmap + namespace: {{ include "common.namespace" . }} +data: +{{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.name" . }}-resources-configmap + namespace: {{ include "common.namespace" . }} +data: +{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.name" . }}-lighttpd-authorization-configmap + namespace: {{ include "common.namespace" . }} +data: +{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }} diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml new file mode 100644 index 0000000000..596d622a4b --- /dev/null +++ b/kubernetes/robot/templates/deployment.yaml @@ -0,0 +1,82 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: {{ include "common.name" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + replicas: {{ .Values.robotReplicas }} + template: + metadata: + labels: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: + - containerPort: {{ .Values.service.internalPort }} + # disable liveness probe when breakpoints set in debugger + # so K8s doesn't restart unresponsive container + {{- if eq .Values.liveness.enabled true }} + livenessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.liveness.periodSeconds }} + {{ end -}} + readinessProbe: + tcpSocket: + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.readiness.periodSeconds }} + volumeMounts: + - name: localtime + mountPath: /etc/localtime + readOnly: true + - name: robot-eteshare + mountPath: /share/config + - name: robot-resources + mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot + subPath: asdc_interface.robot + - name: robot-resources + mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot + subPath: policy_interface.robot + - name: robot-resources + mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot + subPath: sdngc_interface.robot + - name: robot-lighttpd-authorization + mountPath: /etc/lighttpd/authorization + subPath: authorization + resources: +{{ toYaml .Values.resources | indent 12 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 10 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: robot-eteshare + configMap: + name: {{ include "common.name" . }}-eteshare-configmap + defaultMode: 0755 + - name: robot-resources + configMap: + name: {{ include "common.name" . }}-resources-configmap + - name: robot-lighttpd-authorization + configMap: + name: {{ include "common.name" . }}-lighttpd-authorization-configmap + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/robot/templates/robot-dep-configmap.yaml b/kubernetes/robot/templates/robot-dep-configmap.yaml deleted file mode 100644 index 94e359dce7..0000000000 --- a/kubernetes/robot/templates/robot-dep-configmap.yaml +++ /dev/null @@ -1,25 +0,0 @@ -#{{ if not .Values.disableRobot }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: robot-eteshare-configmap - namespace: {{ .Values.nsPrefix }} -data: -{{ tpl (.Files.Glob "resources/config/eteshare/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: robot-resources-configmap - namespace: {{ .Values.nsPrefix }} -data: -{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: lighttpd-authorization-configmap - namespace: {{ .Values.nsPrefix }} -data: -{{ tpl (.Files.Glob "resources/config/authorization").AsConfig . | indent 2 }} -#{{ end }} diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml deleted file mode 100644 index 9f936e8275..0000000000 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ /dev/null @@ -1,63 +0,0 @@ -#{{ if not .Values.disableRobotRobot }} -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: robot - namespace: "{{ .Values.nsPrefix }}" -spec: - replicas: {{ .Values.robotReplicas }} - selector: - matchLabels: - app: robot - template: - metadata: - labels: - app: robot - name: robot - spec: - containers: - - image: {{ .Values.image.testsuite }} - imagePullPolicy: {{ .Values.pullPolicy }} - name: robot - volumeMounts: - - name: localtime - mountPath: /etc/localtime - readOnly: true - - name: robot-eteshare - mountPath: /share/config - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/asdc_interface.robot - subPath: asdc_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - subPath: policy_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot - subPath: sdngc_interface.robot - - name: lighttpd-authorization - mountPath: /etc/lighttpd/authorization - subPath: authorization - ports: - - containerPort: 88 - readinessProbe: - tcpSocket: - port: 88 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: localtime - hostPath: - path: /etc/localtime - - name: robot-eteshare - configMap: - name: robot-eteshare-configmap - defaultMode: 0755 - - name: robot-resources - configMap: - name: robot-resources-configmap - - name: lighttpd-authorization - configMap: - name: lighttpd-authorization-configmap - imagePullSecrets: - - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }} diff --git a/kubernetes/robot/templates/service.yaml b/kubernetes/robot/templates/service.yaml new file mode 100644 index 0000000000..90d0ab8d18 --- /dev/null +++ b/kubernetes/robot/templates/service.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "common.name" . }} + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + type: {{ .Values.service.type }} + ports: + {{if eq .Values.service.type "NodePort" -}} + - port: {{ .Values.service.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort }} + name: {{ .Values.service.name }} + {{- else -}} + - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} + name: {{ .Values.service.name }} + {{- end}} + selector: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} -- cgit 1.2.3-korg