From a5bb31b95347229e400099565bedd3f6a3785c9a Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Tue, 7 Apr 2020 12:02:22 +0200 Subject: [PATCH] [Contrib] Authorize choice of subcomponents Instead of forcing installation of all contrib components, make the installation of these components enabled with a toggle, so each person can choose to install a subset, all or none. Issue-ID: OOM-2352 Signed-off-by: Sylvain Desbureaux Change-Id: Ie112fe1f1864587b9ac69f18967a3c28d16bdbbe --- kubernetes/contrib/Makefile | 28 ++++++++++++++++++++++ .../contrib/{charts => components}/awx/Chart.yaml | 0 .../contrib/{charts => components}/awx/Makefile | 0 .../awx/charts/awx-postgres/Chart.yaml | 0 .../awx/charts/awx-postgres/templates/NOTES.txt | 0 .../charts/awx-postgres/templates/deployment.yaml | 0 .../awx/charts/awx-postgres/templates/pv.yaml | 0 .../awx/charts/awx-postgres/templates/pvc.yaml | 0 .../awx/charts/awx-postgres/templates/service.yaml | 0 .../awx/charts/awx-postgres/values.yaml | 0 .../awx/charts/awx/Chart.yaml | 0 .../awx/charts/awx/resources/config/credentials.py | 0 .../awx/charts/awx/resources/config/environment.sh | 0 .../awx/charts/awx/templates/configmap.yaml | 0 .../awx/charts/awx/templates/job.yaml | 0 .../awx/charts/awx/templates/secret.yaml | 0 .../awx/charts/awx/templates/service.yaml | 0 .../awx/charts/awx/templates/serviceaccout.yaml | 0 .../awx/charts/awx/templates/statefulset.yaml | 0 .../awx/charts/awx/values.yaml | 0 .../{charts => components}/awx/requirements.yaml | 0 .../contrib/{charts => components}/awx/values.yaml | 0 .../{charts => components}/netbox/.helmignore | 0 .../{charts => components}/netbox/Chart.yaml | 0 .../contrib/{charts => components}/netbox/Makefile | 0 .../netbox/charts/netbox-app/.helmignore | 0 .../netbox/charts/netbox-app/Chart.yaml | 0 .../config/configuration/configuration.py | 0 .../config/configuration/gunicorn_config.py | 0 .../resources/config/configuration/ldap_config.py | 0 .../config/initializers/custom_fields.yml | 0 .../resources/config/initializers/groups.yml | 0 .../resources/config/initializers/users.yml | 0 .../resources/config/provisioning/provision.sh | 0 .../resources/config/startup_scripts/00_users.py | 0 .../resources/config/startup_scripts/10_groups.py | 0 .../config/startup_scripts/20_custom_fields.py | 0 .../netbox/charts/netbox-app/templates/NOTES.txt | 0 .../charts/netbox-app/templates/configmap.yaml | 0 .../charts/netbox-app/templates/deployment.yaml | 0 .../netbox/charts/netbox-app/templates/job.yaml | 0 .../netbox/charts/netbox-app/templates/pv.yaml | 0 .../netbox/charts/netbox-app/templates/pvc.yaml | 0 .../charts/netbox-app/templates/secrets.yaml | 0 .../charts/netbox-app/templates/service.yaml | 0 .../netbox/charts/netbox-app/values.yaml | 0 .../netbox/charts/netbox-nginx/.helmignore | 0 .../netbox/charts/netbox-nginx/Chart.yaml | 0 .../netbox-nginx/resources/config/nginx.conf | 0 .../netbox/charts/netbox-nginx/templates/NOTES.txt | 0 .../charts/netbox-nginx/templates/configmap.yaml | 0 .../charts/netbox-nginx/templates/deployment.yaml | 0 .../charts/netbox-nginx/templates/service.yaml | 0 .../netbox/charts/netbox-nginx/values.yaml | 0 .../netbox/charts/netbox-postgres/.helmignore | 0 .../netbox/charts/netbox-postgres/Chart.yaml | 0 .../charts/netbox-postgres/templates/NOTES.txt | 0 .../netbox-postgres/templates/configmap.yaml | 0 .../netbox-postgres/templates/deployment.yaml | 0 .../charts/netbox-postgres/templates/pv.yaml | 0 .../charts/netbox-postgres/templates/pvc.yaml | 0 .../charts/netbox-postgres/templates/service.yaml | 0 .../netbox/charts/netbox-postgres/values.yaml | 0 .../netbox/requirements.yaml | 0 .../netbox/templates/ingress.yaml | 0 .../{charts => components}/netbox/values.yaml | 0 kubernetes/contrib/requirements.yaml | 10 +++++++- 67 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 kubernetes/contrib/Makefile rename kubernetes/contrib/{charts => components}/awx/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/Makefile (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/templates/NOTES.txt (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/templates/deployment.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/templates/pv.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/templates/pvc.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/templates/service.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx-postgres/values.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/resources/config/credentials.py (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/resources/config/environment.sh (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/configmap.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/job.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/secret.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/service.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/serviceaccout.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/templates/statefulset.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/charts/awx/values.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/requirements.yaml (100%) rename kubernetes/contrib/{charts => components}/awx/values.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/.helmignore (100%) rename kubernetes/contrib/{charts => components}/netbox/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/Makefile (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/.helmignore (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/configuration/configuration.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/initializers/groups.yml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/initializers/users.yml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/provisioning/provision.sh (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/NOTES.txt (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/configmap.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/deployment.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/job.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/pv.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/pvc.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/secrets.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/templates/service.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-app/values.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/.helmignore (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/resources/config/nginx.conf (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/templates/NOTES.txt (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/templates/configmap.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/templates/deployment.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/templates/service.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-nginx/values.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/.helmignore (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/Chart.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/NOTES.txt (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/configmap.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/deployment.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/pv.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/pvc.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/templates/service.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/charts/netbox-postgres/values.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/requirements.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/templates/ingress.yaml (100%) rename kubernetes/contrib/{charts => components}/netbox/values.yaml (100%) diff --git a/kubernetes/contrib/Makefile b/kubernetes/contrib/Makefile new file mode 100644 index 0000000000..3e9d7a7eb1 --- /dev/null +++ b/kubernetes/contrib/Makefile @@ -0,0 +1,28 @@ +# Copyright © 2018 AT&T Intellectual Property. All rights reserved. +# +# 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. + +make-contrib: make-contrib-awx make-contrib-netbox make-contrib-core + +make-contrib-awx: + cd components && helm dep up awx && helm lint awx + +make-contrib-netbox: + cd components && helm dep up netbox && helm lint netbox + +make-contrib-core: + helm dep up . && helm lint . + +clean: + @find . -type f -name '*.tgz' -delete + @find . -type f -name '*.lock' -delete diff --git a/kubernetes/contrib/charts/awx/Chart.yaml b/kubernetes/contrib/components/awx/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/Chart.yaml rename to kubernetes/contrib/components/awx/Chart.yaml diff --git a/kubernetes/contrib/charts/awx/Makefile b/kubernetes/contrib/components/awx/Makefile similarity index 100% rename from kubernetes/contrib/charts/awx/Makefile rename to kubernetes/contrib/components/awx/Makefile diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/Chart.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/Chart.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/Chart.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/NOTES.txt b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/templates/NOTES.txt rename to kubernetes/contrib/components/awx/charts/awx-postgres/templates/NOTES.txt diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/templates/deployment.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/templates/deployment.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pv.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/templates/pv.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/templates/pvc.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/templates/pvc.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/templates/service.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/templates/service.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx-postgres/values.yaml rename to kubernetes/contrib/components/awx/charts/awx-postgres/values.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/Chart.yaml b/kubernetes/contrib/components/awx/charts/awx/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/Chart.yaml rename to kubernetes/contrib/components/awx/charts/awx/Chart.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/resources/config/credentials.py b/kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/resources/config/credentials.py rename to kubernetes/contrib/components/awx/charts/awx/resources/config/credentials.py diff --git a/kubernetes/contrib/charts/awx/charts/awx/resources/config/environment.sh b/kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/resources/config/environment.sh rename to kubernetes/contrib/components/awx/charts/awx/resources/config/environment.sh diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/configmap.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/configmap.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/configmap.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/job.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/job.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/job.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/secret.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/secret.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/service.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/service.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/service.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/serviceaccout.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/serviceaccout.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/serviceaccout.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml b/kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/templates/statefulset.yaml rename to kubernetes/contrib/components/awx/charts/awx/templates/statefulset.yaml diff --git a/kubernetes/contrib/charts/awx/charts/awx/values.yaml b/kubernetes/contrib/components/awx/charts/awx/values.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/charts/awx/values.yaml rename to kubernetes/contrib/components/awx/charts/awx/values.yaml diff --git a/kubernetes/contrib/charts/awx/requirements.yaml b/kubernetes/contrib/components/awx/requirements.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/requirements.yaml rename to kubernetes/contrib/components/awx/requirements.yaml diff --git a/kubernetes/contrib/charts/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml similarity index 100% rename from kubernetes/contrib/charts/awx/values.yaml rename to kubernetes/contrib/components/awx/values.yaml diff --git a/kubernetes/contrib/charts/netbox/.helmignore b/kubernetes/contrib/components/netbox/.helmignore similarity index 100% rename from kubernetes/contrib/charts/netbox/.helmignore rename to kubernetes/contrib/components/netbox/.helmignore diff --git a/kubernetes/contrib/charts/netbox/Chart.yaml b/kubernetes/contrib/components/netbox/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/Chart.yaml rename to kubernetes/contrib/components/netbox/Chart.yaml diff --git a/kubernetes/contrib/charts/netbox/Makefile b/kubernetes/contrib/components/netbox/Makefile similarity index 100% rename from kubernetes/contrib/charts/netbox/Makefile rename to kubernetes/contrib/components/netbox/Makefile diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/.helmignore rename to kubernetes/contrib/components/netbox/charts/netbox-app/.helmignore diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/Chart.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/Chart.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/configuration.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/configuration.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/configuration.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/gunicorn_config.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/configuration/ldap_config.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/custom_fields.yml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/groups.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/groups.yml rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/groups.yml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/initializers/users.yml rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/initializers/users.yml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/provisioning/provision.sh rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/provisioning/provision.sh diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/00_users.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/10_groups.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py b/kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py rename to kubernetes/contrib/components/netbox/charts/netbox-app/resources/config/startup_scripts/20_custom_fields.py diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/NOTES.txt rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/NOTES.txt diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/configmap.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/configmap.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/deployment.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/deployment.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/job.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/job.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/job.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pv.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/pv.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/pvc.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/pvc.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/secrets.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/secrets.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/secrets.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/templates/service.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/templates/service.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-app/values.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-app/values.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/.helmignore rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/.helmignore diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/Chart.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/Chart.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/resources/config/nginx.conf b/kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/resources/config/nginx.conf rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/resources/config/nginx.conf diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/NOTES.txt rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/NOTES.txt diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/configmap.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/configmap.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/deployment.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/deployment.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/templates/service.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/templates/service.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-nginx/values.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-nginx/values.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/.helmignore b/kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/.helmignore rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/.helmignore diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/Chart.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/Chart.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/NOTES.txt b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/NOTES.txt rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/NOTES.txt diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/configmap.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/configmap.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/configmap.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/deployment.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/deployment.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pv.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pv.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/pvc.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/pvc.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/service.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/templates/service.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/templates/service.yaml diff --git a/kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml b/kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/charts/netbox-postgres/values.yaml rename to kubernetes/contrib/components/netbox/charts/netbox-postgres/values.yaml diff --git a/kubernetes/contrib/charts/netbox/requirements.yaml b/kubernetes/contrib/components/netbox/requirements.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/requirements.yaml rename to kubernetes/contrib/components/netbox/requirements.yaml diff --git a/kubernetes/contrib/charts/netbox/templates/ingress.yaml b/kubernetes/contrib/components/netbox/templates/ingress.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/templates/ingress.yaml rename to kubernetes/contrib/components/netbox/templates/ingress.yaml diff --git a/kubernetes/contrib/charts/netbox/values.yaml b/kubernetes/contrib/components/netbox/values.yaml similarity index 100% rename from kubernetes/contrib/charts/netbox/values.yaml rename to kubernetes/contrib/components/netbox/values.yaml diff --git a/kubernetes/contrib/requirements.yaml b/kubernetes/contrib/requirements.yaml index 6e0025e41c..2574cea2c5 100644 --- a/kubernetes/contrib/requirements.yaml +++ b/kubernetes/contrib/requirements.yaml @@ -15,4 +15,12 @@ dependencies: - name: common version: ~6.x-0 - repository: '@local' \ No newline at end of file + repository: '@local' + - name: netbox + version: ~6.x-0 + repository: 'file://components/netbox' + condition: netbox.enabled + - name: awx + version: ~6.x-0 + repository: 'file://components/awx' + condition: awx.enabled -- 2.16.6