summaryrefslogtreecommitdiffstats
path: root/kubernetes/mso
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/mso')
-rw-r--r--kubernetes/mso/Chart.yaml4
-rw-r--r--kubernetes/mso/templates/all-services.yaml (renamed from kubernetes/mso/all-services.yaml)2
-rw-r--r--kubernetes/mso/templates/db-deployment.yaml (renamed from kubernetes/mso/db-deployment.yaml)8
-rw-r--r--kubernetes/mso/templates/mso-deployment.yaml (renamed from kubernetes/mso/mso-deployment.yaml)12
-rw-r--r--kubernetes/mso/values.yaml7
5 files changed, 25 insertions, 8 deletions
diff --git a/kubernetes/mso/Chart.yaml b/kubernetes/mso/Chart.yaml
new file mode 100644
index 0000000000..ad01a78d2d
--- /dev/null
+++ b/kubernetes/mso/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: mso
+version: 0.1.0
diff --git a/kubernetes/mso/all-services.yaml b/kubernetes/mso/templates/all-services.yaml
index 881ebba4a9..6e2db71650 100644
--- a/kubernetes/mso/all-services.yaml
+++ b/kubernetes/mso/templates/all-services.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: mariadb
+ namespace: {{ .Values.NS }}
labels:
app: mariadb
spec:
@@ -16,6 +17,7 @@ apiVersion: v1
kind: Service
metadata:
name: mso
+ namespace: {{ .Values.NS }}
labels:
app: mso
spec:
diff --git a/kubernetes/mso/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml
index f57f4bac87..ff1cf75350 100644
--- a/kubernetes/mso/db-deployment.yaml
+++ b/kubernetes/mso/templates/db-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mariadb
+ namespace: {{ .Values.NS }}
spec:
replicas: 1
selector:
@@ -16,7 +17,8 @@ spec:
hostname: mariadb
containers:
- args:
- image: nexus3.onap.org:10001/mariadb:10.1.11
+ image: {{ .Values.image.mariadb }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: "mariadb"
env:
- name: MYSQL_ROOT_PASSWORD
@@ -41,9 +43,9 @@ spec:
volumes:
- name: mso-mariadb-conf
hostPath:
- path: /dockerdata-nfs/onapdemo/mso/mariadb/conf.d
+ path: /dockerdata-nfs/onap/mso/mariadb/conf.d
- name: mso-mariadb-docker-entrypoint-initdb
hostPath:
- path: /dockerdata-nfs/onapdemo/mso/mariadb/docker-entrypoint-initdb.d
+ path: /dockerdata-nfs/onap/mso/mariadb/docker-entrypoint-initdb.d
imagePullSecrets:
- name: onap-docker-registry-key
diff --git a/kubernetes/mso/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml
index fb052df734..6f12769d5a 100644
--- a/kubernetes/mso/mso-deployment.yaml
+++ b/kubernetes/mso/templates/mso-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: mso
+ namespace: {{ .Values.NS }}
spec:
replicas: 1
selector:
@@ -33,8 +34,8 @@ spec:
}
}
],
- "image": "oomk8s/readiness-check:1.0.0",
- "imagePullPolicy": "Always",
+ "image": "{{ .Values.image.readiness }}",
+ "imagePullPolicy": "{{ .Values.pullPolicy }}",
"name": "mso-readiness"
}
]'
@@ -42,7 +43,8 @@ spec:
containers:
- command:
- /docker-files/scripts/start-jboss-server.sh
- image: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest
+ image: {{ .Values.image.mso }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: mso
volumeMounts:
- mountPath: /shared
@@ -66,9 +68,9 @@ spec:
volumes:
- name: mso
hostPath:
- path: /dockerdata-nfs/onapdemo/mso/mso
+ path: /dockerdata-nfs/onap/mso/mso
- name: mso-docker-files
hostPath:
- path: /dockerdata-nfs/onapdemo/mso/docker-files
+ path: /dockerdata-nfs/onap/mso/docker-files
imagePullSecrets:
- name: onap-docker-registry-key
diff --git a/kubernetes/mso/values.yaml b/kubernetes/mso/values.yaml
new file mode 100644
index 0000000000..41f9677029
--- /dev/null
+++ b/kubernetes/mso/values.yaml
@@ -0,0 +1,7 @@
+NS: onap-mso
+pullPolicy: IfNotPresent
+image:
+ readiness: oomk8s/readiness-check:1.0.0
+ mso: nexus3.onap.org:10001/openecomp/mso:1.0-STAGING-latest
+ mariadb: nexus3.onap.org:10001/mariadb:10.1.11
+