aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouët <adetalhouet89@gmail.com>2018-09-18 16:46:12 -0400
committerAlexis de Talhouët <alexis.de_talhouet@bell.ca>2018-09-19 15:43:43 +0000
commita52efcc04e5fc9dfb14df30bb62e1aa91e527f0c (patch)
treea6a67a6fec3b89c385d4a919510628e9a7f60afe
parent1cdbb5d7d8585eb6ecbcaa87d8047592390b944e (diff)
Do not mount certificates in SO
Certififacte has been added in the base docker image, https://gerrit.onap.org/r/#/c/66209/ so no need to add it again. Also, it was being mount at the wrong place. Also, using latest docker images. Change-Id: I55355dac9bfb2691f493317f77c0f363a78af7ee Issue-ID: OOM-1407 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-bpmn-infra/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-catalog-db-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-openstack-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-request-db-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-sdc-controller/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-sdnc-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/charts/so-ssl-certs/templates/secrets.yaml5
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/charts/so-vfc-adapter/values.yaml2
-rwxr-xr-xkubernetes/so/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/values.yaml4
17 files changed, 9 insertions, 62 deletions
diff --git a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-bpmn-infra/values.yaml b/kubernetes/so/charts/so-bpmn-infra/values.yaml
index e513e6a90d..fd7451ece7 100755
--- a/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
repository: nexus3.onap.org:10001
-image: onap/so/bpmn-infra:latest
+image: onap/so/bpmn-infra:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 1b2441f8f7..9eccf4bacb 100755
--- a/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
repository: nexus3.onap.org:10001
-image: onap/so/catalog-db-adapter:latest
+image: onap/so/catalog-db-adapter:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-openstack-adapter/values.yaml b/kubernetes/so/charts/so-openstack-adapter/values.yaml
index f5b993120d..3883ae0b7a 100755
--- a/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@ -11,7 +11,7 @@
# 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.
-image: onap/so/openstack-adapter:latest
+image: onap/so/openstack-adapter:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-request-db-adapter/values.yaml b/kubernetes/so/charts/so-request-db-adapter/values.yaml
index b57f71e096..a0f7279ed1 100755
--- a/kubernetes/so/charts/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml
@@ -11,7 +11,7 @@
# 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.
-image: onap/so/request-db-adapter:latest
+image: onap/so/request-db-adapter:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-sdc-controller/values.yaml b/kubernetes/so/charts/so-sdc-controller/values.yaml
index f5a5176c52..50ff616d47 100755
--- a/kubernetes/so/charts/so-sdc-controller/values.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/values.yaml
@@ -11,7 +11,7 @@
# 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.
-image: onap/so/asdc-controller:latest
+image: onap/so/sdc-controller:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-sdnc-adapter/values.yaml b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
index 55b5965b3f..b56c415148 100755
--- a/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
@@ -11,7 +11,7 @@
# 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.
-image: onap/so/sdnc-adapter:latest
+image: onap/so/sdnc-adapter:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/charts/so-ssl-certs/templates/secrets.yaml b/kubernetes/so/charts/so-ssl-certs/templates/secrets.yaml
index 021949f81a..31a82c3dd6 100755
--- a/kubernetes/so/charts/so-ssl-certs/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-ssl-certs/templates/secrets.yaml
@@ -52,9 +52,4 @@ data:
metadata:
name: {{ .Release.Name}}-so-ssl-client-secret
namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ .Release.Name }}
- heritage: {{ .Release.Service }}
kind: Secret \ No newline at end of file
diff --git a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/charts/so-vfc-adapter/values.yaml b/kubernetes/so/charts/so-vfc-adapter/values.yaml
index 884280620a..0b6f13681f 100755
--- a/kubernetes/so/charts/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml
@@ -11,7 +11,7 @@
# 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.
-image: onap/so/vfc-adapter:latest
+image: onap/so/vfc-adapter:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index a69c189c5b..97f171f00d 100755
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -106,9 +106,6 @@ spec:
volumeMounts:
- name: logs
mountPath: /app/logs
- - name: certs
- mountPath: /app/certs/
- readOnly: true
- name: config
mountPath: /app/config
readOnly: true
@@ -129,9 +126,6 @@ spec:
volumes:
- name: logs
emptyDir: {}
- - name: certs
- secret:
- secretName: {{ .Release.Name}}-so-ssl-secret
- name: config
configMap:
name: {{ include "common.fullname" . }}-app-configmap
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index b01d48623a..03154ae521 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:latest
+image: onap/so/api-handler-infra:1.3.0-STAGING-latest
pullPolicy: IfNotPresent
replicaCount: 1
minReadySeconds: 10
@@ -28,7 +28,7 @@ updateStrategy:
type: RollingUpdate
maxUnavailable: 1
maxSurge: 1
-# Resource Limit flavor -By Default using small
+# Resource Limit flavor -By Default using small
flavor: small
# Segregation for Different environment (Small and Large)
resources: