summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kubernetes/appc/Chart.yaml4
-rw-r--r--kubernetes/appc/templates/all-services.yaml (renamed from kubernetes/appc/all-services.yaml)5
-rw-r--r--kubernetes/appc/templates/appc-deployment.yaml (renamed from kubernetes/appc/appc-deployment.yaml)12
-rw-r--r--kubernetes/appc/templates/db-deployment.yaml (renamed from kubernetes/appc/db-deployment.yaml)6
-rw-r--r--kubernetes/appc/templates/dgbuilder-deployment.yaml (renamed from kubernetes/appc/dgbuilder-deployment.yaml)10
-rw-r--r--kubernetes/appc/values.yaml7
-rw-r--r--kubernetes/oneclick/setenv.bash4
7 files changed, 35 insertions, 13 deletions
diff --git a/kubernetes/appc/Chart.yaml b/kubernetes/appc/Chart.yaml
new file mode 100644
index 0000000000..da4f1b3edc
--- /dev/null
+++ b/kubernetes/appc/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: appc
+version: 0.1.0
diff --git a/kubernetes/appc/all-services.yaml b/kubernetes/appc/templates/all-services.yaml
index 8ce32acf91..939ef7fba7 100644
--- a/kubernetes/appc/all-services.yaml
+++ b/kubernetes/appc/templates/all-services.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: dbhost
+ namespace: {{ .Values.NS }}
labels:
app: appc-dbhost
spec:
@@ -16,6 +17,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnctldb01
+ namespace: {{ .Values.NS }}
labels:
app: appc-dbhost
spec:
@@ -29,6 +31,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnctldb02
+ namespace: {{ .Values.NS }}
labels:
app: appc-dbhost
spec:
@@ -42,6 +45,7 @@ apiVersion: v1
kind: Service
metadata:
name: sdnhost
+ namespace: {{ .Values.NS }}
labels:
app: appc
spec:
@@ -61,6 +65,7 @@ apiVersion: v1
kind: Service
metadata:
name: dgbuilder
+ namespace: {{ .Values.NS }}
labels:
app: appc-dgbuilder
spec:
diff --git a/kubernetes/appc/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index e2f2b4ead4..0bd93f8fb6 100644
--- a/kubernetes/appc/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: appc
+ namespace: {{ .Values.NS }}
spec:
selector:
matchLabels:
@@ -32,8 +33,8 @@ spec:
}
}
],
- "image": "oomk8s/readiness-check:1.0.0",
- "imagePullPolicy": "Always",
+ "image": "{{ .Values.image.readiness }}",
+ "imagePullPolicy": "{{ .Values.pullPolicy }}",
"name": "appc-readiness"
}
]'
@@ -50,7 +51,8 @@ spec:
value: /opt/openecomp/appc/data/properties
- name: DMAAP_TOPIC_ENV
value: SUCCESS
- image: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest
+ image: {{ .Values.image.appc }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: appc-controller-container
volumeMounts:
- mountPath: /opt/openecomp/appc/data/properties
@@ -68,9 +70,9 @@ spec:
volumes:
- name: appc-conf
hostPath:
- path: /dockerdata-nfs/onapdemo/appc/conf
+ path: /dockerdata-nfs/onap/appc/conf
- name: sdnc-conf
hostPath:
- path: /dockerdata-nfs/onapdemo/sdnc/conf
+ path: /dockerdata-nfs/onap/sdnc/conf
imagePullSecrets:
- name: onap-docker-registry-key
diff --git a/kubernetes/appc/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml
index ee796faca3..f7b55187a0 100644
--- a/kubernetes/appc/db-deployment.yaml
+++ b/kubernetes/appc/templates/db-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: appc-dbhost
+ namespace: {{ .Values.NS }}
spec:
selector:
matchLabels:
@@ -17,7 +18,8 @@ spec:
value: openECOMP1.0
- name: MYSQL_ROOT_HOST
value: '%'
- image: mysql/mysql-server:5.6
+ image: {{ .Values.image.mysqlServer }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: appc-db-container
volumeMounts:
- mountPath: /var/lib/mysql
@@ -33,6 +35,6 @@ spec:
volumes:
- name: appc-data
hostPath:
- path: /dockerdata-nfs/onapdemo/appc/data
+ path: /dockerdata-nfs/onap/appc/data
imagePullSecrets:
- name: onap-docker-registry-key
diff --git a/kubernetes/appc/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml
index de8149390c..54bf596a97 100644
--- a/kubernetes/appc/dgbuilder-deployment.yaml
+++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml
@@ -2,6 +2,7 @@ apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: appc-dgbuilder
+ namespace: {{ .Values.NS }}
spec:
selector:
matchLabels:
@@ -34,8 +35,8 @@ spec:
}
}
],
- "image": "oomk8s/readiness-check:1.0.0",
- "imagePullPolicy": "Always",
+ "image": "{{ .Values.image.readiness }}",
+ "imagePullPolicy": "{{ .Values.pullPolicy }}",
"name": "appc-dgbuilder-readiness"
}
]'
@@ -44,7 +45,7 @@ spec:
- command:
- /bin/bash
- -c
- - cd /opt/openecomp/sdnc/dgbuilder/ && ./start sdnc1.0 && wait
+ - cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait
env:
- name: MYSQL_ROOT_PASSWORD
value: openECOMP1.0
@@ -52,7 +53,8 @@ spec:
value: /opt/openecomp/sdnc/data/properties
- name: APPC_CONFIG_DIR
value: /opt/openecomp/appc/data/properties
- image: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest
+ image: {{ .Values.image.dgbuilderSdnc }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
name: appc-dgbuilder-container
ports:
- containerPort: 3100
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
new file mode 100644
index 0000000000..22000a7a36
--- /dev/null
+++ b/kubernetes/appc/values.yaml
@@ -0,0 +1,7 @@
+NS: onap-appc
+pullPolicy: Always
+image:
+ readiness: oomk8s/readiness-check:1.0.0
+ appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
+ mysqlServer: mysql/mysql-server:5.6
+ dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash
index 070dce9a7f..b24d5aa627 100644
--- a/kubernetes/oneclick/setenv.bash
+++ b/kubernetes/oneclick/setenv.bash
@@ -1,7 +1,7 @@
#!/bin/bash
-HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy')
-ONAP_APPS=('sdc' 'aai' 'appc')
+HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc')
+ONAP_APPS=('sdc' 'aai')
ONAP_DOCKER_REGISTRY_KEY=${ONAP_DOCKER_REGISTRY_KEY:-onap-docker-registry-key}
ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}