summaryrefslogtreecommitdiffstats
path: root/deployments/helm
diff options
context:
space:
mode:
Diffstat (limited to 'deployments/helm')
-rw-r--r--deployments/helm/onap4k8s/Makefile11
-rw-r--r--deployments/helm/onap4k8s/README.txt3
-rw-r--r--deployments/helm/onap4k8s/charts/etcd/requirements.yaml2
-rw-r--r--deployments/helm/onap4k8s/charts/etcd/values.yaml3
-rw-r--r--deployments/helm/onap4k8s/charts/mongo/requirements.yaml2
-rw-r--r--deployments/helm/onap4k8s/charts/mongo/values.yaml6
-rw-r--r--deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml6
-rw-r--r--deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml6
-rw-r--r--deployments/helm/v2/emco/Chart.yaml2
-rw-r--r--deployments/helm/v2/emco/Makefile11
-rw-r--r--deployments/helm/v2/emco/README.md39
-rw-r--r--deployments/helm/v2/emco/clm/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/dcm/Chart.yaml18
-rw-r--r--deployments/helm/v2/emco/dcm/requirements.yaml18
-rw-r--r--deployments/helm/v2/emco/dcm/resources/config/config.json8
-rw-r--r--deployments/helm/v2/emco/dcm/templates/configmap.yaml28
-rw-r--r--deployments/helm/v2/emco/dcm/templates/deployment.yaml16
-rw-r--r--deployments/helm/v2/emco/dcm/templates/service.yaml16
-rw-r--r--deployments/helm/v2/emco/dcm/values.yaml84
-rw-r--r--deployments/helm/v2/emco/emco-db/requirements.yaml6
-rw-r--r--deployments/helm/v2/emco/emco-services/requirements.yaml15
-rw-r--r--deployments/helm/v2/emco/emco-tools/requirements.yaml4
-rw-r--r--deployments/helm/v2/emco/emco/requirements.yaml6
-rw-r--r--deployments/helm/v2/emco/etcd/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/etcd/values.yaml3
-rw-r--r--deployments/helm/v2/emco/fluentd/values-production.yaml2
-rw-r--r--deployments/helm/v2/emco/fluentd/values.yaml2
-rw-r--r--deployments/helm/v2/emco/mongo/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/mongo/values.yaml6
-rw-r--r--deployments/helm/v2/emco/ncm/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/orchestrator/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/ovnaction/requirements.yaml2
-rw-r--r--deployments/helm/v2/emco/rsync/requirements.yaml2
33 files changed, 250 insertions, 87 deletions
diff --git a/deployments/helm/onap4k8s/Makefile b/deployments/helm/onap4k8s/Makefile
index 20470878..f078765d 100644
--- a/deployments/helm/onap4k8s/Makefile
+++ b/deployments/helm/onap4k8s/Makefile
@@ -54,16 +54,5 @@ clean:
@rm -rf $(PACKAGE_DIR)/*
@rm -rf $(OUTPUT_DIR)
-# start up a local helm repo to serve up helm chart packages
-repo:
- @mkdir -p $(PACKAGE_DIR)
- @helm serve --repo-path $(PACKAGE_DIR) &
- @helm repo index $(PACKAGE_DIR)
- @helm repo add onap4k8s http://127.0.0.1:8879
-
-# stop local helm repo
-repo-stop:
- @pkill helm
- @helm repo remove onap4k8s
%:
@:
diff --git a/deployments/helm/onap4k8s/README.txt b/deployments/helm/onap4k8s/README.txt
index 857b0a0b..1528c740 100644
--- a/deployments/helm/onap4k8s/README.txt
+++ b/deployments/helm/onap4k8s/README.txt
@@ -16,9 +16,6 @@
# Installation of ONAP4K8S helm chart
#################################################################
-1. Create a helm repo (onap4k8s) from Makefile
-$ make repo
-
1. Run "Makefile" in ONAP4K8S repo
$ make all
diff --git a/deployments/helm/onap4k8s/charts/etcd/requirements.yaml b/deployments/helm/onap4k8s/charts/etcd/requirements.yaml
index ff2221f6..8c46d632 100644
--- a/deployments/helm/onap4k8s/charts/etcd/requirements.yaml
+++ b/deployments/helm/onap4k8s/charts/etcd/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~5.x-0
- repository: '@onap4k8s'
+ repository: 'file://../common'
diff --git a/deployments/helm/onap4k8s/charts/etcd/values.yaml b/deployments/helm/onap4k8s/charts/etcd/values.yaml
index 7f53d222..fd459f0a 100644
--- a/deployments/helm/onap4k8s/charts/etcd/values.yaml
+++ b/deployments/helm/onap4k8s/charts/etcd/values.yaml
@@ -25,7 +25,7 @@ global:
#repository: etcd
repository: "k8s.gcr.io"
-image: "etcd-amd64:3.2.24"
+image: "etcd-amd64:3.3.17"
pullPolicy: Always
# default number of instances in the StatefulSet
@@ -55,6 +55,7 @@ persistence:
##
#storageClass: "-"
accessMode: "ReadWriteOnce"
+ storageType: hostPath
storage: "1Gi"
mountPath: /dockerdata-nfs
mountSubPath: k8s-etcd
diff --git a/deployments/helm/onap4k8s/charts/mongo/requirements.yaml b/deployments/helm/onap4k8s/charts/mongo/requirements.yaml
index 0693dd3f..ed887924 100644
--- a/deployments/helm/onap4k8s/charts/mongo/requirements.yaml
+++ b/deployments/helm/onap4k8s/charts/mongo/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~5.x-0
- repository: '@onap4k8s'
+ repository: 'file://../common'
diff --git a/deployments/helm/onap4k8s/charts/mongo/values.yaml b/deployments/helm/onap4k8s/charts/mongo/values.yaml
index d6938c1e..14376143 100644
--- a/deployments/helm/onap4k8s/charts/mongo/values.yaml
+++ b/deployments/helm/onap4k8s/charts/mongo/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
persistence: {}
readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
+ readinessImage: readiness-check:2.2.2
#################################################################
@@ -27,7 +27,7 @@ global:
#################################################################
dockerHubRepository: registry.hub.docker.com
-image: library/mongo:4.0.8
+image: library/mongo:4.4.1
pullPolicy: Always
# application configuration
@@ -110,7 +110,7 @@ resources: {}
nfsprovisionerRepository: quay.io
-nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v1.0.8
+nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v2.3.0
nfsprovisionerPrefix: mongo
sdnctlPrefix: mongo
diff --git a/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml b/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml
index c5102e49..b114c96e 100644
--- a/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml
+++ b/deployments/helm/onap4k8s/charts/multicloud-k8s/requirements.yaml
@@ -18,10 +18,10 @@ dependencies:
# local reference to common chart, as it is
# a part of this chart's package and will not
# be published independently to a repo (at this point)
- repository: '@onap4k8s'
+ repository: 'file://../common'
- name: mongo
version: ~5.x-0
- repository: '@onap4k8s'
+ repository: 'file://../mongo'
- name: etcd
version: ~5.x-0
- repository: '@onap4k8s'
+ repository: 'file://../etcd'
diff --git a/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml b/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
index 30d70092..5fa51284 100644
--- a/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
+++ b/deployments/helm/onap4k8s/charts/multicloud-k8s/values.yaml
@@ -18,16 +18,16 @@
global:
nodePortPrefixExt: 304
readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
+ readinessImage: readiness-check:2.2.2
loggingRepository: docker.elastic.co
- loggingImage: beats/filebeat:5.5.0
+ loggingImage: beats/filebeat:7.9.3
persistence: {}
#################################################################
# Application configuration defaults.
#################################################################
# application image
repository: registry.hub.docker.com
-image: onap/multicloud-k8s:0.5.0
+image: onap/multicloud-k8s:0.7.0
pullPolicy: Always
# flag to enable debugging - application support required
diff --git a/deployments/helm/v2/emco/Chart.yaml b/deployments/helm/v2/emco/Chart.yaml
index 6998dcaa..9c015819 100644
--- a/deployments/helm/v2/emco/Chart.yaml
+++ b/deployments/helm/v2/emco/Chart.yaml
@@ -1,5 +1,5 @@
apiVersion: v1
appVersion: "1.0"
description: A Helm chart for Kubernetes
-name: onap4k8s
+name: emco
version: 0.1.0
diff --git a/deployments/helm/v2/emco/Makefile b/deployments/helm/v2/emco/Makefile
index dc88ff86..355fc3f6 100644
--- a/deployments/helm/v2/emco/Makefile
+++ b/deployments/helm/v2/emco/Makefile
@@ -64,16 +64,5 @@ clean:
@rm -rf $(PACKAGE_DIR)/*
@rm -rf $(OUTPUT_DIR)
-# start up a local helm repo to serve up helm chart packages
-repo:
- @mkdir -p $(PACKAGE_DIR)
- @helm serve --repo-path $(PACKAGE_DIR) &
- @helm repo index $(PACKAGE_DIR)
- @helm repo add local http://127.0.0.1:8879
-
-# stop local helm repo
-repo-stop:
- @pkill helm
- @helm repo remove local
%:
@:
diff --git a/deployments/helm/v2/emco/README.md b/deployments/helm/v2/emco/README.md
index 3534f5a5..70cbfcde 100644
--- a/deployments/helm/v2/emco/README.md
+++ b/deployments/helm/v2/emco/README.md
@@ -6,11 +6,7 @@ EMCO Helm charts include charts for EMCO microservices along with MongoDb, etcd,
### Steps to generate and install packages
-**1. Create a local helm repo from Makefile**
-
-`$ make repo`
-
-**2. Run make file to package all the required chart**
+**1. Run make file to package all the required chart**
`$ make clean`
@@ -26,42 +22,42 @@ Pacakges helm charts in tar.gz format. All packages are in **dist/packages** dir
| **emco-0.1.0.tgz** | Includes all charts including database, all services and tools |
-**3. Deploy EMCO Packages for Databases and Services**
+**2. Deploy EMCO Packages for Databases and Services**
`$ helm install dist/packages/emco-db-0.1.0.tgz --name emco-db --namespace emco`
`$ helm install dist/packages/emco-services-0.1.0.tgz --name emco-services --namespace emco`
-**4. Deploy tools (Optional)**
+**3. Deploy tools (Optional)**
-`$ helm install dist/packages/emco-tools-0.1.0.tgz --name rel-tools --namespace emco`
+`$ helm install dist/packages/emco-tools-0.1.0.tgz --name emco-tools --namespace emco`
NOTE: Deploy the Chart emco-0.1.0.tgz to deploy all packages including database, services and tools.
-`$ helm install dist/packages/emco-0.1.0.tgz --name rel --namespace emco`
+`$ helm install dist/packages/emco-0.1.0.tgz --name emco --namespace emco`
-**5. To check logs of the different Microservices check fluentd logs**
+**4. To check logs of the different Microservices check fluentd logs**
-`kubectl logs rel-fluentd-0 -n emco | grep orchestrator`
+`kubectl logs emco-tools-fluentd-0 -n emco | grep orchestrator`
-**6. Delete all packages**
+**5. Delete all packages**
-`$ helm delete rel-services --purge`
+`$ helm delete emco-services --purge`
-`$ helm delete rel-db --purge`
+`$ helm delete emco-db --purge`
Optional if tools were installed
-`$ helm delete rel-tools --purge`
+`$ helm delete emco-tools --purge`
NOTE: If the Chart emco-0.1.0.tgz was deployed
-`$ helm delete rel --purge`
+`$ helm delete emco --purge`
-**7. Delete local helm repo**
+**6. Delete local helm repo**
`make repo-stop`
@@ -69,10 +65,9 @@ NOTE: If the Chart emco-0.1.0.tgz was deployed
After deleting the db package and before installing the package again following error happens:
-`Error: release rel-db failed: object is being deleted: persistentvolumes "rel-db-emco-etcd-data-0" already exists`
-
-Workaround :
+`Error: release emco-db failed: object is being deleted: persistentvolumes "emco-db-emco-etcd-data-0" already exists`
-`kubectl edit persistentvolumes rel-db-emco-etcd-data-0`
+Workarounds:
-and remover finalizers section
+* remove the finalizers section using `kubectl edit persistentvolumes emco-db-emco-etcd-data-0`
+* or, if appropriate, delete the entire namespace using `kubectl delete namespace emco`
diff --git a/deployments/helm/v2/emco/clm/requirements.yaml b/deployments/helm/v2/emco/clm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/clm/requirements.yaml
+++ b/deployments/helm/v2/emco/clm/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/dcm/Chart.yaml b/deployments/helm/v2/emco/dcm/Chart.yaml
new file mode 100644
index 00000000..9cd356e0
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/Chart.yaml
@@ -0,0 +1,18 @@
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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
+description: Distributed Cloud Manager
+name: dcm
+version: 0.1.0
diff --git a/deployments/helm/v2/emco/dcm/requirements.yaml b/deployments/helm/v2/emco/dcm/requirements.yaml
new file mode 100644
index 00000000..c5c20127
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/requirements.yaml
@@ -0,0 +1,18 @@
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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.
+
+dependencies:
+ - name: common
+ version: ~0.x-0
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/dcm/resources/config/config.json b/deployments/helm/v2/emco/dcm/resources/config/config.json
new file mode 100644
index 00000000..7478656e
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/resources/config/config.json
@@ -0,0 +1,8 @@
+{
+
+ "database-type": "mongo",
+ "database-ip": "emco-mongo",
+ "etcd-ip": "emco-etcd",
+ "service-port": "9077"
+}
+
diff --git a/deployments/helm/v2/emco/dcm/templates/configmap.yaml b/deployments/helm/v2/emco/dcm/templates/configmap.yaml
new file mode 100644
index 00000000..998e0389
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/templates/configmap.yaml
@@ -0,0 +1,28 @@
+{{/*
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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" . }}
+ namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+data:
+{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
diff --git a/deployments/helm/v2/emco/dcm/templates/deployment.yaml b/deployments/helm/v2/emco/dcm/templates/deployment.yaml
new file mode 100644
index 00000000..cf73fe21
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/templates/deployment.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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.
+*/}}
+{{- template "common.deployment" . -}} \ No newline at end of file
diff --git a/deployments/helm/v2/emco/dcm/templates/service.yaml b/deployments/helm/v2/emco/dcm/templates/service.yaml
new file mode 100644
index 00000000..c9ab68d3
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/templates/service.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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.
+*/}}
+{{- template "common.servicemco" . -}} \ No newline at end of file
diff --git a/deployments/helm/v2/emco/dcm/values.yaml b/deployments/helm/v2/emco/dcm/values.yaml
new file mode 100644
index 00000000..dffa85e9
--- /dev/null
+++ b/deployments/helm/v2/emco/dcm/values.yaml
@@ -0,0 +1,84 @@
+# Copyright 2020 Intel Corporation, Inc
+#
+# 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.
+
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+ nodePortPrefixExt: 304
+ persistence: {}
+#################################################################
+# Application configuration defaults.
+#################################################################
+# application image
+repository: registry.hub.docker.com
+image: emcov2/emco:stable
+pullPolicy: Always
+command: "/opt/emco/entrypoint"
+args: "dcm"
+workingDir: /opt/emco
+
+# flag to enable debugging - application support required
+debugEnabled: false
+
+# application configuration is via config files
+
+# default number of instances
+replicaCount: 1
+
+nodeSelector: {}
+
+affinity: {}
+
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 10
+ periodSeconds: 30
+ # necessary to disable liveness probe when setting breakpoints
+ # in debugger so K8s doesn't restart unresponsive container
+ enabled: true
+
+readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 30
+
+service:
+ type: NodePort
+ name: dcm
+ portName: dcm
+ internalPort: 9077
+ externalPort: 9077
+ nodePort: 77
+
+ingress:
+ enabled: false
+
+# Configure resource requests and limits
+flavor: large
+resources:
+ small:
+ limits:
+ cpu: 200m
+ memory: 500Mi
+ requests:
+ cpu: 10m
+ memory: 10Mi
+ large:
+ limits:
+ cpu: 400m
+ memory: 1Gi
+ requests:
+ cpu: 10m
+ memory: 100Mi
+ unlimited: {}
diff --git a/deployments/helm/v2/emco/emco-db/requirements.yaml b/deployments/helm/v2/emco/emco-db/requirements.yaml
index 52a40b64..62e807b6 100644
--- a/deployments/helm/v2/emco/emco-db/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-db/requirements.yaml
@@ -15,10 +15,10 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: mongo
version: ~4.x-0
- repository: '@local'
+ repository: 'file://../mongo'
- name: etcd
version: ~3.x-0
- repository: '@local'
+ repository: 'file://../etcd'
diff --git a/deployments/helm/v2/emco/emco-services/requirements.yaml b/deployments/helm/v2/emco/emco-services/requirements.yaml
index 9cd7b475..ddb9fb7f 100644
--- a/deployments/helm/v2/emco/emco-services/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-services/requirements.yaml
@@ -15,19 +15,22 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: orchestrator
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../orchestrator'
- name: ncm
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../ncm'
- name: rsync
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../rsync'
- name: clm
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../clm'
- name: ovnaction
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../ovnaction'
+ - name: dcm
+ version: ~0.x-0
+ repository: 'file://../dcm'
diff --git a/deployments/helm/v2/emco/emco-tools/requirements.yaml b/deployments/helm/v2/emco/emco-tools/requirements.yaml
index ddb91c51..14ad537d 100644
--- a/deployments/helm/v2/emco/emco-tools/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-tools/requirements.yaml
@@ -15,7 +15,7 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
- name: fluentd
version: ~1.x-0
- repository: '@local'
+ repository: 'file://../fluentd'
diff --git a/deployments/helm/v2/emco/emco/requirements.yaml b/deployments/helm/v2/emco/emco/requirements.yaml
index 21649c38..c704d2f2 100644
--- a/deployments/helm/v2/emco/emco/requirements.yaml
+++ b/deployments/helm/v2/emco/emco/requirements.yaml
@@ -15,11 +15,11 @@
dependencies:
- name: emco-db
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-db'
- name: emco-tools
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-tools'
- name: emco-services
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../emco-services'
diff --git a/deployments/helm/v2/emco/etcd/requirements.yaml b/deployments/helm/v2/emco/etcd/requirements.yaml
index d71b975c..9802dac4 100644
--- a/deployments/helm/v2/emco/etcd/requirements.yaml
+++ b/deployments/helm/v2/emco/etcd/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/etcd/values.yaml b/deployments/helm/v2/emco/etcd/values.yaml
index 226b4594..682af0d5 100644
--- a/deployments/helm/v2/emco/etcd/values.yaml
+++ b/deployments/helm/v2/emco/etcd/values.yaml
@@ -25,7 +25,7 @@ global:
#repository: etcd
repository: "k8s.gcr.io"
-image: "etcd-amd64:3.2.26"
+image: "etcd-amd64:3.3.17"
pullPolicy: Always
# default number of instances in the StatefulSet
@@ -48,6 +48,7 @@ persistence:
enabled: false
volumeReclaimPolicy: Retain
accessMode: ReadWriteMany
+ storageType: hostPath
storage: 1Gi
mountPath: /dockerdata-nfs
mountSubPath: "etcd/data"
diff --git a/deployments/helm/v2/emco/fluentd/values-production.yaml b/deployments/helm/v2/emco/fluentd/values-production.yaml
index d1bc5e26..0df1dab1 100644
--- a/deployments/helm/v2/emco/fluentd/values-production.yaml
+++ b/deployments/helm/v2/emco/fluentd/values-production.yaml
@@ -13,7 +13,7 @@ global: {}
image:
registry: docker.io
repository: bitnami/fluentd
- tag: 1.10.2-debian-10-r11
+ tag: 1.11.4-debian-10-r7
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/deployments/helm/v2/emco/fluentd/values.yaml b/deployments/helm/v2/emco/fluentd/values.yaml
index 1feb2a19..6f9770d4 100644
--- a/deployments/helm/v2/emco/fluentd/values.yaml
+++ b/deployments/helm/v2/emco/fluentd/values.yaml
@@ -13,7 +13,7 @@ global: {}
image:
registry: docker.io
repository: bitnami/fluentd
- tag: 1.10.2-debian-10-r11
+ tag: 1.11.4-debian-10-r7
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
diff --git a/deployments/helm/v2/emco/mongo/requirements.yaml b/deployments/helm/v2/emco/mongo/requirements.yaml
index 38a832b8..b8b139fa 100644
--- a/deployments/helm/v2/emco/mongo/requirements.yaml
+++ b/deployments/helm/v2/emco/mongo/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/mongo/values.yaml b/deployments/helm/v2/emco/mongo/values.yaml
index 0a6f8570..71cbadda 100644
--- a/deployments/helm/v2/emco/mongo/values.yaml
+++ b/deployments/helm/v2/emco/mongo/values.yaml
@@ -19,7 +19,7 @@ global:
nodePortPrefix: 302
persistence: {}
readinessRepository: oomk8s
- readinessImage: readiness-check:2.0.0
+ readinessImage: readiness-check:2.2.2
#################################################################
@@ -27,7 +27,7 @@ global:
#################################################################
dockerHubRepository: registry.hub.docker.com
-image: library/mongo:4.0.8
+image: library/mongo:4.4.1
pullPolicy: Always
# application configuration
@@ -98,7 +98,7 @@ resources: {}
nfsprovisionerRepository: quay.io
-nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v1.0.8
+nfsprovisionerImage: kubernetes_incubator/nfs-provisioner:v2.3.0
nfsprovisionerPrefix: mongo
sdnctlPrefix: mongo
diff --git a/deployments/helm/v2/emco/ncm/requirements.yaml b/deployments/helm/v2/emco/ncm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ncm/requirements.yaml
+++ b/deployments/helm/v2/emco/ncm/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/orchestrator/requirements.yaml b/deployments/helm/v2/emco/orchestrator/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/orchestrator/requirements.yaml
+++ b/deployments/helm/v2/emco/orchestrator/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/ovnaction/requirements.yaml b/deployments/helm/v2/emco/ovnaction/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ovnaction/requirements.yaml
+++ b/deployments/helm/v2/emco/ovnaction/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/rsync/requirements.yaml b/deployments/helm/v2/emco/rsync/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/rsync/requirements.yaml
+++ b/deployments/helm/v2/emco/rsync/requirements.yaml
@@ -15,4 +15,4 @@
dependencies:
- name: common
version: ~0.x-0
- repository: '@local'
+ repository: 'file://../common'