diff options
| -rw-r--r-- | kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-act/templates/configmap.yaml | 21 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/.helmignore (renamed from kubernetes/sdc/charts/sdc-act/.helmignore) | 0 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml (renamed from kubernetes/sdc/charts/sdc-act/Chart.yaml) | 6 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt (renamed from kubernetes/sdc/charts/sdc-act/templates/NOTES.txt) | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/deployment.yaml) | 26 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/job.yaml) | 17 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml (renamed from kubernetes/sdc/charts/sdc-act/templates/service.yaml) | 2 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-be/values.yaml (renamed from kubernetes/sdc/charts/sdc-act/values.yaml) | 25 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/.helmignore (renamed from kubernetes/sdc/charts/sdc-wfd/.helmignore) | 0 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/Chart.yaml) | 6 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt (renamed from kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt) | 15 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml | 112 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/templates/service.yaml) | 26 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd-fe/values.yaml (renamed from kubernetes/sdc/charts/sdc-wfd/values.yaml) | 44 | ||||
| -rw-r--r-- | kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml | 52 | ||||
| -rwxr-xr-x | kubernetes/sdc/resources/config/environments/AUTO.json | 4 |
17 files changed, 221 insertions, 149 deletions
diff --git a/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml b/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml deleted file mode 100644 index af380172e0..0000000000 --- a/kubernetes/sdc/charts/sdc-act/resources/config/configuration.yaml +++ /dev/null @@ -1,12 +0,0 @@ -cassandraConfig: - cassandraHosts: {{ .Values.config.cassandraHosts }} - reconnectTimeout : {{ .Values.config.cassandraReconnectTimeout }} - socketReadTimeout: {{ .Values.config.cassandraSocketReadTimeout }} - socketConnectTimeout: {{ .Values.config.cassandraSocketConnectTimeout }} - authenticate: true - username: {{ .Values.config.cassandraUserName }} - password: {{ .Values.config.cassandraUserPassword }} - ssl: {{ .Values.config.cassandraSslEnabled }} - truststorePath : {{ .Values.config.cassandraTruststorePath }} - truststorePassword : {{ .Values.config.cassandraTruststorePassword }} - diff --git a/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml b/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml deleted file mode 100644 index 4ccc7cc526..0000000000 --- a/kubernetes/sdc/charts/sdc-act/templates/configmap.yaml +++ /dev/null @@ -1,21 +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. - -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-configmap - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-act/.helmignore b/kubernetes/sdc/charts/sdc-wfd-be/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/sdc/charts/sdc-act/.helmignore +++ b/kubernetes/sdc/charts/sdc-wfd-be/.helmignore diff --git a/kubernetes/sdc/charts/sdc-act/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml index 7fa0d2d008..0de4faaeb4 100644 --- a/kubernetes/sdc/charts/sdc-act/Chart.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, Bell Canada +# Copyright © 2018 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. @@ -13,6 +13,6 @@ # limitations under the License. apiVersion: v1 -description: ONAP Activity Spec WebService -name: sdc-act +description: ONAP Service Design and Creation Workflow Designer backend +name: sdc-wfd-be version: 2.0.0
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-act/templates/NOTES.txt b/kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt index 41f9706fec..a3c79b12a4 100644 --- a/kubernetes/sdc/charts/sdc-act/templates/NOTES.txt +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/NOTES.txt @@ -1,4 +1,4 @@ -# Copyright © 2018 Amdocs, AT&T, Bell Canada +# Copyright © 2018 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. diff --git a/kubernetes/sdc/charts/sdc-act/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml index 542982fd63..a8225040ac 100644 --- a/kubernetes/sdc/charts/sdc-act/templates/deployment.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/deployment.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, AT&T, Bell Canada +# Copyright © 2018 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. @@ -38,7 +38,7 @@ spec: - /root/job_complete.py args: - --job-name - - {{ include "common.fullname" . }}-init-activity-spec + - {{ include "common.fullname" . }}-workflow-init env: - name: NAMESPACE valueFrom: @@ -68,13 +68,19 @@ spec: env: - name: JAVA_OPTIONS value: {{ .Values.config.javaOptions }} - volumeMounts: - - name: {{ include "common.fullname" . }}-config - mountPath: /etc/onap/activity-spec/be/config - volumes: - - name: {{ include "common.fullname" . }}-config - configMap: - name : {{ include "common.fullname" . }}-configmap - defaultMode: 0755 + - name: CS_HOSTS + value: "{{ .Values.config.cassandraHosts }}" + - name: CS_PORT + value: "{{ .Values.config.cassandraClientPort }}" + - name: CS_USER + valueFrom: + secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_user} + - name: CS_PASSWORD + valueFrom: + secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password} + - name: SDC_PROTOCOL + value: "{{ .Values.config.sdcProtocol }}" + - name: SDC_ENDPOINT + value: "{{ .Values.config.sdcEndpoint }}" imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-act/templates/job.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml index bd9d9d1e00..f4a68d7752 100644 --- a/kubernetes/sdc/charts/sdc-act/templates/job.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/job.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, AT&T, Bell Canada +# Copyright © 2018 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. @@ -15,7 +15,7 @@ apiVersion: batch/v1 kind: Job metadata: - name: {{ include "common.fullname" . }}-init-activity-spec + name: {{ include "common.fullname" . }}-workflow-init namespace: {{ include "common.namespace" . }} labels: app: {{ include "common.name" . }}-job @@ -36,10 +36,10 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} command: - - /root/ready.py + - /root/job_complete.py args: - - --container-name - - sdc-cs + - --job-name + - {{ .Release.Name }}-sdc-cs-config-cassandra env: - name: NAMESPACE valueFrom: @@ -52,7 +52,11 @@ spec: imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} env: - name: CS_HOST - value: sdc-cs + value: "sdc-cs" + - name: CS_PORT + value: "{{ .Values.config.cassandraThriftClientPort }}" + - name: CS_AUTHENTICATE + value: "{{ .Values.config.cassandaAuthenticationEnabled }}" - name: CS_USER valueFrom: secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_user} @@ -61,4 +65,3 @@ spec: secretKeyRef: {name: {{ .Release.Name }}-sdc-cs-secrets, key: sdc_password} imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" - restartPolicy: Never diff --git a/kubernetes/sdc/charts/sdc-act/templates/service.yaml b/kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml index 736ef740ee..acabaae282 100644 --- a/kubernetes/sdc/charts/sdc-act/templates/service.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/templates/service.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, Bell Canada +# Copyright © 2018 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. diff --git a/kubernetes/sdc/charts/sdc-act/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml index 0df41573ea..057ebbe058 100644 --- a/kubernetes/sdc/charts/sdc-act/values.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml @@ -1,4 +1,4 @@ -# Copyright © 2017 Amdocs, Bell Canada +# Copyright © 2018 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. @@ -27,24 +27,21 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/activity-spec:1.3.0-SNAPSHOT -configInitImage: onap/activity-spec-init:1.3.0-SNAPSHOT +image: onap/workflow-backend:1.3.0-SNAPSHOT +configInitImage: onap/workflow-init:1.3.0-SNAPSHOT pullPolicy: Always # flag to enable debugging - application support required debugEnabled: false config: - javaOptions: "-Xmx1536m -Xms1536m" - cassandraSslEnabled: "false" - cassandraHosts: ['sdc-cs'] - cassandraUserName: "asdc_user" - cassandraUserPassword: "Aa1234%^!" - cassandraReconnectTimeout: 30000 - cassandraSocketReadTimeout: 20000 - cassandraSocketConnectTimeout: 20000 - cassandraTruststorePath: "/path/path" - cassandraTruststorePassword: "Aa123456" + javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx1536m -Xms1536m" + cassandaAuthenticationEnabled: true + cassandraHosts: sdc-cs + cassandraThriftClientPort: 9160 + cassandraClientPort: 9042 + sdcProtocol: HTTP + sdcEndpoint: sdc-be:8080 # default number of instances replicaCount: 1 @@ -69,7 +66,7 @@ service: type: NodePort internalPort: 8080 externalPort: 8080 - portName: sdc-act + portName: sdc-wfd-be nodePort: "57" ingress: diff --git a/kubernetes/sdc/charts/sdc-wfd/.helmignore b/kubernetes/sdc/charts/sdc-wfd-fe/.helmignore index f0c1319444..f0c1319444 100644 --- a/kubernetes/sdc/charts/sdc-wfd/.helmignore +++ b/kubernetes/sdc/charts/sdc-wfd-fe/.helmignore diff --git a/kubernetes/sdc/charts/sdc-wfd/Chart.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml index 1db5bb2fdd..60dd6c2ae8 100644 --- a/kubernetes/sdc/charts/sdc-wfd/Chart.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-fe/Chart.yaml @@ -1,4 +1,4 @@ -# Copyright © 2018 ZTE +# Copyright © 2018 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. @@ -13,6 +13,6 @@ # limitations under the License. apiVersion: v1 -description: ONAP Service Design and Creation Common Workflow Design -name: sdc-wfd +description: ONAP Service Design and Creation Workflow Designer frontend +name: sdc-wfd-fe version: 2.0.0
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt b/kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt index d83c152a4c..a3c79b12a4 100644 --- a/kubernetes/sdc/charts/sdc-wfd/templates/NOTES.txt +++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/NOTES.txt @@ -1,3 +1,17 @@ +# Copyright © 2018 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. + 1. Get the application URL by running these commands: {{- if .Values.ingress.enabled }} {{- range .Values.ingress.hosts }} @@ -17,4 +31,3 @@ 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/sdc/charts/sdc-wfd-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml new file mode 100644 index 0000000000..0dfc61afb5 --- /dev/null +++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/deployment.yaml @@ -0,0 +1,112 @@ +# Copyright © 2018 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: + replicas: {{ .Values.replicaCount }} + template: + metadata: + labels: + app: {{ include "common.name" . }} + release: {{ .Release.Name }} + spec: + initContainers: + - name: {{ include "common.name" . }}-readiness + command: + - /root/ready.py + args: + - --container-name + - "sdc-wfd-be" + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + containers: + - name: {{ include "common.name" . }} + image: "{{ include "common.repository" . }}/{{ .Values.image }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + ports: + - containerPort: {{ .Values.service.internalPort }} + {{ if .Values.liveness.enabled }} + 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 }} + env: + - name: ENVNAME + value: {{ .Values.global.env.name }} + - name: JAVA_OPTIONS + value: {{ .Values.config.javaOptions }} + - name: BACKEND + value: {{ .Values.config.backendServerURL }} + volumeMounts: + - name: {{ include "common.fullname" . }}-localtime + mountPath: /etc/localtime + readOnly: true + 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 }} + + # side car containers + - name: {{ include "common.name" . }}-filebeat-onap + image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + volumeMounts: + - name: {{ include "common.fullname" . }}-filebeat-conf + mountPath: /usr/share/filebeat/filebeat.yml + subPath: filebeat.yml + - name: {{ include "common.fullname" . }}-logs + mountPath: /var/log/onap + - name: {{ include "common.fullname" . }}-data-filebeat + mountPath: /usr/share/filebeat/data + volumes: + - name: {{ include "common.fullname" . }}-localtime + hostPath: + path: /etc/localtime + - name: {{ include "common.fullname" . }}-filebeat-conf + configMap: + name: {{ .Release.Name }}-sdc-filebeat-configmap + - name: {{ include "common.fullname" . }}-data-filebeat + emptyDir: {} + - name: {{ include "common.fullname" . }}-logs + emptyDir: {} + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/service.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml index 95ea8338a1..68e7f32943 100644 --- a/kubernetes/sdc/charts/sdc-wfd/templates/service.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-fe/templates/service.yaml @@ -1,4 +1,4 @@ -# Copyright © 2018 ZTE +# Copyright © 2018 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. @@ -25,30 +25,26 @@ metadata: annotations: msb.onap.org/service-info: '[ { - "serviceName": "workflow-modeler", + "serviceName": "wf-gui", "version": "v1", - "url": "/api/workflow-modeler/v1", - "protocol": "REST", - "port": "{{ .Values.service.internalPort }}", - "enable_ssl": true, - "visualRange":"1" - }, - { - "serviceName": "workflow-modeler-ui", - "version": "v1", - "url": "/workflow-modeler", + "url": "/", "protocol": "UI", - "path": "/workflow-modeler", "port": "{{ .Values.service.internalPort }}", - "visualRange":"1" + "visualRange":"0|1" } ]' 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.nodePort }} - name: {{ .Values.service.portName }} + name: {{ .Values.service.portName | default "http" }} + {{- else -}} + - port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.service.internalPort }} + name: {{ .Values.service.portName | default "http" }} + {{- end}} selector: app: {{ include "common.name" . }} release: {{ .Release.Name }} diff --git a/kubernetes/sdc/charts/sdc-wfd/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml index ca11780f22..6eece108ee 100644 --- a/kubernetes/sdc/charts/sdc-wfd/values.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml @@ -1,4 +1,4 @@ -# Copyright © 2018 ZTE +# Copyright © 2018 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. @@ -17,40 +17,70 @@ ################################################################# global: nodePortPrefix: 302 + readinessRepository: oomk8s + readinessImage: readiness-check:2.0.0 + loggingRepository: docker.elastic.co + loggingImage: beats/filebeat:5.5.0 ################################################################# # Application configuration defaults. ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdc/sdc-workflow-designer:1.1.0 +image: onap/workflow-frontend:1.3.0-SNAPSHOT pullPolicy: Always # flag to enable debugging - application support required debugEnabled: false +config: + javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=6001,server=y,suspend=n -Xmx256m -Xms256m" + backendServerURL: "http://sdc-wfd-be:8080" + # default number of instances replicaCount: 1 +nodeSelector: {} + +affinity: {} + # probe configuration parameters liveness: - initialDelaySeconds: 10 + initialDelaySeconds: 60 periodSeconds: 10 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: - initialDelaySeconds: 10 + initialDelaySeconds: 60 periodSeconds: 10 service: type: NodePort - name: sdc-wfd - portName: sdc-wfd - nodePort: "56" internalPort: 8080 + externalPort: 8080 + portName: sdc-wfd-fe + nodePort: "56" ingress: enabled: false +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # + # Example: + # Configure resource requests and limits + # ref: http://kubernetes.io/docs/user-guide/compute-resources/ + # Minimum memory for development is 2 CPU cores and 4GB memory + # Minimum memory for production is 4 CPU cores and 8GB memory +#resources: +# limits: +# cpu: 2 +# memory: 4Gi +# requests: +# cpu: 2 +# memory: 4Gi diff --git a/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml deleted file mode 100644 index f6ec2c7a0b..0000000000 --- a/kubernetes/sdc/charts/sdc-wfd/templates/deployment.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright © 2018 ZTE -# -# 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: - replicas: {{ .Values.replicaCount }} - template: - metadata: - labels: - app: {{ include "common.name" . }} - release: {{ .Release.Name }} - spec: - containers: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: - - containerPort: {{ .Values.service.internalPort }} - {{ 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 }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json index 7700a787bf..52240457e1 100755 --- a/kubernetes/sdc/resources/config/environments/AUTO.json +++ b/kubernetes/sdc/resources/config/environments/AUTO.json @@ -61,8 +61,8 @@ "dcae_dt_source_url": "" }, "WORKFLOW": { - "workflow_discovery_url": "{{.Values.config.environment.workflowUrl}}", - "workflow_source_url": "{{.Values.config.environment.workflowUrl}}" + "workflow_discovery_url": "http://sdc-wfd-fe.{{include "common.namespace" .}}:8080", + "workflow_source_url": "http://sdc.workflow.plugin.simpledemo.onap.org:30256" } }, "VnfRepo": { |