From 80102849bc4a8920f84fb4798d19d28e2a91da1b Mon Sep 17 00:00:00 2001 From: kerenj Date: Thu, 24 Aug 2017 13:54:21 +0000 Subject: sdc K8S-Helm Parameterization changed sdc k8s deployment to support helm parameterization. updated create/delete for helm only Issue-ID: OOM-52 Change-Id: Ic7fb17fcf5be5813b0a0c54299cdf0d0417e8a76 Signed-off-by: kerenj --- kubernetes/oneclick/createAll.bash | 52 +++---------- kubernetes/oneclick/deleteAll.bash | 22 +----- kubernetes/oneclick/setenv.bash | 3 +- kubernetes/sdc/Chart.yaml | 4 + kubernetes/sdc/all-services.yaml | 81 --------------------- kubernetes/sdc/sdc-be.yaml | 111 ---------------------------- kubernetes/sdc/sdc-cs.yaml | 86 ---------------------- kubernetes/sdc/sdc-es.yaml | 60 --------------- kubernetes/sdc/sdc-fe.yaml | 100 ------------------------- kubernetes/sdc/sdc-kb.yaml | 78 -------------------- kubernetes/sdc/templates/all-services.yaml | 86 ++++++++++++++++++++++ kubernetes/sdc/templates/sdc-be.yaml | 113 +++++++++++++++++++++++++++++ kubernetes/sdc/templates/sdc-cs.yaml | 88 ++++++++++++++++++++++ kubernetes/sdc/templates/sdc-es.yaml | 62 ++++++++++++++++ kubernetes/sdc/templates/sdc-fe.yaml | 102 ++++++++++++++++++++++++++ kubernetes/sdc/templates/sdc-kb.yaml | 80 ++++++++++++++++++++ kubernetes/sdc/values.yaml | 9 +++ 17 files changed, 556 insertions(+), 581 deletions(-) create mode 100644 kubernetes/sdc/Chart.yaml delete mode 100644 kubernetes/sdc/all-services.yaml delete mode 100644 kubernetes/sdc/sdc-be.yaml delete mode 100644 kubernetes/sdc/sdc-cs.yaml delete mode 100644 kubernetes/sdc/sdc-es.yaml delete mode 100644 kubernetes/sdc/sdc-fe.yaml delete mode 100644 kubernetes/sdc/sdc-kb.yaml create mode 100644 kubernetes/sdc/templates/all-services.yaml create mode 100644 kubernetes/sdc/templates/sdc-be.yaml create mode 100644 kubernetes/sdc/templates/sdc-cs.yaml create mode 100644 kubernetes/sdc/templates/sdc-es.yaml create mode 100644 kubernetes/sdc/templates/sdc-fe.yaml create mode 100644 kubernetes/sdc/templates/sdc-kb.yaml create mode 100644 kubernetes/sdc/values.yaml (limited to 'kubernetes') diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index 7e2969760a..95dd809027 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -8,7 +8,6 @@ usage() { Usage: $0 [PARAMs] -u : Display usage -n [NAMESPACE] : Kubernetes namespace (required) --s false : Exclude services (default: true) -i [INSTANCE] : ONAP deployment instance # (default: 1) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: @@ -25,14 +24,6 @@ create_registry_key() { kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7 } -create_service() { - sed -i-- 's/nodePort: [0-9]\{2\}[02468]\{1\}/nodePort: '"$3"'/g' ../$2/all-services.yaml - sed -i-- 's/nodePort: [0-9]\{2\}[13579]\{1\}/nodePort: '"$4"'/g' ../$2/all-services.yaml - kubectl --namespace $1-$2 create -f ../$2/all-services.yaml - mv ../$2/all-services.yaml-- ../$2/all-services.yaml -} - - create_onap_helm() { helm install ../$2/ --name $2 } @@ -84,9 +75,6 @@ while getopts ":n:u:s:i:a:du:dp:" PARAM; do n) NS=${OPTARG} ;; - s) - INCL_SVC=${OPTARG} - ;; i) INSTANCE=${OPTARG} ;; @@ -116,46 +104,26 @@ if [[ -z $NS ]]; then fi if [[ ! -z "$APP" ]]; then - ONAP_APPS=($APP) + HELM_APPS=($APP) fi -if [[ "$INCL_SVC" == true ]]; then - - if [ "$INSTANCE" -gt "$MAX_INSTANCE" ];then - printf "\n********** You choose to create ${INSTANCE}th instance of ONAP \n" - printf "\n********** Due to port allocation only ${MAX_INSTANCE} instances of ONAP is allowed per kubernetes deployment\n" - exit 1 - fi - - start=$((300+2*INSTANCE)) - end=$((start+1)) - printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${start}00 and ${end}99\n" +if [ "$INSTANCE" -gt "$MAX_INSTANCE" ];then + printf "\n********** You choose to create ${INSTANCE}th instance of ONAP \n" + printf "\n********** Due to port allocation only ${MAX_INSTANCE} instances of ONAP is allowed per kubernetes deployment\n" + exit 1 fi -printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n" +start=$((300+2*INSTANCE)) +end=$((start+1)) -for i in ${ONAP_APPS[@]}; do - printf "\nCreating namespace **********\n" - create_namespace $NS $i +printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${start}00 and ${end}99\n" - printf "\nCreating registry secret **********\n" - create_registry_key $NS $i $ONAP_DOCKER_REGISTRY_KEY $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL - if [[ "$INCL_SVC" == true ]]; then - printf "\nCreating service **********\n" - create_service $NS $i $start $end - fi +printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n" - printf "\n" -done -printf "\n\n********** Creating deployments for ${ONAP_APPS[*]} ********** \n" -for i in ${ONAP_APPS[@]}; do - _FILES_PATH=$(echo ../$i) - configure_app $NS $i $_FILES_PATH $start $end - /bin/bash $i.sh $NS $i 'create' -done +printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n" for i in ${HELM_APPS[@]}; do printf "\nCreating namespace **********\n" diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index ad7f060d12..dfa75b59c4 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -16,10 +16,6 @@ delete_registry_key() { kubectl --namespace $1-$2 delete secret onap-docker-registry-key } -delete_service() { - kubectl --namespace $1-$2 delete -f ../$2/all-services.yaml -} - delete_app_helm() { helm delete $1 --purge } @@ -29,7 +25,6 @@ usage() { Usage: $0 [PARAMs] -u : Display usage -n [NAMESPACE] : Kubernetes namespace (required) --s true : Include services (default: false) -a [APP] : Specify a specific ONAP component (default: all) from the following choices: sdc, aai ,mso, message-router, robot, @@ -51,9 +46,6 @@ while getopts ":n:u:s:a:" PARAM; do n) NS=${OPTARG} ;; - s) - INCL_SVC=${OPTARG} - ;; a) APP=${OPTARG} if [[ -z $APP ]]; then @@ -74,23 +66,11 @@ if [[ -z $NS ]]; then fi if [[ ! -z "$APP" ]]; then - ONAP_APPS=($APP) + HELM_APPS=($APP) fi printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n" -for i in ${ONAP_APPS[@]}; do - - # delete the deployments - /bin/bash $i.sh $NS $i 'delete' - - if [[ "$INCL_SVC" == true ]]; then - printf "\nDeleting services **********\n" - delete_service $NS $i - delete_namespace $NS $i - fi - -done for i in ${HELM_APPS[@]}; do diff --git a/kubernetes/oneclick/setenv.bash b/kubernetes/oneclick/setenv.bash index 996a8755b5..c7f3aba024 100644 --- a/kubernetes/oneclick/setenv.bash +++ b/kubernetes/oneclick/setenv.bash @@ -1,7 +1,6 @@ #!/bin/bash -HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai') -ONAP_APPS=('sdc') +HELM_APPS=('mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc') 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} diff --git a/kubernetes/sdc/Chart.yaml b/kubernetes/sdc/Chart.yaml new file mode 100644 index 0000000000..668a9a641e --- /dev/null +++ b/kubernetes/sdc/Chart.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +description: A Helm chart for Kubernetes +name: sdc +version: 0.1.0 diff --git a/kubernetes/sdc/all-services.yaml b/kubernetes/sdc/all-services.yaml deleted file mode 100644 index 1d832f0c4f..0000000000 --- a/kubernetes/sdc/all-services.yaml +++ /dev/null @@ -1,81 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: sdc-es - name: sdc-es -spec: - ports: - - name: sdc-es-port-9200 - port: 9200 - - name: sdc-es-port-9300 - port: 9300 - selector: - app: sdc-es - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: sdc-cs - name: sdc-cs -spec: - ports: - - name: sdc-cs-port-9042 - port: 9042 - - name: sdc-cs-port-9160 - port: 9160 - selector: - app: sdc-cs - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: sdc-kb - name: sdc-kb -spec: - ports: - - name: sdc-kb-port-5601 - port: 5601 - selector: - app: sdc-kb - clusterIP: None ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: sdc-be - name: sdc-be -spec: - ports: - - name: sdc-be-port-8443 - nodePort: 30204 - port: 8443 - - name: sdc-be-port-8080 - nodePort: 30205 - port: 8080 - selector: - app: sdc-be - type: NodePort ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app: sdc-fe - name: sdc-fe -spec: - ports: - - name: sdc-fe-port-9443 - nodePort: 30207 - port: 9443 - - name: sdc-fe-port-8181 - nodePort: 30206 - port: 8181 - selector: - app: sdc-fe - type: NodePort diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/sdc-be.yaml deleted file mode 100644 index ac2378cb60..0000000000 --- a/kubernetes/sdc/sdc-be.yaml +++ /dev/null @@ -1,111 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: sdc-be - name: sdc-be -spec: - selector: - matchLabels: - app: sdc-be - template: - metadata: - labels: - app: sdc-be - name: sdc-be - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdc-es", - "--container-name", - "sdc-cs", - "--container-name", - "sdc-kb" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "sdc-be-readiness" - }, - { - "args": [ - "--container-name", - "dmaap" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "value": "onap-message-router" - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "sdc-dmaap-readiness" - } - ]' - spec: - containers: - - env: - - name: ENVNAME - value: AUTO - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest - name: sdc-be - volumeMounts: - - mountPath: /usr/share/elasticsearch/data/ - name: sdc-sdc-es-es - - mountPath: /root/chef-solo/environments/ - name: sdc-environments - - mountPath: /var/lib/jetty/etc/keystore - name: sdc-jetty-keystore - - mountPath: /etc/localtime - name: sdc-localtime - - mountPath: /var/lib/jetty/logs - name: sdc-logs - ports: - - containerPort: 8443 - - containerPort: 8080 - readinessProbe: - tcpSocket: - port: 8443 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdc-sdc-es-es - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - - name: sdc-environments - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/environments - - name: sdc-jetty-keystore - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore - - name: sdc-localtime - hostPath: - path: /etc/localtime - - name: sdc-logs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/logs - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/sdc-cs.yaml deleted file mode 100644 index 081bae459d..0000000000 --- a/kubernetes/sdc/sdc-cs.yaml +++ /dev/null @@ -1,86 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: sdc-cs - name: sdc-cs -spec: - selector: - matchLabels: - app: sdc-cs - template: - metadata: - labels: - app: sdc-cs - name: sdc-cs - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdc-es" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "sdc-cs-readiness" - } - ]' - spec: - containers: - - env: - - name: ENVNAME - value: AUTO - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: ES_HEAP_SIZE - value: "1024M" - image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest - name: sdc-cs - volumeMounts: - - mountPath: /var/lib/cassandra/ - name: sdc-sdc-cs-cs - - mountPath: /root/chef-solo/environments/ - name: sdc-environments - - mountPath: /etc/localtime - name: sdc-localtime - - mountPath: /var/lib/jetty/logs - name: sdc-logs - ports: - - containerPort: 9042 - - containerPort: 9160 - readinessProbe: - tcpSocket: - port: 9160 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdc-sdc-cs-cs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/sdc-cs/CS - - name: sdc-environments - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/environments - - name: sdc-localtime - hostPath: - path: /etc/localtime - - name: sdc-logs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/logs - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/sdc-es.yaml deleted file mode 100644 index cfb5242141..0000000000 --- a/kubernetes/sdc/sdc-es.yaml +++ /dev/null @@ -1,60 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: sdc-es - name: sdc-es -spec: - selector: - matchLabels: - app: sdc-es - template: - metadata: - labels: - app: sdc-es - name: sdc-es - spec: - containers: - - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest - name: sdc-es - env: - - name: ENVNAME - value: "AUTO" - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - - name: ES_HEAP_SIZE - value: "1024M" - volumeMounts: - - mountPath: /usr/share/elasticsearch/data/ - name: sdc-sdc-es-es - - mountPath: /root/chef-solo/environments/ - name: sdc-environments - - mountPath: /etc/localtime - name: sdc-localtime - - mountPath: /var/lib/jetty/logs - name: sdc-logs - ports: - - containerPort: 9200 - - containerPort: 9300 - readinessProbe: - tcpSocket: - port: 9200 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdc-sdc-es-es - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - - name: sdc-environments - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/environments - - name: sdc-localtime - hostPath: - path: /etc/localtime - - name: sdc-logs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/logs - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/sdc-fe.yaml deleted file mode 100644 index 0711aa9dfd..0000000000 --- a/kubernetes/sdc/sdc-fe.yaml +++ /dev/null @@ -1,100 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: sdc-fe - name: sdc-fe -spec: - selector: - matchLabels: - app: sdc-fe - template: - metadata: - labels: - app: sdc-fe - name: sdc-fe - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdc-es", - "--container-name", - "sdc-cs", - "--container-name", - "sdc-kb", - "--container-name", - "sdc-be" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "sdc-fe-readiness" - } - ]' - spec: - containers: - - name: sdc-fe - env: - - name: ENVNAME - value: AUTO - - name: HOST_IP - valueFrom: - fieldRef: - fieldPath: status.podIP - image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest - volumeMounts: - - mountPath: /usr/share/elasticsearch/data/ - name: sdc-sdc-es-es - - mountPath: /root/chef-solo/environments/ - name: sdc-environments - - mountPath: /var/lib/jetty/etc/keystore - name: sdc-jetty-keystore - - mountPath: /etc/localtime - name: sdc-localtime - - mountPath: /var/lib/jetty/logs - name: sdc-logs - - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb - name: sdc-fe-config - ports: - - containerPort: 9443 - - containerPort: 8181 - readinessProbe: - tcpSocket: - port: 8181 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdc-sdc-es-es - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/sdc-es/ES - - name: sdc-environments - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/environments - - name: sdc-jetty-keystore - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/jetty/keystore - - name: sdc-localtime - hostPath: - path: /etc/localtime - - name: sdc-logs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/logs - - name: sdc-fe-config - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/sdc-fe/FE_2_setup_configuration.rb - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/sdc-kb.yaml deleted file mode 100644 index 83483f7af3..0000000000 --- a/kubernetes/sdc/sdc-kb.yaml +++ /dev/null @@ -1,78 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - labels: - app: sdc-kb - name: sdc-kb -spec: - selector: - matchLabels: - app: sdc-kb - template: - metadata: - labels: - app: sdc-kb - name: sdc-kb - annotations: - pod.beta.kubernetes.io/init-containers: '[ - { - "args": [ - "--container-name", - "sdc-es", - "--container-name", - "sdc-cs" - ], - "command": [ - "/root/ready.py" - ], - "env": [ - { - "name": "NAMESPACE", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "metadata.namespace" - } - } - } - ], - "image": "oomk8s/readiness-check:1.0.0", - "imagePullPolicy": "Always", - "name": "sdc-kb-readiness" - } - ]' - spec: - containers: - - env: - - name: ENVNAME - value: AUTO - - name: ELASTICSEARCH_URL - value: http://sdc-es:9200 - image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest - name: sdc-kb - volumeMounts: - - mountPath: /root/chef-solo/environments/ - name: sdc-environments - - mountPath: /etc/localtime - name: sdc-localtime - - mountPath: /var/lib/jetty/logs - name: sdc-logs - ports: - - containerPort: 5601 - readinessProbe: - tcpSocket: - port: 5601 - initialDelaySeconds: 5 - periodSeconds: 10 - volumes: - - name: sdc-environments - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/environments - - name: sdc-localtime - hostPath: - path: /etc/localtime - - name: sdc-logs - hostPath: - path: /dockerdata-nfs/onapdemo/sdc/logs - imagePullSecrets: - - name: onap-docker-registry-key diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml new file mode 100644 index 0000000000..25ca65e0da --- /dev/null +++ b/kubernetes/sdc/templates/all-services.yaml @@ -0,0 +1,86 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: sdc-es + name: sdc-es + namespace: {{ .Values.NS }} +spec: + ports: + - name: sdc-es-port-9200 + port: 9200 + - name: sdc-es-port-9300 + port: 9300 + selector: + app: sdc-es + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: sdc-cs + name: sdc-cs + namespace: {{ .Values.NS }} +spec: + ports: + - name: sdc-cs-port-9042 + port: 9042 + - name: sdc-cs-port-9160 + port: 9160 + selector: + app: sdc-cs + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: sdc-kb + name: sdc-kb + namespace: {{ .Values.NS }} +spec: + ports: + - name: sdc-kb-port-5601 + port: 5601 + selector: + app: sdc-kb + clusterIP: None +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: sdc-be + name: sdc-be + namespace: {{ .Values.NS }} +spec: + ports: + - name: sdc-be-port-8443 + nodePort: 30204 + port: 8443 + - name: sdc-be-port-8080 + nodePort: 30205 + port: 8080 + selector: + app: sdc-be + type: NodePort +--- +apiVersion: v1 +kind: Service +metadata: + labels: + app: sdc-fe + name: sdc-fe + namespace: {{ .Values.NS }} +spec: + ports: + - name: sdc-fe-port-9443 + nodePort: 30207 + port: 9443 + - name: sdc-fe-port-8181 + nodePort: 30206 + port: 8181 + selector: + app: sdc-fe + type: NodePort diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml new file mode 100644 index 0000000000..96fee818da --- /dev/null +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -0,0 +1,113 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: sdc-be + name: sdc-be + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdc-be + template: + metadata: + labels: + app: sdc-be + name: sdc-be + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdc-es", + "--container-name", + "sdc-cs", + "--container-name", + "sdc-kb" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdc-be-readiness" + }, + { + "args": [ + "--container-name", + "dmaap" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "value": "onap-message-router" + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdc-dmaap-readiness" + } + ]' + spec: + containers: + - env: + - name: ENVNAME + value: AUTO + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: {{ .Values.image.sdcBackend }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdc-be + volumeMounts: + - mountPath: /usr/share/elasticsearch/data/ + name: sdc-sdc-es-es + - mountPath: /root/chef-solo/environments/ + name: sdc-environments + - mountPath: /var/lib/jetty/etc/keystore + name: sdc-jetty-keystore + - mountPath: /etc/localtime + name: sdc-localtime + - mountPath: /var/lib/jetty/logs + name: sdc-logs + ports: + - containerPort: 8443 + - containerPort: 8080 + readinessProbe: + tcpSocket: + port: 8443 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdc-sdc-es-es + hostPath: + path: /dockerdata-nfs/onap/sdc/sdc-es/ES + - name: sdc-environments + hostPath: + path: /dockerdata-nfs/onap/sdc/environments + - name: sdc-jetty-keystore + hostPath: + path: /dockerdata-nfs/onap/sdc/jetty/keystore + - name: sdc-localtime + hostPath: + path: /etc/localtime + - name: sdc-logs + hostPath: + path: /dockerdata-nfs/onap/sdc/logs + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml new file mode 100644 index 0000000000..55a5613609 --- /dev/null +++ b/kubernetes/sdc/templates/sdc-cs.yaml @@ -0,0 +1,88 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: sdc-cs + name: sdc-cs + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdc-cs + template: + metadata: + labels: + app: sdc-cs + name: sdc-cs + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdc-es" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdc-cs-readiness" + } + ]' + spec: + containers: + - env: + - name: ENVNAME + value: AUTO + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: ES_HEAP_SIZE + value: "1024M" + image: {{ .Values.image.sdcCassandra }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdc-cs + volumeMounts: + - mountPath: /var/lib/cassandra/ + name: sdc-sdc-cs-cs + - mountPath: /root/chef-solo/environments/ + name: sdc-environments + - mountPath: /etc/localtime + name: sdc-localtime + - mountPath: /var/lib/jetty/logs + name: sdc-logs + ports: + - containerPort: 9042 + - containerPort: 9160 + readinessProbe: + tcpSocket: + port: 9160 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdc-sdc-cs-cs + hostPath: + path: /dockerdata-nfs/onap/sdc/sdc-cs/CS + - name: sdc-environments + hostPath: + path: /dockerdata-nfs/onap/sdc/environments + - name: sdc-localtime + hostPath: + path: /etc/localtime + - name: sdc-logs + hostPath: + path: /dockerdata-nfs/onap/sdc/logs + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml new file mode 100644 index 0000000000..f1dfb43f0b --- /dev/null +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -0,0 +1,62 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: sdc-es + name: sdc-es + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdc-es + template: + metadata: + labels: + app: sdc-es + name: sdc-es + spec: + containers: + - image: {{ .Values.image.sdcElasticsearch }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdc-es + env: + - name: ENVNAME + value: "AUTO" + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: ES_HEAP_SIZE + value: "1024M" + volumeMounts: + - mountPath: /usr/share/elasticsearch/data/ + name: sdc-sdc-es-es + - mountPath: /root/chef-solo/environments/ + name: sdc-environments + - mountPath: /etc/localtime + name: sdc-localtime + - mountPath: /var/lib/jetty/logs + name: sdc-logs + ports: + - containerPort: 9200 + - containerPort: 9300 + readinessProbe: + tcpSocket: + port: 9200 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdc-sdc-es-es + hostPath: + path: /dockerdata-nfs/onap/sdc/sdc-es/ES + - name: sdc-environments + hostPath: + path: /dockerdata-nfs/onap/sdc/environments + - name: sdc-localtime + hostPath: + path: /etc/localtime + - name: sdc-logs + hostPath: + path: /dockerdata-nfs/onap/sdc/logs + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml new file mode 100644 index 0000000000..a566b15a02 --- /dev/null +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -0,0 +1,102 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: sdc-fe + name: sdc-fe + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdc-fe + template: + metadata: + labels: + app: sdc-fe + name: sdc-fe + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdc-es", + "--container-name", + "sdc-cs", + "--container-name", + "sdc-kb", + "--container-name", + "sdc-be" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdc-fe-readiness" + } + ]' + spec: + containers: + - name: sdc-fe + env: + - name: ENVNAME + value: AUTO + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + image: {{ .Values.image.sdcFrontend }} + imagePullPolicy: {{ .Values.pullPolicy }} + volumeMounts: + - mountPath: /usr/share/elasticsearch/data/ + name: sdc-sdc-es-es + - mountPath: /root/chef-solo/environments/ + name: sdc-environments + - mountPath: /var/lib/jetty/etc/keystore + name: sdc-jetty-keystore + - mountPath: /etc/localtime + name: sdc-localtime + - mountPath: /var/lib/jetty/logs + name: sdc-logs + - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb + name: sdc-fe-config + ports: + - containerPort: 9443 + - containerPort: 8181 + readinessProbe: + tcpSocket: + port: 8181 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdc-sdc-es-es + hostPath: + path: /dockerdata-nfs/onap/sdc/sdc-es/ES + - name: sdc-environments + hostPath: + path: /dockerdata-nfs/onap/sdc/environments + - name: sdc-jetty-keystore + hostPath: + path: /dockerdata-nfs/onap/sdc/jetty/keystore + - name: sdc-localtime + hostPath: + path: /etc/localtime + - name: sdc-logs + hostPath: + path: /dockerdata-nfs/onap/sdc/logs + - name: sdc-fe-config + hostPath: + path: /dockerdata-nfs/onap/sdc/sdc-fe/FE_2_setup_configuration.rb + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml new file mode 100644 index 0000000000..0dca7e45a2 --- /dev/null +++ b/kubernetes/sdc/templates/sdc-kb.yaml @@ -0,0 +1,80 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: sdc-kb + name: sdc-kb + namespace: {{ .Values.NS }} +spec: + selector: + matchLabels: + app: sdc-kb + template: + metadata: + labels: + app: sdc-kb + name: sdc-kb + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdc-es", + "--container-name", + "sdc-cs" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "sdc-kb-readiness" + } + ]' + spec: + containers: + - env: + - name: ENVNAME + value: AUTO + - name: ELASTICSEARCH_URL + value: http://sdc-es:9200 + image: {{ .Values.image.sdcKibana }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: sdc-kb + volumeMounts: + - mountPath: /root/chef-solo/environments/ + name: sdc-environments + - mountPath: /etc/localtime + name: sdc-localtime + - mountPath: /var/lib/jetty/logs + name: sdc-logs + ports: + - containerPort: 5601 + readinessProbe: + tcpSocket: + port: 5601 + initialDelaySeconds: 5 + periodSeconds: 10 + volumes: + - name: sdc-environments + hostPath: + path: /dockerdata-nfs/onap/sdc/environments + - name: sdc-localtime + hostPath: + path: /etc/localtime + - name: sdc-logs + hostPath: + path: /dockerdata-nfs/onap/sdc/logs + imagePullSecrets: + - name: onap-docker-registry-key diff --git a/kubernetes/sdc/values.yaml b/kubernetes/sdc/values.yaml new file mode 100644 index 0000000000..066f0d0afb --- /dev/null +++ b/kubernetes/sdc/values.yaml @@ -0,0 +1,9 @@ +NS: onap-sdc +pullPolicy: Always +image: + readiness: oomk8s/readiness-check:1.0.0 + sdcKibana: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest + sdcFrontend: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest + sdcElasticsearch: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest + sdcCassandra: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest + sdcBackend: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest -- cgit 1.2.3-korg