summaryrefslogtreecommitdiffstats
path: root/kubernetes/contrib/components
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/contrib/components')
-rw-r--r--kubernetes/contrib/components/Makefile51
-rw-r--r--kubernetes/contrib/components/awx/Makefile40
-rwxr-xr-xkubernetes/contrib/components/awx/charts/awx/values.yaml111
-rw-r--r--kubernetes/contrib/components/awx/components/Makefile51
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml)0
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/Chart.yaml)11
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/templates/NOTES.txt (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt)0
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml)2
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/templates/pv.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml)0
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/templates/pvc.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml)0
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/templates/service.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml)0
-rwxr-xr-xkubernetes/contrib/components/awx/components/awx-postgres/values.yaml (renamed from kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml)1
-rwxr-xr-xkubernetes/contrib/components/awx/requirements.yaml8
-rw-r--r--kubernetes/contrib/components/awx/resources/config/credentials.py (renamed from kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py)0
-rw-r--r--kubernetes/contrib/components/awx/resources/config/environment.sh (renamed from kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh)0
-rw-r--r--kubernetes/contrib/components/awx/templates/configmap.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml)0
-rw-r--r--kubernetes/contrib/components/awx/templates/job.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/job.yaml)4
-rw-r--r--kubernetes/contrib/components/awx/templates/secret.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml)0
-rwxr-xr-xkubernetes/contrib/components/awx/templates/service.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/service.yaml)0
-rw-r--r--kubernetes/contrib/components/awx/templates/serviceaccout.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml)0
-rw-r--r--kubernetes/contrib/components/awx/templates/statefulset.yaml (renamed from kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml)10
-rwxr-xr-xkubernetes/contrib/components/awx/values.yaml96
-rw-r--r--kubernetes/contrib/components/ejbca/requirements.yaml3
-rw-r--r--kubernetes/contrib/components/ejbca/templates/deployment.yaml4
-rw-r--r--kubernetes/contrib/components/ejbca/values.yaml4
-rw-r--r--kubernetes/contrib/components/netbox/Makefile40
-rw-r--r--kubernetes/contrib/components/netbox/components/Makefile51
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/.helmignore (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml21
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/configuration.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/gunicorn_config.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/ldap_config.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/groups.yml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/users.yml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/provisioning/provision.sh (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/00_users.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/10_groups.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/20_custom_fields.py (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/NOTES.txt (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/configmap.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/deployment.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml)2
-rw-r--r--kubernetes/contrib/components/netbox/components/netbox-app/templates/job.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml)4
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/pv.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/pvc.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/secrets.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/templates/service.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-app/values.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml)6
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/.helmignore (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml21
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/resources/config/nginx.conf (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/templates/NOTES.txt (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/templates/configmap.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/templates/deployment.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml)2
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/templates/service.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-nginx/values.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml)1
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/.helmignore (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml21
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/NOTES.txt (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/configmap.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/deployment.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml)2
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/pv.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/pvc.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/templates/service.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml)0
-rwxr-xr-xkubernetes/contrib/components/netbox/components/netbox-postgres/values.yaml (renamed from kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml)1
-rwxr-xr-xkubernetes/contrib/components/netbox/requirements.yaml14
-rwxr-xr-xkubernetes/contrib/components/netbox/values.yaml3
70 files changed, 421 insertions, 164 deletions
diff --git a/kubernetes/contrib/components/Makefile b/kubernetes/contrib/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/contrib/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/contrib/components/awx/Makefile b/kubernetes/contrib/components/awx/Makefile
index cb88b57fc9..4c79718d02 100644
--- a/kubernetes/contrib/components/awx/Makefile
+++ b/kubernetes/contrib/components/awx/Makefile
@@ -1,4 +1,4 @@
-# Copyright © 2019 Bell Canada
+# Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,7 +11,41 @@
# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := dist resources templates charts docker
HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
-make-awx:
- cd charts && $(HELM_BIN) dep up awx-postgres
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/contrib/components/awx/charts/awx/values.yaml b/kubernetes/contrib/components/awx/charts/awx/values.yaml
deleted file mode 100755
index fd77a12c0b..0000000000
--- a/kubernetes/contrib/components/awx/charts/awx/values.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright © 2019 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.
-
-# Default values for mariadb.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-global: # global defaults
- nodePortPrefixExt: 304
- persistence: {}
-
-# application image
-repository: ansible
-image:
- web: awx_web:9.0.1
- task: awx_task:9.0.1
- rabbitmq: awx_rabbitmq:3.7.4
- memcached: memcached:1.5.20
-pullPolicy: Always
-
-# application configuration
-config:
- postgresUser: awx
- postgresPassword: awx
- postgresDB: awx
-# RabbitMQ Configuration
- rabbitmqUser: awx
- rabbitmqPassword: awxpass
- rabbitmqVhost: awx
- rabbitmqErlangCookie: cookiemonster3
-# This will create or update a default admin (superuser) account in AWX, if not provided
-# then these default values are used
- awxAdminUser: admin
- awxAdminPassword: password
- awxAdminEmail: cds@onap.org
-# AWX Secret key
-# It's *very* important that this stay the same between upgrades or you will lose the ability to decrypt
-# your credentials
- secretKey: awxsecret
-
-ingress:
- enabled: false
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
- initialDelaySeconds: 10
- periodSeconds: 10
- enabled: true
-
-## Persist data to a persitent volume
-persistence:
- enabled: true
- volumeReclaimPolicy: Retain
-
- # Uncomment the storageClass parameter to use an existing PV
- # that will match the following class.
- # When uncomment the storageClass, the PV is not created anymore.
-
- # storageClass: "nfs-dev-sc"
-
- accessMode: ReadWriteOnce
- size: 5Gi
-
- # When using storage class, mountPath and mountSubPath are
- # simply ignored.
-
- mountPath: /dockerdata-nfs
- mountSubPath: awx/pgdata
-
-service:
- rmqmgmt:
- type: ClusterIP
- portName: rmqmgmt
- internalPort: 15672
- externalPort: 15672
- web:
- type: NodePort
- portName: web
- internalPort: 8052
- externalPort: 80
- nodePort: 78
- rabbitmq:
- type: ClusterIP
- http:
- portName: http
- internalPort: 15672
- externalPort: 15672
- amqp:
- portName: amqp
- internalPort: 5672
- externalPort: 5672
-
-resources: {}
diff --git a/kubernetes/contrib/components/awx/components/Makefile b/kubernetes/contrib/components/awx/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/contrib/components/awx/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
index e30faf275e..e30faf275e 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/Chart.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx/Chart.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
index 00dca3f62c..a93a429647 100755
--- a/kubernetes/contrib/components/awx/charts/awx/Chart.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/requirements.yaml
@@ -12,7 +12,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-description: Ansible AWX application
-name: awx
-version: 6.0.0
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt b/kubernetes/contrib/components/awx/components/awx-postgres/templates/NOTES.txt
index 3ab092e848..3ab092e848 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/NOTES.txt
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml
index 6b3ca1a9d0..c0c6b914fb 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/templates/pv.yaml
index bfe63abafe..bfe63abafe 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/pv.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/templates/pvc.yaml
index e12dabf175..e12dabf175 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/pvc.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/templates/service.yaml
index f560417425..f560417425 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/templates/service.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
index 09012ead47..a7234caceb 100755
--- a/kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml
+++ b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
@@ -21,7 +21,6 @@ global: # global defaults
persistence: {}
# application image
-repository: docker.io
image: postgres:10.4-alpine
pullPolicy: Always
diff --git a/kubernetes/contrib/components/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml
index a748affaac..5eda4dbe7e 100755
--- a/kubernetes/contrib/components/awx/requirements.yaml
+++ b/kubernetes/contrib/components/awx/requirements.yaml
@@ -15,4 +15,10 @@
dependencies:
- name: common
version: ~6.x-0
- repository: '@local' \ No newline at end of file
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
+ - name: awx-postgres
+ version: ~6.x-0
+ repository: 'file://components/awx-postgres'
diff --git a/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py b/kubernetes/contrib/components/awx/resources/config/credentials.py
index 85808d10d4..85808d10d4 100644
--- a/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py
+++ b/kubernetes/contrib/components/awx/resources/config/credentials.py
diff --git a/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh b/kubernetes/contrib/components/awx/resources/config/environment.sh
index b9d01d079c..b9d01d079c 100644
--- a/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh
+++ b/kubernetes/contrib/components/awx/resources/config/environment.sh
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml b/kubernetes/contrib/components/awx/templates/configmap.yaml
index 9bc62b0856..9bc62b0856 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml
+++ b/kubernetes/contrib/components/awx/templates/configmap.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml b/kubernetes/contrib/components/awx/templates/job.yaml
index 74c02bcd5f..f974f446c2 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml
+++ b/kubernetes/contrib/components/awx/templates/job.yaml
@@ -37,7 +37,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -53,7 +53,7 @@ spec:
containers:
- command: ["/bin/sh","-c"]
args: ["/etc/tower/job-entrypoint.sh"]
- image: "{{ .Values.repository }}/{{ .Values.image.task }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.task }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-mgnt
resources:
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml b/kubernetes/contrib/components/awx/templates/secret.yaml
index 642f779214..642f779214 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml
+++ b/kubernetes/contrib/components/awx/templates/secret.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/service.yaml b/kubernetes/contrib/components/awx/templates/service.yaml
index 10f031da82..10f031da82 100755
--- a/kubernetes/contrib/components/awx/charts/awx/templates/service.yaml
+++ b/kubernetes/contrib/components/awx/templates/service.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml b/kubernetes/contrib/components/awx/templates/serviceaccout.yaml
index 0f52ce800a..0f52ce800a 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml
+++ b/kubernetes/contrib/components/awx/templates/serviceaccout.yaml
diff --git a/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/templates/statefulset.yaml
index 6023bb4fdb..46747cd85f 100644
--- a/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml
+++ b/kubernetes/contrib/components/awx/templates/statefulset.yaml
@@ -44,7 +44,7 @@ spec:
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -60,7 +60,7 @@ spec:
containers:
- - image: "{{ .Values.repository }}/{{ .Values.image.web }}"
+ - image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.web }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-web
ports:
@@ -88,7 +88,7 @@ spec:
- name: AWX_SKIP_MIGRATIONS
value: "1"
- image: "{{ .Values.repository }}/{{ .Values.image.task }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.task }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-celery
resources:
@@ -127,7 +127,7 @@ spec:
- name: K8S_SERVICE_NAME
value: {{ include "common.servicename" . }}-rabbitmq
- image: "{{ .Values.repository }}/{{ .Values.image.rabbitmq }}"
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.rabbitmq }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-rabbit
livenessProbe:
@@ -165,7 +165,7 @@ spec:
- mountPath: /etc/rabbitmq
name: rabbitmq-config
- - image: "{{ .Values.image.memcached }}"
+ - image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.memcached }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-memcached
resources:
diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml
index 1ed35c2c23..a29866da9a 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -12,28 +12,100 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
- readinessRepository: nexus3.onap.org:10001
+# Default values for mariadb.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+global: # global defaults
nodePortPrefixExt: 304
commonConfigPrefix: awx
- readinessImage: onap/oom/readiness:3.0.1
+ persistence: {}
-#################################################################
-# Application configuration defaults.
-#################################################################
# application image
-repository: hub.docker.io
+image:
+ web: ansible/awx_web:9.0.1
+ task: ansible/awx_task:9.0.1
+ rabbitmq: ansible/awx_rabbitmq:3.7.4
+ memcached: memcached:1.5.20
pullPolicy: Always
+# application configuration
+config:
+ postgresUser: awx
+ postgresPassword: awx
+ postgresDB: awx
+# RabbitMQ Configuration
+ rabbitmqUser: awx
+ rabbitmqPassword: awxpass
+ rabbitmqVhost: awx
+ rabbitmqErlangCookie: cookiemonster3
+# This will create or update a default admin (superuser) account in AWX, if not provided
+# then these default values are used
+ awxAdminUser: admin
+ awxAdminPassword: password
+ awxAdminEmail: cds@onap.org
+# AWX Secret key
+# It's *very* important that this stay the same between upgrades or you will lose the ability to decrypt
+# your credentials
+ secretKey: awxsecret
+
+ingress:
+ enabled: false
+
# default number of instances
replicaCount: 1
+
nodeSelector: {}
+
affinity: {}
-ingress:
- enabled: false
+# probe configuration parameters
+liveness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ enabled: true
+
+## Persist data to a persitent volume
+persistence:
+ enabled: true
+ volumeReclaimPolicy: Retain
+
+ # Uncomment the storageClass parameter to use an existing PV
+ # that will match the following class.
+ # When uncomment the storageClass, the PV is not created anymore.
+
+ # storageClass: "nfs-dev-sc"
+
+ accessMode: ReadWriteOnce
+ size: 5Gi
+
+ # When using storage class, mountPath and mountSubPath are
+ # simply ignored.
+
+ mountPath: /dockerdata-nfs
+ mountSubPath: awx/pgdata
+
+service:
+ rmqmgmt:
+ type: ClusterIP
+ portName: rmqmgmt
+ internalPort: 15672
+ externalPort: 15672
+ web:
+ type: NodePort
+ portName: web
+ internalPort: 8052
+ externalPort: 80
+ nodePort: 78
+ rabbitmq:
+ type: ClusterIP
+ http:
+ portName: http
+ internalPort: 15672
+ externalPort: 15672
+ amqp:
+ portName: amqp
+ internalPort: 5672
+ externalPort: 5672
resources: {}
diff --git a/kubernetes/contrib/components/ejbca/requirements.yaml b/kubernetes/contrib/components/ejbca/requirements.yaml
index e87bc08da3..00542037af 100644
--- a/kubernetes/contrib/components/ejbca/requirements.yaml
+++ b/kubernetes/contrib/components/ejbca/requirements.yaml
@@ -23,3 +23,6 @@ dependencies:
version: ~6.x-0
repository: '@local'
condition: not global.mariadbGalera.localCluster
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
diff --git a/kubernetes/contrib/components/ejbca/templates/deployment.yaml b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
index 55de54febf..a10b0592de 100644
--- a/kubernetes/contrib/components/ejbca/templates/deployment.yaml
+++ b/kubernetes/contrib/components/ejbca/templates/deployment.yaml
@@ -40,11 +40,11 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.namespace
- image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
containers:
- name: {{ include "common.name" . }}-ejbca
- image: {{ .Values.ejbca.image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.ejbca.image }}
imagePullPolicy: {{ .Values.pullPolicy }}
lifecycle:
postStart:
diff --git a/kubernetes/contrib/components/ejbca/values.yaml b/kubernetes/contrib/components/ejbca/values.yaml
index 35160e4b13..c26bfe2fbb 100644
--- a/kubernetes/contrib/components/ejbca/values.yaml
+++ b/kubernetes/contrib/components/ejbca/values.yaml
@@ -12,8 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
global:
- readinessImage: onap/oom/readiness:3.0.1
- mariadbGalera: &mariadbGalera
+ mariadbGalera: &mariadbGalera
#This flag allows EJBCA to instantiate its own mariadb-galera cluster
localCluster: false
service: mariadb-galera
@@ -37,7 +36,6 @@ secrets:
password: '{{ .Values.config.ejbca.clientIak }}'
# application configuration
-repository: nexus3.onap.org:10001
config:
db:
userName: ejbca
diff --git a/kubernetes/contrib/components/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile
index da18203981..4c79718d02 100644
--- a/kubernetes/contrib/components/netbox/Makefile
+++ b/kubernetes/contrib/components/netbox/Makefile
@@ -1,4 +1,4 @@
-# Copyright © 2018 Amdocs, Bell Canada
+# Copyright © 2020 Samsung Electronics
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -11,7 +11,41 @@
# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES := dist resources templates charts docker
HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
-make-netbox:
- cd charts && $(HELM_BIN) dep up netbox-postgres && $(HELM_BIN) dep up netbox-nginx && $(HELM_BIN) dep up netbox-app
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/contrib/components/netbox/components/Makefile b/kubernetes/contrib/components/netbox/components/Makefile
new file mode 100644
index 0000000000..bf267b7720
--- /dev/null
+++ b/kubernetes/contrib/components/netbox/components/Makefile
@@ -0,0 +1,51 @@
+# Copyright © 2020 Samsung Electronics
+#
+# 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.
+
+ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+OUTPUT_DIR := $(ROOT_DIR)/../../dist
+PACKAGE_DIR := $(OUTPUT_DIR)/packages
+SECRET_DIR := $(OUTPUT_DIR)/secrets
+
+EXCLUDES :=
+HELM_BIN := helm
+HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
+
+.PHONY: $(EXCLUDES) $(HELM_CHARTS)
+
+all: $(HELM_CHARTS)
+
+$(HELM_CHARTS):
+ @echo "\n[$@]"
+ @make package-$@
+
+make-%:
+ @if [ -f $*/Makefile ]; then make -C $*; fi
+
+dep-%: make-%
+ @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+
+lint-%: dep-%
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
+
+package-%: lint-%
+ @mkdir -p $(PACKAGE_DIR)
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) package -d $(PACKAGE_DIR) $*; fi
+ @$(HELM_BIN) repo index $(PACKAGE_DIR)
+
+clean:
+ @rm -f */requirements.lock
+ @rm -f *tgz */charts/*tgz
+ @rm -rf $(PACKAGE_DIR)
+%:
+ @:
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore b/kubernetes/contrib/components/netbox/components/netbox-app/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/.helmignore
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
index 787bc4a971..787bc4a971 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/Chart.yaml
diff --git a/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
new file mode 100755
index 0000000000..9a0c10d687
--- /dev/null
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/requirements.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/configuration.py
index 7d704ae762..7d704ae762 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/configuration.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/gunicorn_config.py
index c7d9f7b725..c7d9f7b725 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/gunicorn_config.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/ldap_config.py
index c7e0d3bee9..c7e0d3bee9 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/configuration/ldap_config.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml
index c23e29a11d..c23e29a11d 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/custom_fields.yml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/groups.yml
index 1f4a5a7a6e..1f4a5a7a6e 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/groups.yml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/users.yml
index 77d330beac..77d330beac 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/initializers/users.yml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/provisioning/provision.sh
index 984801decb..984801decb 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/provisioning/provision.sh
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/00_users.py
index 7626058357..7626058357 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/00_users.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/10_groups.py
index 7932874704..7932874704 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/10_groups.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/20_custom_fields.py
index 5c40e37bf2..5c40e37bf2 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/resources/config/startup_scripts/20_custom_fields.py
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt b/kubernetes/contrib/components/netbox/components/netbox-app/templates/NOTES.txt
index e70c418864..e70c418864 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/NOTES.txt
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/configmap.yaml
index f785478e1b..f785478e1b 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/configmap.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/deployment.yaml
index 0d401d870c..f1209cdb56 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: {{ .Values.repository }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/job.yaml
index ed6518ed1a..3b367a3d4a 100644
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/job.yaml
@@ -35,7 +35,7 @@ spec:
restartPolicy: Never
initContainers:
- name: {{ include "common.name" . }}-init-readiness
- image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ image: {{ include "repositoryGenerator.image.readiness" . }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command:
- /app/ready.py
@@ -50,7 +50,7 @@ spec:
fieldPath: metadata.namespace
containers:
- name: {{ include "common.name" . }}-provisioning-job
- image: "{{ .Values.global.dockerHubRepository }}/{{ .Values.global.curlImage }}"
+ image: {{ include "repositoryGenerator.image.curl" . }}
volumeMounts:
- name: {{ include "common.fullname" . }}-provisioning
mountPath: /tmp
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/pv.yaml
index a61217fb94..a61217fb94 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/pv.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/pvc.yaml
index 7e25a0f1ef..7e25a0f1ef 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/pvc.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/secrets.yaml
index c06bc5a333..c06bc5a333 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/secrets.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/templates/service.yaml
index 74d1116f50..74d1116f50 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/templates/service.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/components/netbox/components/netbox-app/values.yaml
index ff02e27b9b..92f97c2620 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-app/values.yaml
@@ -42,11 +42,7 @@ config:
superuserName: admin
superuserEmail: admin@onap.org
- curlImage: curlimages/curl:7.69.1
- dockerHubRepository: docker.io
-
-repository: netboxcommunity
-image: netbox:v2.5.8
+image: netboxcommunity/netbox:v2.5.8
# probe configuration parameters
liveness:
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore b/kubernetes/contrib/components/netbox/components/netbox-nginx/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/.helmignore
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
index 4abaa27365..4abaa27365 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/Chart.yaml
diff --git a/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
new file mode 100755
index 0000000000..9a0c10d687
--- /dev/null
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/requirements.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf b/kubernetes/contrib/components/netbox/components/netbox-nginx/resources/config/nginx.conf
index 2ef2aca3a1..2ef2aca3a1 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/resources/config/nginx.conf
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/NOTES.txt
index bd74a42cd5..bd74a42cd5 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/NOTES.txt
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/configmap.yaml
index 26242be8e2..26242be8e2 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/configmap.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/deployment.yaml
index 623e7fc2c1..7bdf46f252 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
command: ["nginx"]
args: ["-c", "/etc/netbox-nginx/nginx.conf","-g", "daemon off;"]
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/service.yaml
index c01612e0f4..c01612e0f4 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/templates/service.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml b/kubernetes/contrib/components/netbox/components/netbox-nginx/values.yaml
index e94e50bc4f..de131d30d0 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-nginx/values.yaml
@@ -22,7 +22,6 @@ global: # global defaults
pullPolicy: Always
# application image
-repository: docker.io
image: nginx:1.15-alpine
pullPolicy: Always
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore b/kubernetes/contrib/components/netbox/components/netbox-postgres/.helmignore
index f0c1319444..f0c1319444 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/.helmignore
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
index c439e1d580..c439e1d580 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/Chart.yaml
diff --git a/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
new file mode 100755
index 0000000000..9a0c10d687
--- /dev/null
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/requirements.yaml
@@ -0,0 +1,21 @@
+# 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.
+
+dependencies:
+ - name: common
+ version: ~6.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local' \ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/NOTES.txt
index bd74a42cd5..bd74a42cd5 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/NOTES.txt
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/configmap.yaml
index 9bc530577a..9bc530577a 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/configmap.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/deployment.yaml
index bfd3b39acc..2caddeba49 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/deployment.yaml
@@ -37,7 +37,7 @@ spec:
spec:
containers:
- name: {{ include "common.name" . }}
- image: {{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}
+ image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/pv.yaml
index 37d07f05a1..37d07f05a1 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/pv.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/pvc.yaml
index 30da3add0d..30da3add0d 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/pvc.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/service.yaml
index 75335884df..75335884df 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/templates/service.yaml
diff --git a/kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/components/netbox/components/netbox-postgres/values.yaml
index 1db2457171..572e23d53c 100755
--- a/kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml
+++ b/kubernetes/contrib/components/netbox/components/netbox-postgres/values.yaml
@@ -21,7 +21,6 @@ global: # global defaults
persistence: {}
# application image
-repository: docker.io
image: postgres:10.4-alpine
pullPolicy: Always
diff --git a/kubernetes/contrib/components/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml
index 6e0025e41c..29cf5e2770 100755
--- a/kubernetes/contrib/components/netbox/requirements.yaml
+++ b/kubernetes/contrib/components/netbox/requirements.yaml
@@ -15,4 +15,16 @@
dependencies:
- name: common
version: ~6.x-0
- repository: '@local' \ No newline at end of file
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~6.x-0
+ repository: '@local'
+ - name: netbox-app
+ version: ~6.x-0
+ repository: 'file://components/netbox-app'
+ - name: netbox-nginx
+ version: ~6.x-0
+ repository: 'file://components/netbox-nginx'
+ - name: netbox-postgres
+ version: ~6.x-0
+ repository: 'file://components/netbox-postgres' \ No newline at end of file
diff --git a/kubernetes/contrib/components/netbox/values.yaml b/kubernetes/contrib/components/netbox/values.yaml
index 5dc4535ca3..04d2f27c7c 100755
--- a/kubernetes/contrib/components/netbox/values.yaml
+++ b/kubernetes/contrib/components/netbox/values.yaml
@@ -16,16 +16,13 @@
# Global configuration defaults.
#################################################################
global:
- readinessRepository: nexus3.onap.org:10001
nodePortPrefixExt: 304
commonConfigPrefix: netbox
- readinessImage: onap/oom/readiness:3.0.1
#################################################################
# Application configuration defaults.
#################################################################
# application image
-repository: hub.docker.io
pullPolicy: Always
# default number of instances