aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/vnfsdk/templates
diff options
context:
space:
mode:
authorjasmineWen <jasmine.wen@amdocs.com>2018-04-03 17:48:41 +0000
committerjasmineWen <jasmine.wen@amdocs.com>2018-04-11 18:45:22 +0000
commit66f6a3b584132406cc5ba57aa5e57f7b1045108c (patch)
tree33ca95c1bd89ac53f231e459a842b4ff0a63d089 /kubernetes/vnfsdk/templates
parent8026b32ab9e9ea5506eab6681591d76069c34f16 (diff)
Add Standardized Configuration to VNFSDK
Issue-ID: OOM-751 Change-Id: I3a9909d4bbb82b874baf9088109a1930a2bfb671 Signed-off-by: jasmineWen <jasmine.wen@amdocs.com>
Diffstat (limited to 'kubernetes/vnfsdk/templates')
-rw-r--r--kubernetes/vnfsdk/templates/NOTES.txt19
-rw-r--r--kubernetes/vnfsdk/templates/all-services.yaml48
-rw-r--r--kubernetes/vnfsdk/templates/deployment.yaml61
-rw-r--r--kubernetes/vnfsdk/templates/postgres-deployment.yaml40
-rw-r--r--kubernetes/vnfsdk/templates/refrepo-deployment.yaml59
-rw-r--r--kubernetes/vnfsdk/templates/service.yaml38
6 files changed, 118 insertions, 147 deletions
diff --git a/kubernetes/vnfsdk/templates/NOTES.txt b/kubernetes/vnfsdk/templates/NOTES.txt
new file mode 100644
index 0000000000..652e69dc3d
--- /dev/null
+++ b/kubernetes/vnfsdk/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.fullname" . }})
+ 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.fullname" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.fullname" . }} -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 "common.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/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml
deleted file mode 100644
index b592c47bad..0000000000
--- a/kubernetes/vnfsdk/templates/all-services.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableVnfsdkPostgres }}
-apiVersion: v1
-kind: Service
-metadata:
- name: postgres
- namespace: {{ .Values.nsPrefix }}
- labels:
- app: postgres
-spec:
- ports:
- - name: postgres-port
- port: 5432
- selector:
- app: postgres
- clusterIP: None
-#{{ end }}
-#{{ if not .Values.disableVnfsdkRefrepo }}
----
-apiVersion: v1
-kind: Service
-metadata:
- labels:
- app: refrepo
- name: refrepo
- namespace: {{ .Values.nsPrefix }}
-spec:
- ports:
- - name: "refrepo-port"
- port: 8702
- nodePort: {{ .Values.nodePortPrefix }}97
- selector:
- app: refrepo
- type: NodePort
-#{{ end }} \ No newline at end of file
diff --git a/kubernetes/vnfsdk/templates/deployment.yaml b/kubernetes/vnfsdk/templates/deployment.yaml
new file mode 100644
index 0000000000..2e5f40b83c
--- /dev/null
+++ b/kubernetes/vnfsdk/templates/deployment.yaml
@@ -0,0 +1,61 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ name: {{ include "common.fullname" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
+ template:
+ metadata:
+ labels:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}
+ name: {{ include "common.name" . }}
+ spec:
+ initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - "{{ index .Values "vnfsdk-postgres" "nameOverride" }}"
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy}}
+ name: {{ include "common.name" . }}-readiness
+ containers:
+ - image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+ imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }}
+ name: {{ include "common.name" . }}
+ readinessProbe:
+ tcpSocket:
+ port: {{ .Values.service.internalPort }}
+ initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+ periodSeconds: {{ .Values.readiness.periodSeconds }}
+ imagePullSecrets:
+ - name: "{{ include "common.namespace" . }}-docker-registry-key"
diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml
deleted file mode 100644
index 14eb741157..0000000000
--- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableVnfsdkPostgres }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- name: vnfsdk-postgres
- namespace: {{ .Values.nsPrefix }}
-spec:
- replicas: 1
- selector:
- matchLabels:
- app: postgres
- template:
- metadata:
- labels:
- app: postgres
- name: vnfsdk-postgres
- spec:
- hostname: postgres
- containers:
- - args:
- image: {{ .Values.image.postgresImage }}:{{ .Values.image.postgresVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- name: "postgres"
- imagePullSecrets:
- - name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }}
diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
deleted file mode 100644
index 95d6fedad9..0000000000
--- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableVnfsdkRefrepo }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
- labels:
- app: refrepo
- name: vnfsdk-refrepo
- namespace: "{{ .Values.nsPrefix }}"
-spec:
- selector:
- matchLabels:
- app: refrepo
- template:
- metadata:
- labels:
- app: refrepo
- name: vnfsdk-refrepo
- spec:
- initContainers:
- - command:
- - /root/ready.py
- args:
- - --container-name
- - postgres
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.image.readiness }}:{{ .Values.image.readinessVersion }}"
- imagePullPolicy: {{ .Values.pullPolicy }}
- name: vnfsdk-readiness
- containers:
- - image: {{ .Values.image.refrepoImage }}:{{ .Values.image.refrepoVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- name: refrepo
- readinessProbe:
- tcpSocket:
- port: 8702
- initialDelaySeconds: 5
- periodSeconds: 10
- imagePullSecrets:
- - name: {{ .Values.nsPrefix }}-docker-registry-key
-#{{ end }}
diff --git a/kubernetes/vnfsdk/templates/service.yaml b/kubernetes/vnfsdk/templates/service.yaml
new file mode 100644
index 0000000000..6aac9e603b
--- /dev/null
+++ b/kubernetes/vnfsdk/templates/service.yaml
@@ -0,0 +1,38 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "common.fullname" . }}
+ 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 "302" }}{{ .Values.service.nodePort }}
+ {{- else -}}
+ - port: {{ .Values.service.externalPort }}
+ targetPort: {{ .Values.service.internalPort }}
+ {{- end}}
+ name: {{ .Values.service.name }}
+ selector:
+ app: {{ include "common.name" . }}
+ release: {{ .Release.Name }}