diff --git a/Makefile b/Makefile index 5068849..6964c6a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ HELM := helm -FILTER_CHARTS := helm-toolkit +FILTER_CHARTS := helm-toolkit-contrail CONTRAIL_CHARTS := $(FILTER_CHARTS) $(filter-out $(FILTER_CHARTS), $(patsubst %/Chart.yaml, %, $(wildcard */Chart.yaml))) BUILD_CHARTS := $(foreach chart, $(CONTRAIL_CHARTS), build-$(chart)) diff --git a/contrail-analytics/requirements.yaml b/contrail-analytics/requirements.yaml index 4b15632..45950b5 100644 --- a/contrail-analytics/requirements.yaml +++ b/contrail-analytics/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: helm-toolkit + - name: helm-toolkit-contrail repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-controller/requirements.yaml b/contrail-controller/requirements.yaml index 4b15632..45950b5 100644 --- a/contrail-controller/requirements.yaml +++ b/contrail-controller/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: helm-toolkit + - name: helm-toolkit-contrail repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-thirdparty/requirements.yaml b/contrail-thirdparty/requirements.yaml index 4b15632..45950b5 100644 --- a/contrail-thirdparty/requirements.yaml +++ b/contrail-thirdparty/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: helm-toolkit + - name: helm-toolkit-contrail repository: http://localhost:8879/charts version: 0.1.0 diff --git a/contrail-vrouter/requirements.yaml b/contrail-vrouter/requirements.yaml index 4b15632..45950b5 100644 --- a/contrail-vrouter/requirements.yaml +++ b/contrail-vrouter/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - - name: helm-toolkit + - name: helm-toolkit-contrail repository: http://localhost:8879/charts version: 0.1.0 diff --git a/helm-toolkit/.gitignore b/helm-toolkit-contrail/.gitignore similarity index 100% rename from helm-toolkit/.gitignore rename to helm-toolkit-contrail/.gitignore diff --git a/helm-toolkit/.helmignore b/helm-toolkit-contrail/.helmignore similarity index 100% rename from helm-toolkit/.helmignore rename to helm-toolkit-contrail/.helmignore diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit-contrail/Chart.yaml similarity index 88% rename from helm-toolkit/Chart.yaml rename to helm-toolkit-contrail/Chart.yaml index 4e81afa..be7a758 100644 --- a/helm-toolkit/Chart.yaml +++ b/helm-toolkit-contrail/Chart.yaml @@ -13,6 +13,6 @@ # limitations under the License. apiVersion: v1 -description: OpenStack-Helm Helm-Toolkit -name: helm-toolkit +description: OpenStack-Helm Helm-Toolkit for contrail +name: helm-toolkit-contrail version: 0.1.0 diff --git a/helm-toolkit/Makefile b/helm-toolkit-contrail/Makefile similarity index 100% rename from helm-toolkit/Makefile rename to helm-toolkit-contrail/Makefile diff --git a/helm-toolkit/requirements.yaml b/helm-toolkit-contrail/requirements.yaml similarity index 100% rename from helm-toolkit/requirements.yaml rename to helm-toolkit-contrail/requirements.yaml diff --git a/helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_authenticated_endpoint_uri_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_endpoint_port_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_endpoint_port_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_endpoint_port_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_host_and_port_endpoint_uri_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_hostname_fqdn_endpoint_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_hostname_namespaced_endpoint_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_hostname_short_endpoint_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_hostname_short_endpoint_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_hostname_short_endpoint_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_name_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_keystone_endpoint_name_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_name_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_path_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_keystone_endpoint_path_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_path_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_uri_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_keystone_endpoint_uri_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_keystone_endpoint_uri_lookup.tpl diff --git a/helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl b/helm-toolkit-contrail/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl similarity index 100% rename from helm-toolkit/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl rename to helm-toolkit-contrail/templates/endpoints/_service_name_endpoint_with_namespace_lookup.tpl diff --git a/helm-toolkit/templates/scripts/_db-drop.py.tpl b/helm-toolkit-contrail/templates/scripts/_db-drop.py.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_db-drop.py.tpl rename to helm-toolkit-contrail/templates/scripts/_db-drop.py.tpl diff --git a/helm-toolkit/templates/scripts/_db-init.py.tpl b/helm-toolkit-contrail/templates/scripts/_db-init.py.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_db-init.py.tpl rename to helm-toolkit-contrail/templates/scripts/_db-init.py.tpl diff --git a/helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl b/helm-toolkit-contrail/templates/scripts/_ks-domain-user.sh.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_ks-domain-user.sh.tpl rename to helm-toolkit-contrail/templates/scripts/_ks-domain-user.sh.tpl diff --git a/helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl b/helm-toolkit-contrail/templates/scripts/_ks-endpoints.sh.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_ks-endpoints.sh.tpl rename to helm-toolkit-contrail/templates/scripts/_ks-endpoints.sh.tpl diff --git a/helm-toolkit/templates/scripts/_ks-service.sh.tpl b/helm-toolkit-contrail/templates/scripts/_ks-service.sh.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_ks-service.sh.tpl rename to helm-toolkit-contrail/templates/scripts/_ks-service.sh.tpl diff --git a/helm-toolkit/templates/scripts/_ks-user.sh.tpl b/helm-toolkit-contrail/templates/scripts/_ks-user.sh.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_ks-user.sh.tpl rename to helm-toolkit-contrail/templates/scripts/_ks-user.sh.tpl diff --git a/helm-toolkit/templates/scripts/_rally_test.sh.tpl b/helm-toolkit-contrail/templates/scripts/_rally_test.sh.tpl similarity index 100% rename from helm-toolkit/templates/scripts/_rally_test.sh.tpl rename to helm-toolkit-contrail/templates/scripts/_rally_test.sh.tpl diff --git a/helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl b/helm-toolkit-contrail/templates/snippets/_keystone_openrc_env_vars.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_keystone_openrc_env_vars.tpl rename to helm-toolkit-contrail/templates/snippets/_keystone_openrc_env_vars.tpl diff --git a/helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl b/helm-toolkit-contrail/templates/snippets/_keystone_secret_openrc.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_keystone_secret_openrc.tpl rename to helm-toolkit-contrail/templates/snippets/_keystone_secret_openrc.tpl diff --git a/helm-toolkit/templates/snippets/_keystone_user_create_env_vars.tpl b/helm-toolkit-contrail/templates/snippets/_keystone_user_create_env_vars.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_keystone_user_create_env_vars.tpl rename to helm-toolkit-contrail/templates/snippets/_keystone_user_create_env_vars.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_entrypoint_init_container.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_entrypoint_init_container.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_kubectl_params.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_kubectl_params.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_kubectl_params.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_kubectl_params.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_metadata_labels.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_metadata_labels.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_pod_anti_affinity.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_pod_anti_affinity.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_pod_rbac_roles.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_pod_rbac_roles.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_resources.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_resources.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_resources.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_resources.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_upgrades_daemonset.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_upgrades_daemonset.tpl diff --git a/helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl b/helm-toolkit-contrail/templates/snippets/_kubernetes_upgrades_deployment.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl rename to helm-toolkit-contrail/templates/snippets/_kubernetes_upgrades_deployment.tpl diff --git a/helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl b/helm-toolkit-contrail/templates/snippets/_prometheus_pod_annotations.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_prometheus_pod_annotations.tpl rename to helm-toolkit-contrail/templates/snippets/_prometheus_pod_annotations.tpl diff --git a/helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl b/helm-toolkit-contrail/templates/snippets/_prometheus_service_annotations.tpl similarity index 100% rename from helm-toolkit/templates/snippets/_prometheus_service_annotations.tpl rename to helm-toolkit-contrail/templates/snippets/_prometheus_service_annotations.tpl diff --git a/helm-toolkit/templates/utils/_comma_joined_service_list.tpl b/helm-toolkit-contrail/templates/utils/_comma_joined_service_list.tpl similarity index 100% rename from helm-toolkit/templates/utils/_comma_joined_service_list.tpl rename to helm-toolkit-contrail/templates/utils/_comma_joined_service_list.tpl diff --git a/helm-toolkit/templates/utils/_configmap_templater.tpl b/helm-toolkit-contrail/templates/utils/_configmap_templater.tpl similarity index 100% rename from helm-toolkit/templates/utils/_configmap_templater.tpl rename to helm-toolkit-contrail/templates/utils/_configmap_templater.tpl diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit-contrail/templates/utils/_daemonset_overrides.tpl similarity index 100% rename from helm-toolkit/templates/utils/_daemonset_overrides.tpl rename to helm-toolkit-contrail/templates/utils/_daemonset_overrides.tpl diff --git a/helm-toolkit/templates/utils/_hash.tpl b/helm-toolkit-contrail/templates/utils/_hash.tpl similarity index 100% rename from helm-toolkit/templates/utils/_hash.tpl rename to helm-toolkit-contrail/templates/utils/_hash.tpl diff --git a/helm-toolkit/templates/utils/_joinListWithComma.tpl b/helm-toolkit-contrail/templates/utils/_joinListWithComma.tpl similarity index 100% rename from helm-toolkit/templates/utils/_joinListWithComma.tpl rename to helm-toolkit-contrail/templates/utils/_joinListWithComma.tpl diff --git a/helm-toolkit/templates/utils/_joinListWithSpace.tpl b/helm-toolkit-contrail/templates/utils/_joinListWithSpace.tpl similarity index 100% rename from helm-toolkit/templates/utils/_joinListWithSpace.tpl rename to helm-toolkit-contrail/templates/utils/_joinListWithSpace.tpl diff --git a/helm-toolkit/templates/utils/_template.tpl b/helm-toolkit-contrail/templates/utils/_template.tpl similarity index 100% rename from helm-toolkit/templates/utils/_template.tpl rename to helm-toolkit-contrail/templates/utils/_template.tpl diff --git a/helm-toolkit/templates/utils/_to_ini.tpl b/helm-toolkit-contrail/templates/utils/_to_ini.tpl similarity index 100% rename from helm-toolkit/templates/utils/_to_ini.tpl rename to helm-toolkit-contrail/templates/utils/_to_ini.tpl diff --git a/helm-toolkit/templates/utils/_to_k8s_env_vars.tpl b/helm-toolkit-contrail/templates/utils/_to_k8s_env_vars.tpl similarity index 100% rename from helm-toolkit/templates/utils/_to_k8s_env_vars.tpl rename to helm-toolkit-contrail/templates/utils/_to_k8s_env_vars.tpl diff --git a/helm-toolkit/templates/utils/_to_kv_list.tpl b/helm-toolkit-contrail/templates/utils/_to_kv_list.tpl similarity index 100% rename from helm-toolkit/templates/utils/_to_kv_list.tpl rename to helm-toolkit-contrail/templates/utils/_to_kv_list.tpl diff --git a/helm-toolkit/templates/utils/_to_oslo_conf.tpl b/helm-toolkit-contrail/templates/utils/_to_oslo_conf.tpl similarity index 100% rename from helm-toolkit/templates/utils/_to_oslo_conf.tpl rename to helm-toolkit-contrail/templates/utils/_to_oslo_conf.tpl diff --git a/helm-toolkit/values.yaml b/helm-toolkit-contrail/values.yaml similarity index 100% rename from helm-toolkit/values.yaml rename to helm-toolkit-contrail/values.yaml