From ae2db2e9741cbfb1282265d35dabc2e1c83b4805 Mon Sep 17 00:00:00 2001 From: Alessandro De Maria Date: Sun, 1 Sep 2024 12:19:50 +0000 Subject: [PATCH] fix tests --- .pre-commit-config.yaml | 1 + .../compiled/docker/jsonnet/Dockerfile.web | 2 +- .../compiled/docker/jsonnet/Dockerfile.worker | 2 +- .../compiled/docker/kadet/Dockerfile.web | 2 +- .../compiled/docker/kadet/Dockerfile.worker | 2 +- examples/docker/components/kadet/__init__.py | 5 ++- .../charts/nginx-ingress/CHANGELOG.md | 2 +- .../kubernetes/charts/nginx-ingress/README.md | 1 + .../templates/controller-configmap.yaml | 1 + .../templates/controller-hpa.yaml | 1 + .../compiled/busybox/copy/copy_target | 2 +- .../kubernetes/compiled/busybox/copy_target | 2 +- .../compiled/labels/labels/service.yml | 2 +- .../kubernetes/compiled/minikube-es/README.md | 2 +- .../compiled/minikube-es/copy/copy_target | 2 +- .../compiled/minikube-es/copy_target | 2 +- .../compiled/minikube-es/scripts/apply.sh | 2 +- .../compiled/minikube-es/scripts/delete.sh | 2 +- .../compiled/minikube-es/scripts/kubectl.sh | 2 +- .../scripts/minikube/install_minikube.sh | 2 +- .../scripts/minikube/start_minikube.sh | 2 +- .../minikube-es/scripts/setup_cluster.sh | 3 ++ .../minikube-es/scripts/setup_context.sh | 2 +- .../compiled/minikube-mysql/README.md | 2 +- .../compiled/minikube-mysql/scripts/apply.sh | 2 +- .../compiled/minikube-mysql/scripts/delete.sh | 2 +- .../minikube-mysql/scripts/kubectl.sh | 2 +- .../scripts/minikube/install_minikube.sh | 2 +- .../scripts/minikube/start_minikube.sh | 2 +- .../minikube-mysql/scripts/setup_cluster.sh | 3 ++ .../minikube-mysql/scripts/setup_context.sh | 2 +- .../compiled/minikube-nginx-helm/README.md | 2 +- .../minikube-nginx-helm/nginx-deploy.sh | 2 +- .../compiled/minikube-nginx-jsonnet/README.md | 2 +- .../minikube-nginx-jsonnet/nginx-deploy.sh | 2 +- .../compiled/minikube-nginx-kadet/README.md | 2 +- .../minikube-nginx-kadet/nginx-deploy.sh | 2 +- .../nginx-jsonnet/deployment.jsonnet | 2 +- .../components/nginx-jsonnet/service.jsonnet | 2 +- examples/kubernetes/copy_target | 2 +- .../inventory/classes/cluster/minikube.yml | 2 +- .../inventory/classes/component/busybox.yml | 2 +- .../inventory/classes/component/mysql.yml | 10 +++--- .../inventory/classes/component/namespace.yml | 1 + .../classes/component/nginx-common.yml | 2 +- .../classes/component/nginx-helm.yml | 2 +- .../kubernetes/inventory/targets/all-glob.yml | 1 + .../kubernetes/inventory/targets/busybox.yml | 2 +- .../inventory/targets/minikube-nginx-helm.yml | 2 +- .../targets/minikube-nginx-kadet.yml | 1 + .../kubernetes/inventory/targets/removal.yml | 2 +- .../kubernetes/refs/example@kapitan.dev.key | Bin 2547 -> 2546 bytes examples/kubernetes/scripts/apply.sh | 2 +- examples/kubernetes/scripts/delete.sh | 2 +- examples/kubernetes/scripts/kubectl.sh | 2 +- .../scripts/minikube/install_minikube.sh | 2 +- .../scripts/minikube/start_minikube.sh | 2 +- examples/kubernetes/scripts/setup_cluster.sh | 2 +- examples/kubernetes/scripts/setup_context.sh | 2 +- .../compiled/project1/scripts/apply.sh | 2 +- .../compiled/project1/scripts/init.sh | 2 +- .../compiled/project1/scripts/plan.sh | 2 +- .../compiled/project1/scripts/terraform.sh | 2 +- .../project1/scripts/update_output.sh | 2 +- .../compiled/project1/terraform/dns.tf.json | 2 +- .../project1/terraform/output.tf.json | 2 +- .../project1/terraform/provider.tf.json | 2 +- .../compiled/project2/scripts/apply.sh | 2 +- .../compiled/project2/scripts/init.sh | 2 +- .../compiled/project2/scripts/plan.sh | 2 +- .../compiled/project2/scripts/terraform.sh | 2 +- .../project2/scripts/update_output.sh | 2 +- .../project2/terraform/cloudbuild.tf.json | 2 +- .../compiled/project2/terraform/kms.tf.json | 2 +- .../project2/terraform/kubernetes.tf.json | 2 +- .../project2/terraform/logging.tf.json | 2 +- .../project2/terraform/monitoring.tf.json | 2 +- .../project2/terraform/output.tf.json | 2 +- .../project2/terraform/provider.tf.json | 2 +- .../project2/terraform/storage.tf.json | 2 +- .../compiled/project3/scripts/apply.sh | 2 +- .../compiled/project3/scripts/init.sh | 2 +- .../compiled/project3/scripts/plan.sh | 2 +- .../compiled/project3/scripts/terraform.sh | 2 +- .../project3/scripts/update_output.sh | 2 +- .../compiled/project3/terraform/iam.tf.json | 2 +- .../terraform/iam_service_account.tf.json | 2 +- .../project3/terraform/kubernetes.tf.json | 2 +- .../project3/terraform/modules.tf.json | 2 +- .../project3/terraform/output.tf.json | 2 +- .../project3/terraform/provider.tf.json | 2 +- .../project3/terraform/pubsub.tf.json | 2 +- .../terraform/inventory/classes/env/prod.yml | 2 +- .../inventory/classes/env/sandbox.yml | 2 +- .../inventory/classes/provider/gcp.yml | 2 +- .../inventory/targets/sandbox/project3.yml | 2 +- .../terraform/templates/scripts/common.sh | 1 + .../templates/terraform/modules.jsonnet | 2 +- .../docker/jsonnet/Dockerfile.web | 2 +- .../docker/jsonnet/Dockerfile.worker | 2 +- .../docker/kadet/Dockerfile.web | 2 +- .../docker/kadet/Dockerfile.worker | 2 +- tests/test_jsonnet/file1.txt | 2 +- tests/test_jsonnet/file2.txt | 2 +- tests/test_jsonnet/subfolder2/file1.txt | 2 +- .../busybox/copy/copy_target | 2 +- .../busybox/copy_target | 2 +- .../labels/labels/service.yml | 2 +- .../minikube-es/README.md | 2 +- .../minikube-es/copy/copy_target | 2 +- .../minikube-es/copy_target | 2 +- .../minikube-es/scripts/apply.sh | 2 +- .../minikube-es/scripts/delete.sh | 2 +- .../minikube-es/scripts/kubectl.sh | 2 +- .../scripts/minikube/install_minikube.sh | 2 +- .../scripts/minikube/start_minikube.sh | 2 +- .../minikube-es/scripts/setup_cluster.sh | 3 ++ .../minikube-es/scripts/setup_context.sh | 2 +- .../minikube-mysql/README.md | 2 +- .../minikube-mysql/scripts/apply.sh | 2 +- .../minikube-mysql/scripts/delete.sh | 2 +- .../minikube-mysql/scripts/kubectl.sh | 2 +- .../scripts/minikube/install_minikube.sh | 2 +- .../scripts/minikube/start_minikube.sh | 2 +- .../minikube-mysql/scripts/setup_cluster.sh | 3 ++ .../minikube-mysql/scripts/setup_context.sh | 2 +- .../minikube-nginx-helm/README.md | 2 +- .../minikube-nginx-helm/nginx-deploy.sh | 2 +- .../minikube-nginx-jsonnet/README.md | 2 +- .../minikube-nginx-jsonnet/nginx-deploy.sh | 2 +- .../minikube-nginx-kadet/README.md | 2 +- .../minikube-nginx-kadet/nginx-deploy.sh | 2 +- .../acs-engine-autoscaler/templates/NOTES.txt | 2 +- .../templates/_helpers.tpl | 2 +- .../templates/deployment.yaml | 2 +- .../templates/secrets.yaml | 2 +- .../charts/acs-engine-autoscaler/values.yaml | 1 + .../charts/certmanager/templates/NOTES.txt | 2 +- .../certmanager/templates/deployment.yaml | 2 +- .../charts/galley/templates/configmap.yaml | 2 +- .../charts/galley/templates/deployment.yaml | 2 +- .../gateways/templates/preconfigured.yaml | 4 +-- .../gateways/templates/serviceaccount.yaml | 1 + .../charts/istio/charts/gateways/values.yaml | 2 +- .../charts/grafana/templates/service.yaml | 2 +- .../istio/charts/mixer/templates/config.yaml | 6 ++-- .../istio/charts/mixer/templates/service.yaml | 1 + .../nodeagent/templates/clusterrole.yaml | 2 +- .../templates/clusterrolebinding.yaml | 2 +- .../charts/nodeagent/templates/daemonset.yaml | 2 +- .../nodeagent/templates/serviceaccount.yaml | 2 +- .../charts/istio/charts/nodeagent/values.yaml | 2 +- .../charts/pilot/templates/meshexpansion.yaml | 1 + .../prometheus/templates/configmap.yaml | 2 +- .../templates/mutatingwebhook.yaml | 1 + .../templates/poddisruptionbudget.yaml | 2 +- .../charts/sidecarInjectorWebhook/values.yaml | 2 +- .../tracing/templates/service-jaeger.yaml | 1 + .../charts/istio/charts/tracing/values.yaml | 1 + .../values-istio-example-sds-vault.yaml | 2 +- .../example-values/values-istio-googleca.yaml | 2 +- .../istio/files/injection-template.yaml | 2 +- .../charts/istio/templates/NOTES.txt | 2 +- .../charts/istio/templates/configmap.yaml | 30 +++++++++--------- .../charts/istio/values-istio-demo-auth.yaml | 4 +-- .../charts/istio/values-istio-demo.yaml | 4 +-- .../charts/istio/values-istio-minimal.yaml | 4 ++- .../charts/istio/values-istio-sds-auth.yaml | 2 +- tests/test_resources/charts/istio/values.yaml | 8 ++--- .../templates/podsecuritypolicy.yaml | 2 +- .../charts/kube-state-metrics/README.md | 2 +- .../kube-state-metrics/templates/NOTES.txt | 1 + .../charts/prometheus/requirements.yaml | 1 + .../jinja2-input-params/test-1/pod.yml | 2 +- .../jinja2-input-params/test-2/pod.yml | 2 +- .../compiled/nginx/manifests/nginx.conf | 2 +- .../compiled/single-object/list.json | 2 +- .../compiled/single-object/single_object.json | 2 +- .../compiled/test-objects/inner.json | 2 +- .../compiled/test-objects/list.json | 2 +- .../compiled/test-objects/onekey.json | 2 +- .../compiled/test-objects/single_object.json | 2 +- .../string_component_plainref.json | 2 +- .../helm_values_files/prometheus/dev.yml | 2 +- .../helm_values_files/prometheus/prd.yml | 2 +- .../inventory/classes/component/mysql.yml | 4 +-- .../inventory/classes/test-objects.yml | 1 + .../inventory/targets/fail-compile.yml | 3 ++ .../inventory/targets/jinja2-input-params.yml | 2 ++ .../inventory/targets/kadet-test.yml | 2 ++ .../inventory/targets/test-objects.yml | 2 +- .../inventory/targets/toml-output.yml | 3 +- .../add_team_label/__init__.py | 12 +++---- tests/test_resources/script.sh | 2 +- .../templates/single_object.jsonnet | 2 +- .../string_component_plainref.jsonnet | 1 + .../templates/test_deployment.yaml | 2 +- tests/test_resources/test_yaml_load.yaml | 2 +- .../project1/scripts/apply.sh | 2 +- .../project1/scripts/init.sh | 2 +- .../project1/scripts/plan.sh | 2 +- .../project1/scripts/terraform.sh | 2 +- .../project1/scripts/update_output.sh | 2 +- .../project1/terraform/dns.tf.json | 2 +- .../project1/terraform/output.tf.json | 2 +- .../project1/terraform/provider.tf.json | 2 +- .../project2/scripts/apply.sh | 2 +- .../project2/scripts/init.sh | 2 +- .../project2/scripts/plan.sh | 2 +- .../project2/scripts/terraform.sh | 2 +- .../project2/scripts/update_output.sh | 2 +- .../project2/terraform/cloudbuild.tf.json | 2 +- .../project2/terraform/kms.tf.json | 2 +- .../project2/terraform/kubernetes.tf.json | 2 +- .../project2/terraform/logging.tf.json | 2 +- .../project2/terraform/monitoring.tf.json | 2 +- .../project2/terraform/output.tf.json | 2 +- .../project2/terraform/provider.tf.json | 2 +- .../project2/terraform/storage.tf.json | 2 +- .../project3/scripts/apply.sh | 2 +- .../project3/scripts/init.sh | 2 +- .../project3/scripts/plan.sh | 2 +- .../project3/scripts/terraform.sh | 2 +- .../project3/scripts/update_output.sh | 2 +- .../project3/terraform/iam.tf.json | 2 +- .../terraform/iam_service_account.tf.json | 2 +- .../project3/terraform/kubernetes.tf.json | 2 +- .../project3/terraform/modules.tf.json | 2 +- .../project3/terraform/output.tf.json | 2 +- .../project3/terraform/provider.tf.json | 2 +- .../project3/terraform/pubsub.tf.json | 2 +- 231 files changed, 277 insertions(+), 239 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 15e6d5752..a99ef32e7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,3 +1,4 @@ +exclude: ^(examples/|tests/test_terraform_compiled/|tests/test_kubernetes_compiled/|tests/test_docker_compiled/|tests/test_resources/|tests/test_jsonnet/) repos: - repo: https://github.com/psf/black rev: 24.8.0 diff --git a/examples/docker/compiled/docker/jsonnet/Dockerfile.web b/examples/docker/compiled/docker/jsonnet/Dockerfile.web index 602711d8f..ab581db82 100644 --- a/examples/docker/compiled/docker/jsonnet/Dockerfile.web +++ b/examples/docker/compiled/docker/jsonnet/Dockerfile.web @@ -1,4 +1,4 @@ FROM amazoncorretto:11 COPY target/blah.jar /app/blah.jar EXPOSE ${PORT} -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/examples/docker/compiled/docker/jsonnet/Dockerfile.worker b/examples/docker/compiled/docker/jsonnet/Dockerfile.worker index 96f1181c7..650c068b7 100644 --- a/examples/docker/compiled/docker/jsonnet/Dockerfile.worker +++ b/examples/docker/compiled/docker/jsonnet/Dockerfile.worker @@ -1,3 +1,3 @@ FROM amazoncorretto:8 COPY target/blah.jar /app/blah.jar -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/examples/docker/compiled/docker/kadet/Dockerfile.web b/examples/docker/compiled/docker/kadet/Dockerfile.web index 602711d8f..ab581db82 100644 --- a/examples/docker/compiled/docker/kadet/Dockerfile.web +++ b/examples/docker/compiled/docker/kadet/Dockerfile.web @@ -1,4 +1,4 @@ FROM amazoncorretto:11 COPY target/blah.jar /app/blah.jar EXPOSE ${PORT} -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/examples/docker/compiled/docker/kadet/Dockerfile.worker b/examples/docker/compiled/docker/kadet/Dockerfile.worker index 96f1181c7..650c068b7 100644 --- a/examples/docker/compiled/docker/kadet/Dockerfile.worker +++ b/examples/docker/compiled/docker/kadet/Dockerfile.worker @@ -1,3 +1,3 @@ FROM amazoncorretto:8 COPY target/blah.jar /app/blah.jar -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/examples/docker/components/kadet/__init__.py b/examples/docker/components/kadet/__init__.py index 34f039270..e5e61b065 100644 --- a/examples/docker/components/kadet/__init__.py +++ b/examples/docker/components/kadet/__init__.py @@ -1,8 +1,7 @@ -import json import os - -from kapitan.inputs import kadet +import json from kapitan.resources import jinja2_render_file +from kapitan.inputs import kadet inventory = kadet.inventory() diff --git a/examples/kubernetes/charts/nginx-ingress/CHANGELOG.md b/examples/kubernetes/charts/nginx-ingress/CHANGELOG.md index ea66133b3..1b7adb25b 100644 --- a/examples/kubernetes/charts/nginx-ingress/CHANGELOG.md +++ b/examples/kubernetes/charts/nginx-ingress/CHANGELOG.md @@ -9,7 +9,7 @@ This file documents all notable changes to [ingress-nginx](https://github.com/ku * #7652 - Updated Helm chart to use the fullname for the electionID if not specified. by @FutureMatt in https://github.com/kubernetes/ingress-nginx/pull/9133 * Rename controller-wehbooks-networkpolicy.yaml. by @Gacko in https://github.com/kubernetes/ingress-nginx/pull/9123 -### 4.3.0 +### 4.3.0 - Support for Kubernetes v.1.25.0 was added and support for endpoint slices - Support for Kubernetes v1.20.0 and v1.21.0 was removed - [8890](https://github.com/kubernetes/ingress-nginx/pull/8890) migrate to endpointslices diff --git a/examples/kubernetes/charts/nginx-ingress/README.md b/examples/kubernetes/charts/nginx-ingress/README.md index 8d4c6b775..bf4dcc8cd 100644 --- a/examples/kubernetes/charts/nginx-ingress/README.md +++ b/examples/kubernetes/charts/nginx-ingress/README.md @@ -494,3 +494,4 @@ Kubernetes: `>=1.20.0-0` | serviceAccount.name | string | `""` | | | tcp | object | `{}` | TCP service key-value pairs # Ref: https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/exposing-tcp-udp-services.md # | | udp | object | `{}` | UDP service key-value pairs # Ref: https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/exposing-tcp-udp-services.md # | + diff --git a/examples/kubernetes/charts/nginx-ingress/templates/controller-configmap.yaml b/examples/kubernetes/charts/nginx-ingress/templates/controller-configmap.yaml index 38ec021e0..f28b26e1e 100644 --- a/examples/kubernetes/charts/nginx-ingress/templates/controller-configmap.yaml +++ b/examples/kubernetes/charts/nginx-ingress/templates/controller-configmap.yaml @@ -26,3 +26,4 @@ data: {{- range $key, $value := .Values.controller.config }} {{- $key | nindent 2 }}: {{ $value | quote }} {{- end }} + diff --git a/examples/kubernetes/charts/nginx-ingress/templates/controller-hpa.yaml b/examples/kubernetes/charts/nginx-ingress/templates/controller-hpa.yaml index f2cd3eb62..e0979f14b 100644 --- a/examples/kubernetes/charts/nginx-ingress/templates/controller-hpa.yaml +++ b/examples/kubernetes/charts/nginx-ingress/templates/controller-hpa.yaml @@ -49,3 +49,4 @@ spec: {{- end }} {{- end }} {{- end }} + diff --git a/examples/kubernetes/compiled/busybox/copy/copy_target b/examples/kubernetes/compiled/busybox/copy/copy_target index 5459c212f..9301ae519 100644 --- a/examples/kubernetes/compiled/busybox/copy/copy_target +++ b/examples/kubernetes/compiled/busybox/copy/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/examples/kubernetes/compiled/busybox/copy_target b/examples/kubernetes/compiled/busybox/copy_target index 5459c212f..9301ae519 100644 --- a/examples/kubernetes/compiled/busybox/copy_target +++ b/examples/kubernetes/compiled/busybox/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/examples/kubernetes/compiled/labels/labels/service.yml b/examples/kubernetes/compiled/labels/labels/service.yml index d6cc7b39c..758c8df30 100644 --- a/examples/kubernetes/compiled/labels/labels/service.yml +++ b/examples/kubernetes/compiled/labels/labels/service.yml @@ -11,4 +11,4 @@ spec: ports: - port: 5432 targetPort: 5432 - name: postgres + name: postgres \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/README.md b/examples/kubernetes/compiled/minikube-es/README.md index f64219a3c..f74aa827c 100644 --- a/examples/kubernetes/compiled/minikube-es/README.md +++ b/examples/kubernetes/compiled/minikube-es/README.md @@ -61,4 +61,4 @@ Deleting is easy (warning, this will remove _everything_): ``` $ scripts/kubectl.sh delete -f manifests/ -``` +``` \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/copy/copy_target b/examples/kubernetes/compiled/minikube-es/copy/copy_target index 5459c212f..9301ae519 100644 --- a/examples/kubernetes/compiled/minikube-es/copy/copy_target +++ b/examples/kubernetes/compiled/minikube-es/copy/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/copy_target b/examples/kubernetes/compiled/minikube-es/copy_target index 5459c212f..9301ae519 100644 --- a/examples/kubernetes/compiled/minikube-es/copy_target +++ b/examples/kubernetes/compiled/minikube-es/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/apply.sh b/examples/kubernetes/compiled/minikube-es/scripts/apply.sh index 0b97cd208..3cf5eedc4 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/apply.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/apply.sh @@ -11,4 +11,4 @@ for SECTION in pre-deploy manifests do echo "## run kubectl apply for ${SECTION}" kapitan refs --reveal -f ${DIR}/../${SECTION}/ | ${DIR}/kubectl.sh apply -f - | column -t -done +done \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/delete.sh b/examples/kubernetes/compiled/minikube-es/scripts/delete.sh index 094586f3f..b6e7e808d 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/delete.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/delete.sh @@ -7,4 +7,4 @@ DIR=$(dirname ${BASH_SOURCE[0]}) -${DIR}/kubectl.sh delete -f ${DIR}/../manifests +${DIR}/kubectl.sh delete -f ${DIR}/../manifests \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/kubectl.sh b/examples/kubernetes/compiled/minikube-es/scripts/kubectl.sh index cefb7d38f..26acd1c4e 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/kubectl.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/kubectl.sh @@ -7,4 +7,4 @@ KUBECTL="kubectl --context minikube-es --insecure-skip-tls-verify=False " -${KUBECTL} $@ +${KUBECTL} $@ \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/minikube/install_minikube.sh b/examples/kubernetes/compiled/minikube-es/scripts/minikube/install_minikube.sh index 165daacdb..dcf035f3b 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/minikube/install_minikube.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/minikube/install_minikube.sh @@ -18,4 +18,4 @@ URL=https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/${MINIK echo Downloading minikube release ${MINIKUBE_VERSION} to /usr/local/bin/minikube pause sudo curl --progress-bar -o /usr/local/bin/minikube ${URL} -sudo chmod +x /usr/local/bin/minikube +sudo chmod +x /usr/local/bin/minikube \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/minikube/start_minikube.sh b/examples/kubernetes/compiled/minikube-es/scripts/minikube/start_minikube.sh index 97c12245c..1ed875d6c 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/minikube/start_minikube.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/minikube/start_minikube.sh @@ -7,4 +7,4 @@ eval $(minikube docker-env) minikube start --insecure-registry https://quay.io --memory=4096 --cpus=4 -minikube ssh "sudo ip link set docker0 promisc on" +minikube ssh "sudo ip link set docker0 promisc on" \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-es/scripts/setup_cluster.sh b/examples/kubernetes/compiled/minikube-es/scripts/setup_cluster.sh index b5bc6904d..7c7a34d55 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/setup_cluster.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/setup_cluster.sh @@ -4,3 +4,6 @@ # SPDX-FileCopyrightText: 2020 The Kapitan Authors # # SPDX-License-Identifier: Apache-2.0 + + + diff --git a/examples/kubernetes/compiled/minikube-es/scripts/setup_context.sh b/examples/kubernetes/compiled/minikube-es/scripts/setup_context.sh index c61a0a304..19307a214 100755 --- a/examples/kubernetes/compiled/minikube-es/scripts/setup_context.sh +++ b/examples/kubernetes/compiled/minikube-es/scripts/setup_context.sh @@ -6,4 +6,4 @@ # SPDX-License-Identifier: Apache-2.0 kubectl config set-context minikube-es --cluster minikube --user minikube --namespace minikube-es -kubectl config use-context minikube-es +kubectl config use-context minikube-es \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/README.md b/examples/kubernetes/compiled/minikube-mysql/README.md index e80439949..18212b6b3 100644 --- a/examples/kubernetes/compiled/minikube-mysql/README.md +++ b/examples/kubernetes/compiled/minikube-mysql/README.md @@ -61,4 +61,4 @@ Deleting is easy (warning, this will remove _everything_): ``` $ scripts/kubectl.sh delete -f manifests/ -``` +``` \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/apply.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/apply.sh index 0b97cd208..3cf5eedc4 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/apply.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/apply.sh @@ -11,4 +11,4 @@ for SECTION in pre-deploy manifests do echo "## run kubectl apply for ${SECTION}" kapitan refs --reveal -f ${DIR}/../${SECTION}/ | ${DIR}/kubectl.sh apply -f - | column -t -done +done \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/delete.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/delete.sh index 094586f3f..b6e7e808d 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/delete.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/delete.sh @@ -7,4 +7,4 @@ DIR=$(dirname ${BASH_SOURCE[0]}) -${DIR}/kubectl.sh delete -f ${DIR}/../manifests +${DIR}/kubectl.sh delete -f ${DIR}/../manifests \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/kubectl.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/kubectl.sh index 437a20fad..04d2b6db6 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/kubectl.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/kubectl.sh @@ -7,4 +7,4 @@ KUBECTL="kubectl --context minikube-mysql --insecure-skip-tls-verify=False " -${KUBECTL} $@ +${KUBECTL} $@ \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/install_minikube.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/install_minikube.sh index 165daacdb..dcf035f3b 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/install_minikube.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/install_minikube.sh @@ -18,4 +18,4 @@ URL=https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/${MINIK echo Downloading minikube release ${MINIKUBE_VERSION} to /usr/local/bin/minikube pause sudo curl --progress-bar -o /usr/local/bin/minikube ${URL} -sudo chmod +x /usr/local/bin/minikube +sudo chmod +x /usr/local/bin/minikube \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/start_minikube.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/start_minikube.sh index 97c12245c..1ed875d6c 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/start_minikube.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/minikube/start_minikube.sh @@ -7,4 +7,4 @@ eval $(minikube docker-env) minikube start --insecure-registry https://quay.io --memory=4096 --cpus=4 -minikube ssh "sudo ip link set docker0 promisc on" +minikube ssh "sudo ip link set docker0 promisc on" \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/setup_cluster.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/setup_cluster.sh index b5bc6904d..7c7a34d55 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/setup_cluster.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/setup_cluster.sh @@ -4,3 +4,6 @@ # SPDX-FileCopyrightText: 2020 The Kapitan Authors # # SPDX-License-Identifier: Apache-2.0 + + + diff --git a/examples/kubernetes/compiled/minikube-mysql/scripts/setup_context.sh b/examples/kubernetes/compiled/minikube-mysql/scripts/setup_context.sh index a374660d6..ed53eadd7 100755 --- a/examples/kubernetes/compiled/minikube-mysql/scripts/setup_context.sh +++ b/examples/kubernetes/compiled/minikube-mysql/scripts/setup_context.sh @@ -6,4 +6,4 @@ # SPDX-License-Identifier: Apache-2.0 kubectl config set-context minikube-mysql --cluster minikube --user minikube --namespace minikube-mysql -kubectl config use-context minikube-mysql +kubectl config use-context minikube-mysql \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-helm/README.md b/examples/kubernetes/compiled/minikube-nginx-helm/README.md index 29193af52..8eae91228 100644 --- a/examples/kubernetes/compiled/minikube-nginx-helm/README.md +++ b/examples/kubernetes/compiled/minikube-nginx-helm/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-helm* is running: * 2 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-helm/nginx-deploy.sh b/examples/kubernetes/compiled/minikube-nginx-helm/nginx-deploy.sh index ee871d50a..4d2d8fa90 100644 --- a/examples/kubernetes/compiled/minikube-nginx-helm/nginx-deploy.sh +++ b/examples/kubernetes/compiled/minikube-nginx-helm/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-jsonnet/README.md b/examples/kubernetes/compiled/minikube-nginx-jsonnet/README.md index 17cfc3914..5e6afb2c3 100644 --- a/examples/kubernetes/compiled/minikube-nginx-jsonnet/README.md +++ b/examples/kubernetes/compiled/minikube-nginx-jsonnet/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-jsonnet* is running: * 1 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-jsonnet/nginx-deploy.sh b/examples/kubernetes/compiled/minikube-nginx-jsonnet/nginx-deploy.sh index a3e53340f..13ae55643 100644 --- a/examples/kubernetes/compiled/minikube-nginx-jsonnet/nginx-deploy.sh +++ b/examples/kubernetes/compiled/minikube-nginx-jsonnet/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-kadet/README.md b/examples/kubernetes/compiled/minikube-nginx-kadet/README.md index a3563aa12..6dcd055e7 100644 --- a/examples/kubernetes/compiled/minikube-nginx-kadet/README.md +++ b/examples/kubernetes/compiled/minikube-nginx-kadet/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-kadet* is running: * 2 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/examples/kubernetes/compiled/minikube-nginx-kadet/nginx-deploy.sh b/examples/kubernetes/compiled/minikube-nginx-kadet/nginx-deploy.sh index 5e0b57044..509063a82 100644 --- a/examples/kubernetes/compiled/minikube-nginx-kadet/nginx-deploy.sh +++ b/examples/kubernetes/compiled/minikube-nginx-kadet/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/examples/kubernetes/components/nginx-jsonnet/deployment.jsonnet b/examples/kubernetes/components/nginx-jsonnet/deployment.jsonnet index 1996d73fb..b81483dfc 100644 --- a/examples/kubernetes/components/nginx-jsonnet/deployment.jsonnet +++ b/examples/kubernetes/components/nginx-jsonnet/deployment.jsonnet @@ -24,4 +24,4 @@ local deployment = kube.Deployment("nginx") { { nginx_deployment: deployment -} +} \ No newline at end of file diff --git a/examples/kubernetes/components/nginx-jsonnet/service.jsonnet b/examples/kubernetes/components/nginx-jsonnet/service.jsonnet index e58e400ab..4068b697f 100644 --- a/examples/kubernetes/components/nginx-jsonnet/service.jsonnet +++ b/examples/kubernetes/components/nginx-jsonnet/service.jsonnet @@ -10,4 +10,4 @@ local svc = kube.Service("nginx") { { nginx_svc: svc -} +} \ No newline at end of file diff --git a/examples/kubernetes/copy_target b/examples/kubernetes/copy_target index 5459c212f..9301ae519 100644 --- a/examples/kubernetes/copy_target +++ b/examples/kubernetes/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/examples/kubernetes/inventory/classes/cluster/minikube.yml b/examples/kubernetes/inventory/classes/cluster/minikube.yml index 772bbc965..b605be584 100644 --- a/examples/kubernetes/inventory/classes/cluster/minikube.yml +++ b/examples/kubernetes/inventory/classes/cluster/minikube.yml @@ -7,7 +7,7 @@ parameters: minikube: memory: 4096 cpus: 4 - version: v0.31.0 + version: v0.31.0 cluster: type: minikube diff --git a/examples/kubernetes/inventory/classes/component/busybox.yml b/examples/kubernetes/inventory/classes/component/busybox.yml index d4a6292b1..a465112f8 100644 --- a/examples/kubernetes/inventory/classes/component/busybox.yml +++ b/examples/kubernetes/inventory/classes/component/busybox.yml @@ -17,4 +17,4 @@ parameters: - input_type: copy input_paths: - copy_target - output_path: . + output_path: . \ No newline at end of file diff --git a/examples/kubernetes/inventory/classes/component/mysql.yml b/examples/kubernetes/inventory/classes/component/mysql.yml index c8320d037..100cf9737 100644 --- a/examples/kubernetes/inventory/classes/component/mysql.yml +++ b/examples/kubernetes/inventory/classes/component/mysql.yml @@ -16,12 +16,12 @@ parameters: input_type: jinja2 input_paths: - docs/mysql/README.md - validate: - - type: kubernetes # mkdocs (1)! - output_paths: # mkdocs (2)! + validate: + - type: kubernetes # mkdocs (1)! + output_paths: # mkdocs (2)! - manifests/mysql_secret.yml - kind: secret # temporarily replaced with 'deployment' during test # mkdocs (3)! - version: 1.14.0 # optional, defaults to 1.14.0 # mkdocs (4)! + kind: secret # temporarily replaced with 'deployment' during test # mkdocs (3)! + version: 1.14.0 # optional, defaults to 1.14.0 # mkdocs (4)! - type: kubernetes output_paths: - manifests/mysql_service_jsonnet.yml diff --git a/examples/kubernetes/inventory/classes/component/namespace.yml b/examples/kubernetes/inventory/classes/component/namespace.yml index 2d07b9089..7cc36a17a 100644 --- a/examples/kubernetes/inventory/classes/component/namespace.yml +++ b/examples/kubernetes/inventory/classes/component/namespace.yml @@ -7,3 +7,4 @@ parameters: output_type: yml input_paths: - components/namespace/main.jsonnet + diff --git a/examples/kubernetes/inventory/classes/component/nginx-common.yml b/examples/kubernetes/inventory/classes/component/nginx-common.yml index 05c03028b..dd124fe6f 100644 --- a/examples/kubernetes/inventory/classes/component/nginx-common.yml +++ b/examples/kubernetes/inventory/classes/component/nginx-common.yml @@ -10,4 +10,4 @@ parameters: compile: - output_path: . #(2)! input_type: jinja2 - input_paths: ${templates} #(3)! + input_paths: ${templates} #(3)! \ No newline at end of file diff --git a/examples/kubernetes/inventory/classes/component/nginx-helm.yml b/examples/kubernetes/inventory/classes/component/nginx-helm.yml index b985dfd04..a597be84c 100644 --- a/examples/kubernetes/inventory/classes/component/nginx-helm.yml +++ b/examples/kubernetes/inventory/classes/component/nginx-helm.yml @@ -21,4 +21,4 @@ parameters: name: ${nginx:name} helm_params: name: ${nginx:name} - namespace: ${nginx:namespace} + namespace: ${nginx:namespace} \ No newline at end of file diff --git a/examples/kubernetes/inventory/targets/all-glob.yml b/examples/kubernetes/inventory/targets/all-glob.yml index 1af75b9d0..da2a9050f 100644 --- a/examples/kubernetes/inventory/targets/all-glob.yml +++ b/examples/kubernetes/inventory/targets/all-glob.yml @@ -59,3 +59,4 @@ parameters: input_paths: - components/*/main.jsonnet output_type: yml + diff --git a/examples/kubernetes/inventory/targets/busybox.yml b/examples/kubernetes/inventory/targets/busybox.yml index 09a16763e..5eb475ccd 100644 --- a/examples/kubernetes/inventory/targets/busybox.yml +++ b/examples/kubernetes/inventory/targets/busybox.yml @@ -1,4 +1,4 @@ -classes: +classes: - common - component.namespace - component.busybox diff --git a/examples/kubernetes/inventory/targets/minikube-nginx-helm.yml b/examples/kubernetes/inventory/targets/minikube-nginx-helm.yml index 88052cab8..ecea10c18 100644 --- a/examples/kubernetes/inventory/targets/minikube-nginx-helm.yml +++ b/examples/kubernetes/inventory/targets/minikube-nginx-helm.yml @@ -7,4 +7,4 @@ classes: parameters: # These parameters are redundand because automatically set by `common` ## target_name: minikube-nginx-helm -## namespace: ${target_name} +## namespace: ${target_name} \ No newline at end of file diff --git a/examples/kubernetes/inventory/targets/minikube-nginx-kadet.yml b/examples/kubernetes/inventory/targets/minikube-nginx-kadet.yml index 251da1f81..5ceaecb4c 100644 --- a/examples/kubernetes/inventory/targets/minikube-nginx-kadet.yml +++ b/examples/kubernetes/inventory/targets/minikube-nginx-kadet.yml @@ -9,3 +9,4 @@ parameters: # These parameters are redundand because automatically set by `common` ## target_name: minikube-nginx-kadet ## namespace: ${target_name} + diff --git a/examples/kubernetes/inventory/targets/removal.yml b/examples/kubernetes/inventory/targets/removal.yml index d5557a3c1..6f4d41694 100644 --- a/examples/kubernetes/inventory/targets/removal.yml +++ b/examples/kubernetes/inventory/targets/removal.yml @@ -12,4 +12,4 @@ parameters: - input_type: remove input_paths: - compiled/${kapitan:vars:target}/copy_target - output_path: . + output_path: . \ No newline at end of file diff --git a/examples/kubernetes/refs/example@kapitan.dev.key b/examples/kubernetes/refs/example@kapitan.dev.key index 723516c3cf3cfe9185a7129f0089ec32f12ce57f..2f16bfd3dbe1368b32e35c17046c024c7cf4217a 100644 GIT binary patch delta 7 Ocmew?{7HDjCr$tmAp^Gn delta 9 Qcmew){8@OzCr(B#02i49!T "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/examples/terraform/compiled/project1/terraform/dns.tf.json b/examples/terraform/compiled/project1/terraform/dns.tf.json index 25a272179..7026faf51 100644 --- a/examples/terraform/compiled/project1/terraform/dns.tf.json +++ b/examples/terraform/compiled/project1/terraform/dns.tf.json @@ -43,4 +43,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project1/terraform/output.tf.json b/examples/terraform/compiled/project1/terraform/output.tf.json index ca9340bb8..2f651d097 100644 --- a/examples/terraform/compiled/project1/terraform/output.tf.json +++ b/examples/terraform/compiled/project1/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project1/terraform/provider.tf.json b/examples/terraform/compiled/project1/terraform/provider.tf.json index f94789c80..d94b885ed 100644 --- a/examples/terraform/compiled/project1/terraform/provider.tf.json +++ b/examples/terraform/compiled/project1/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/scripts/apply.sh b/examples/terraform/compiled/project2/scripts/apply.sh index 8e874d7b5..fd7da83f4 100755 --- a/examples/terraform/compiled/project2/scripts/apply.sh +++ b/examples/terraform/compiled/project2/scripts/apply.sh @@ -13,4 +13,4 @@ source "${DIR}"/common.sh check_tf_initialized "${TERRAFORM}" apply "$@" -"${DIR}"/update_output.sh +"${DIR}"/update_output.sh \ No newline at end of file diff --git a/examples/terraform/compiled/project2/scripts/init.sh b/examples/terraform/compiled/project2/scripts/init.sh index 6c351eb46..cfcb340f3 100755 --- a/examples/terraform/compiled/project2/scripts/init.sh +++ b/examples/terraform/compiled/project2/scripts/init.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$TF_DATA_DIR" -"${TERRAFORM}" init "$@" +"${TERRAFORM}" init "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project2/scripts/plan.sh b/examples/terraform/compiled/project2/scripts/plan.sh index 1e4b8ea3d..5721326aa 100755 --- a/examples/terraform/compiled/project2/scripts/plan.sh +++ b/examples/terraform/compiled/project2/scripts/plan.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN check_tf_initialized -"${TERRAFORM}" plan -lock=false "$@" +"${TERRAFORM}" plan -lock=false "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project2/scripts/terraform.sh b/examples/terraform/compiled/project2/scripts/terraform.sh index 41c88a32a..ee7ae8375 100755 --- a/examples/terraform/compiled/project2/scripts/terraform.sh +++ b/examples/terraform/compiled/project2/scripts/terraform.sh @@ -10,4 +10,4 @@ source "${DIR}"/common.sh ######################################################################################## # MAIN -"${TERRAFORM}" "$@" +"${TERRAFORM}" "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project2/scripts/update_output.sh b/examples/terraform/compiled/project2/scripts/update_output.sh index d57e76b7e..e6f616d4e 100755 --- a/examples/terraform/compiled/project2/scripts/update_output.sh +++ b/examples/terraform/compiled/project2/scripts/update_output.sh @@ -12,4 +12,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$OUTPUT_DIR" -"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/cloudbuild.tf.json b/examples/terraform/compiled/project2/terraform/cloudbuild.tf.json index 7dd50f334..fe170acd0 100644 --- a/examples/terraform/compiled/project2/terraform/cloudbuild.tf.json +++ b/examples/terraform/compiled/project2/terraform/cloudbuild.tf.json @@ -23,4 +23,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/kms.tf.json b/examples/terraform/compiled/project2/terraform/kms.tf.json index 854a43e30..8406baa24 100644 --- a/examples/terraform/compiled/project2/terraform/kms.tf.json +++ b/examples/terraform/compiled/project2/terraform/kms.tf.json @@ -29,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/kubernetes.tf.json b/examples/terraform/compiled/project2/terraform/kubernetes.tf.json index 6609103ea..f3a979e66 100644 --- a/examples/terraform/compiled/project2/terraform/kubernetes.tf.json +++ b/examples/terraform/compiled/project2/terraform/kubernetes.tf.json @@ -77,4 +77,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/logging.tf.json b/examples/terraform/compiled/project2/terraform/logging.tf.json index 229690b67..fe05ea6e3 100644 --- a/examples/terraform/compiled/project2/terraform/logging.tf.json +++ b/examples/terraform/compiled/project2/terraform/logging.tf.json @@ -12,4 +12,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/monitoring.tf.json b/examples/terraform/compiled/project2/terraform/monitoring.tf.json index 69c5789be..1bc8a7d8c 100644 --- a/examples/terraform/compiled/project2/terraform/monitoring.tf.json +++ b/examples/terraform/compiled/project2/terraform/monitoring.tf.json @@ -58,4 +58,4 @@ "type": "string" } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/output.tf.json b/examples/terraform/compiled/project2/terraform/output.tf.json index 6f24bd103..06b76a8ab 100644 --- a/examples/terraform/compiled/project2/terraform/output.tf.json +++ b/examples/terraform/compiled/project2/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/provider.tf.json b/examples/terraform/compiled/project2/terraform/provider.tf.json index 09890abc6..6548ec164 100644 --- a/examples/terraform/compiled/project2/terraform/provider.tf.json +++ b/examples/terraform/compiled/project2/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project2/terraform/storage.tf.json b/examples/terraform/compiled/project2/terraform/storage.tf.json index f1eb90e94..23c00eff6 100644 --- a/examples/terraform/compiled/project2/terraform/storage.tf.json +++ b/examples/terraform/compiled/project2/terraform/storage.tf.json @@ -49,4 +49,4 @@ }, "google_storage_bucket_iam_policy": {} } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/scripts/apply.sh b/examples/terraform/compiled/project3/scripts/apply.sh index 8e874d7b5..fd7da83f4 100755 --- a/examples/terraform/compiled/project3/scripts/apply.sh +++ b/examples/terraform/compiled/project3/scripts/apply.sh @@ -13,4 +13,4 @@ source "${DIR}"/common.sh check_tf_initialized "${TERRAFORM}" apply "$@" -"${DIR}"/update_output.sh +"${DIR}"/update_output.sh \ No newline at end of file diff --git a/examples/terraform/compiled/project3/scripts/init.sh b/examples/terraform/compiled/project3/scripts/init.sh index 6c351eb46..cfcb340f3 100755 --- a/examples/terraform/compiled/project3/scripts/init.sh +++ b/examples/terraform/compiled/project3/scripts/init.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$TF_DATA_DIR" -"${TERRAFORM}" init "$@" +"${TERRAFORM}" init "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project3/scripts/plan.sh b/examples/terraform/compiled/project3/scripts/plan.sh index 1e4b8ea3d..5721326aa 100755 --- a/examples/terraform/compiled/project3/scripts/plan.sh +++ b/examples/terraform/compiled/project3/scripts/plan.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN check_tf_initialized -"${TERRAFORM}" plan -lock=false "$@" +"${TERRAFORM}" plan -lock=false "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project3/scripts/terraform.sh b/examples/terraform/compiled/project3/scripts/terraform.sh index 41c88a32a..ee7ae8375 100755 --- a/examples/terraform/compiled/project3/scripts/terraform.sh +++ b/examples/terraform/compiled/project3/scripts/terraform.sh @@ -10,4 +10,4 @@ source "${DIR}"/common.sh ######################################################################################## # MAIN -"${TERRAFORM}" "$@" +"${TERRAFORM}" "$@" \ No newline at end of file diff --git a/examples/terraform/compiled/project3/scripts/update_output.sh b/examples/terraform/compiled/project3/scripts/update_output.sh index d57e76b7e..e6f616d4e 100755 --- a/examples/terraform/compiled/project3/scripts/update_output.sh +++ b/examples/terraform/compiled/project3/scripts/update_output.sh @@ -12,4 +12,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$OUTPUT_DIR" -"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/iam.tf.json b/examples/terraform/compiled/project3/terraform/iam.tf.json index 472491e3b..4ec1afb98 100644 --- a/examples/terraform/compiled/project3/terraform/iam.tf.json +++ b/examples/terraform/compiled/project3/terraform/iam.tf.json @@ -13,4 +13,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/iam_service_account.tf.json b/examples/terraform/compiled/project3/terraform/iam_service_account.tf.json index 3ee0f275a..9ec6ca9c4 100644 --- a/examples/terraform/compiled/project3/terraform/iam_service_account.tf.json +++ b/examples/terraform/compiled/project3/terraform/iam_service_account.tf.json @@ -79,4 +79,4 @@ }, "google_service_account_iam_binding": {} } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/kubernetes.tf.json b/examples/terraform/compiled/project3/terraform/kubernetes.tf.json index e0be92995..a77f14067 100644 --- a/examples/terraform/compiled/project3/terraform/kubernetes.tf.json +++ b/examples/terraform/compiled/project3/terraform/kubernetes.tf.json @@ -64,4 +64,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/modules.tf.json b/examples/terraform/compiled/project3/terraform/modules.tf.json index 38f4f0123..8df0311a5 100644 --- a/examples/terraform/compiled/project3/terraform/modules.tf.json +++ b/examples/terraform/compiled/project3/terraform/modules.tf.json @@ -28,4 +28,4 @@ "version": "~> 0.1" } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/output.tf.json b/examples/terraform/compiled/project3/terraform/output.tf.json index ba834f292..750298f0e 100644 --- a/examples/terraform/compiled/project3/terraform/output.tf.json +++ b/examples/terraform/compiled/project3/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/provider.tf.json b/examples/terraform/compiled/project3/terraform/provider.tf.json index dfd61e1a5..6206ebc63 100644 --- a/examples/terraform/compiled/project3/terraform/provider.tf.json +++ b/examples/terraform/compiled/project3/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/examples/terraform/compiled/project3/terraform/pubsub.tf.json b/examples/terraform/compiled/project3/terraform/pubsub.tf.json index 6e5e6f86c..e454d350f 100644 --- a/examples/terraform/compiled/project3/terraform/pubsub.tf.json +++ b/examples/terraform/compiled/project3/terraform/pubsub.tf.json @@ -22,4 +22,4 @@ } } } -} +} \ No newline at end of file diff --git a/examples/terraform/inventory/classes/env/prod.yml b/examples/terraform/inventory/classes/env/prod.yml index 09fccbbc4..22ea53468 100644 --- a/examples/terraform/inventory/classes/env/prod.yml +++ b/examples/terraform/inventory/classes/env/prod.yml @@ -46,4 +46,4 @@ parameters: notification_channels: - ${resources:monitoring:alerting_method} documentation: - content: "Alert whenever an instance's uptime falls under 900ms/s" + content: "Alert whenever an instance's uptime falls under 900ms/s" \ No newline at end of file diff --git a/examples/terraform/inventory/classes/env/sandbox.yml b/examples/terraform/inventory/classes/env/sandbox.yml index 574db447f..789a34571 100644 --- a/examples/terraform/inventory/classes/env/sandbox.yml +++ b/examples/terraform/inventory/classes/env/sandbox.yml @@ -4,4 +4,4 @@ classes: # Class automatically applied to all targets inside folder inventory/target/sandbox parameters: - env: sandbox + env: sandbox \ No newline at end of file diff --git a/examples/terraform/inventory/classes/provider/gcp.yml b/examples/terraform/inventory/classes/provider/gcp.yml index e3782ade9..42773223c 100644 --- a/examples/terraform/inventory/classes/provider/gcp.yml +++ b/examples/terraform/inventory/classes/provider/gcp.yml @@ -28,4 +28,4 @@ parameters: kapitan: labels: - env: ${env} + env: ${env} \ No newline at end of file diff --git a/examples/terraform/inventory/targets/sandbox/project3.yml b/examples/terraform/inventory/targets/sandbox/project3.yml index 855063a62..9fa23e616 100644 --- a/examples/terraform/inventory/targets/sandbox/project3.yml +++ b/examples/terraform/inventory/targets/sandbox/project3.yml @@ -84,4 +84,4 @@ parameters: subnet_region: "${region}" - subnet_name: "subnet-02" subnet_ip: "10.10.20.0/24" - subnet_region: "${region}" + subnet_region: "${region}" \ No newline at end of file diff --git a/examples/terraform/templates/scripts/common.sh b/examples/terraform/templates/scripts/common.sh index b0e555ac4..6c671c241 100755 --- a/examples/terraform/templates/scripts/common.sh +++ b/examples/terraform/templates/scripts/common.sh @@ -44,3 +44,4 @@ if [ $DEBUG -ne 0 ]; then fi pushd $TF_DIR &> /dev/null + diff --git a/examples/terraform/templates/terraform/modules.jsonnet b/examples/terraform/templates/terraform/modules.jsonnet index 29798ff0b..566bac430 100644 --- a/examples/terraform/templates/terraform/modules.jsonnet +++ b/examples/terraform/templates/terraform/modules.jsonnet @@ -8,4 +8,4 @@ local p = inv.parameters; [module]: p.modules[module], for module in std.objectFields(p.modules) } -} +} \ No newline at end of file diff --git a/tests/test_docker_compiled/docker/jsonnet/Dockerfile.web b/tests/test_docker_compiled/docker/jsonnet/Dockerfile.web index 602711d8f..ab581db82 100644 --- a/tests/test_docker_compiled/docker/jsonnet/Dockerfile.web +++ b/tests/test_docker_compiled/docker/jsonnet/Dockerfile.web @@ -1,4 +1,4 @@ FROM amazoncorretto:11 COPY target/blah.jar /app/blah.jar EXPOSE ${PORT} -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/tests/test_docker_compiled/docker/jsonnet/Dockerfile.worker b/tests/test_docker_compiled/docker/jsonnet/Dockerfile.worker index 96f1181c7..650c068b7 100644 --- a/tests/test_docker_compiled/docker/jsonnet/Dockerfile.worker +++ b/tests/test_docker_compiled/docker/jsonnet/Dockerfile.worker @@ -1,3 +1,3 @@ FROM amazoncorretto:8 COPY target/blah.jar /app/blah.jar -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/tests/test_docker_compiled/docker/kadet/Dockerfile.web b/tests/test_docker_compiled/docker/kadet/Dockerfile.web index 602711d8f..ab581db82 100644 --- a/tests/test_docker_compiled/docker/kadet/Dockerfile.web +++ b/tests/test_docker_compiled/docker/kadet/Dockerfile.web @@ -1,4 +1,4 @@ FROM amazoncorretto:11 COPY target/blah.jar /app/blah.jar EXPOSE ${PORT} -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/tests/test_docker_compiled/docker/kadet/Dockerfile.worker b/tests/test_docker_compiled/docker/kadet/Dockerfile.worker index 96f1181c7..650c068b7 100644 --- a/tests/test_docker_compiled/docker/kadet/Dockerfile.worker +++ b/tests/test_docker_compiled/docker/kadet/Dockerfile.worker @@ -1,3 +1,3 @@ FROM amazoncorretto:8 COPY target/blah.jar /app/blah.jar -ENTRYPOINT ["java", "-jar", "/app/blah.jar"] +ENTRYPOINT ["java", "-jar", "/app/blah.jar"] \ No newline at end of file diff --git a/tests/test_jsonnet/file1.txt b/tests/test_jsonnet/file1.txt index 83f51c5d9..0c2656492 100644 --- a/tests/test_jsonnet/file1.txt +++ b/tests/test_jsonnet/file1.txt @@ -1 +1 @@ -To be, or not to be: that is the question +To be, or not to be: that is the question \ No newline at end of file diff --git a/tests/test_jsonnet/file2.txt b/tests/test_jsonnet/file2.txt index 0266cec81..59540a979 100644 --- a/tests/test_jsonnet/file2.txt +++ b/tests/test_jsonnet/file2.txt @@ -1 +1 @@ -Nothing will come of nothing. +Nothing will come of nothing. \ No newline at end of file diff --git a/tests/test_jsonnet/subfolder2/file1.txt b/tests/test_jsonnet/subfolder2/file1.txt index 61d16dd4c..2f30bda5a 100644 --- a/tests/test_jsonnet/subfolder2/file1.txt +++ b/tests/test_jsonnet/subfolder2/file1.txt @@ -1 +1 @@ -should't be loaded +should't be loaded \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/busybox/copy/copy_target b/tests/test_kubernetes_compiled/busybox/copy/copy_target index 5459c212f..9301ae519 100644 --- a/tests/test_kubernetes_compiled/busybox/copy/copy_target +++ b/tests/test_kubernetes_compiled/busybox/copy/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/busybox/copy_target b/tests/test_kubernetes_compiled/busybox/copy_target index 5459c212f..9301ae519 100644 --- a/tests/test_kubernetes_compiled/busybox/copy_target +++ b/tests/test_kubernetes_compiled/busybox/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/labels/labels/service.yml b/tests/test_kubernetes_compiled/labels/labels/service.yml index d6cc7b39c..758c8df30 100644 --- a/tests/test_kubernetes_compiled/labels/labels/service.yml +++ b/tests/test_kubernetes_compiled/labels/labels/service.yml @@ -11,4 +11,4 @@ spec: ports: - port: 5432 targetPort: 5432 - name: postgres + name: postgres \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/README.md b/tests/test_kubernetes_compiled/minikube-es/README.md index f64219a3c..f74aa827c 100644 --- a/tests/test_kubernetes_compiled/minikube-es/README.md +++ b/tests/test_kubernetes_compiled/minikube-es/README.md @@ -61,4 +61,4 @@ Deleting is easy (warning, this will remove _everything_): ``` $ scripts/kubectl.sh delete -f manifests/ -``` +``` \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/copy/copy_target b/tests/test_kubernetes_compiled/minikube-es/copy/copy_target index 5459c212f..9301ae519 100644 --- a/tests/test_kubernetes_compiled/minikube-es/copy/copy_target +++ b/tests/test_kubernetes_compiled/minikube-es/copy/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/copy_target b/tests/test_kubernetes_compiled/minikube-es/copy_target index 5459c212f..9301ae519 100644 --- a/tests/test_kubernetes_compiled/minikube-es/copy_target +++ b/tests/test_kubernetes_compiled/minikube-es/copy_target @@ -1 +1 @@ -for_testing +for_testing \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/apply.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/apply.sh index 0b97cd208..3cf5eedc4 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/apply.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/apply.sh @@ -11,4 +11,4 @@ for SECTION in pre-deploy manifests do echo "## run kubectl apply for ${SECTION}" kapitan refs --reveal -f ${DIR}/../${SECTION}/ | ${DIR}/kubectl.sh apply -f - | column -t -done +done \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/delete.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/delete.sh index 094586f3f..b6e7e808d 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/delete.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/delete.sh @@ -7,4 +7,4 @@ DIR=$(dirname ${BASH_SOURCE[0]}) -${DIR}/kubectl.sh delete -f ${DIR}/../manifests +${DIR}/kubectl.sh delete -f ${DIR}/../manifests \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/kubectl.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/kubectl.sh index cefb7d38f..26acd1c4e 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/kubectl.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/kubectl.sh @@ -7,4 +7,4 @@ KUBECTL="kubectl --context minikube-es --insecure-skip-tls-verify=False " -${KUBECTL} $@ +${KUBECTL} $@ \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/install_minikube.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/install_minikube.sh index 165daacdb..dcf035f3b 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/install_minikube.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/install_minikube.sh @@ -18,4 +18,4 @@ URL=https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/${MINIK echo Downloading minikube release ${MINIKUBE_VERSION} to /usr/local/bin/minikube pause sudo curl --progress-bar -o /usr/local/bin/minikube ${URL} -sudo chmod +x /usr/local/bin/minikube +sudo chmod +x /usr/local/bin/minikube \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/start_minikube.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/start_minikube.sh index 97c12245c..1ed875d6c 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/start_minikube.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/minikube/start_minikube.sh @@ -7,4 +7,4 @@ eval $(minikube docker-env) minikube start --insecure-registry https://quay.io --memory=4096 --cpus=4 -minikube ssh "sudo ip link set docker0 promisc on" +minikube ssh "sudo ip link set docker0 promisc on" \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/setup_cluster.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/setup_cluster.sh index b5bc6904d..7c7a34d55 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/setup_cluster.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/setup_cluster.sh @@ -4,3 +4,6 @@ # SPDX-FileCopyrightText: 2020 The Kapitan Authors # # SPDX-License-Identifier: Apache-2.0 + + + diff --git a/tests/test_kubernetes_compiled/minikube-es/scripts/setup_context.sh b/tests/test_kubernetes_compiled/minikube-es/scripts/setup_context.sh index c61a0a304..19307a214 100755 --- a/tests/test_kubernetes_compiled/minikube-es/scripts/setup_context.sh +++ b/tests/test_kubernetes_compiled/minikube-es/scripts/setup_context.sh @@ -6,4 +6,4 @@ # SPDX-License-Identifier: Apache-2.0 kubectl config set-context minikube-es --cluster minikube --user minikube --namespace minikube-es -kubectl config use-context minikube-es +kubectl config use-context minikube-es \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/README.md b/tests/test_kubernetes_compiled/minikube-mysql/README.md index e80439949..18212b6b3 100644 --- a/tests/test_kubernetes_compiled/minikube-mysql/README.md +++ b/tests/test_kubernetes_compiled/minikube-mysql/README.md @@ -61,4 +61,4 @@ Deleting is easy (warning, this will remove _everything_): ``` $ scripts/kubectl.sh delete -f manifests/ -``` +``` \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/apply.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/apply.sh index 0b97cd208..3cf5eedc4 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/apply.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/apply.sh @@ -11,4 +11,4 @@ for SECTION in pre-deploy manifests do echo "## run kubectl apply for ${SECTION}" kapitan refs --reveal -f ${DIR}/../${SECTION}/ | ${DIR}/kubectl.sh apply -f - | column -t -done +done \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/delete.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/delete.sh index 094586f3f..b6e7e808d 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/delete.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/delete.sh @@ -7,4 +7,4 @@ DIR=$(dirname ${BASH_SOURCE[0]}) -${DIR}/kubectl.sh delete -f ${DIR}/../manifests +${DIR}/kubectl.sh delete -f ${DIR}/../manifests \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/kubectl.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/kubectl.sh index 437a20fad..04d2b6db6 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/kubectl.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/kubectl.sh @@ -7,4 +7,4 @@ KUBECTL="kubectl --context minikube-mysql --insecure-skip-tls-verify=False " -${KUBECTL} $@ +${KUBECTL} $@ \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/install_minikube.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/install_minikube.sh index 165daacdb..dcf035f3b 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/install_minikube.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/install_minikube.sh @@ -18,4 +18,4 @@ URL=https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/${MINIK echo Downloading minikube release ${MINIKUBE_VERSION} to /usr/local/bin/minikube pause sudo curl --progress-bar -o /usr/local/bin/minikube ${URL} -sudo chmod +x /usr/local/bin/minikube +sudo chmod +x /usr/local/bin/minikube \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/start_minikube.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/start_minikube.sh index 97c12245c..1ed875d6c 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/start_minikube.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/minikube/start_minikube.sh @@ -7,4 +7,4 @@ eval $(minikube docker-env) minikube start --insecure-registry https://quay.io --memory=4096 --cpus=4 -minikube ssh "sudo ip link set docker0 promisc on" +minikube ssh "sudo ip link set docker0 promisc on" \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_cluster.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_cluster.sh index b5bc6904d..7c7a34d55 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_cluster.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_cluster.sh @@ -4,3 +4,6 @@ # SPDX-FileCopyrightText: 2020 The Kapitan Authors # # SPDX-License-Identifier: Apache-2.0 + + + diff --git a/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_context.sh b/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_context.sh index a374660d6..ed53eadd7 100755 --- a/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_context.sh +++ b/tests/test_kubernetes_compiled/minikube-mysql/scripts/setup_context.sh @@ -6,4 +6,4 @@ # SPDX-License-Identifier: Apache-2.0 kubectl config set-context minikube-mysql --cluster minikube --user minikube --namespace minikube-mysql -kubectl config use-context minikube-mysql +kubectl config use-context minikube-mysql \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-helm/README.md b/tests/test_kubernetes_compiled/minikube-nginx-helm/README.md index 29193af52..8eae91228 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-helm/README.md +++ b/tests/test_kubernetes_compiled/minikube-nginx-helm/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-helm* is running: * 2 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-helm/nginx-deploy.sh b/tests/test_kubernetes_compiled/minikube-nginx-helm/nginx-deploy.sh index ee871d50a..4d2d8fa90 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-helm/nginx-deploy.sh +++ b/tests/test_kubernetes_compiled/minikube-nginx-helm/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/README.md b/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/README.md index 17cfc3914..5e6afb2c3 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/README.md +++ b/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-jsonnet* is running: * 1 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/nginx-deploy.sh b/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/nginx-deploy.sh index a3e53340f..13ae55643 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/nginx-deploy.sh +++ b/tests/test_kubernetes_compiled/minikube-nginx-jsonnet/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-kadet/README.md b/tests/test_kubernetes_compiled/minikube-nginx-kadet/README.md index a3563aa12..6dcd055e7 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-kadet/README.md +++ b/tests/test_kubernetes_compiled/minikube-nginx-kadet/README.md @@ -4,4 +4,4 @@ Target *minikube-nginx-kadet* is running: * 2 replicas of *nginx* running nginx image nginx:1:15.8 -* on cluster minikube +* on cluster minikube \ No newline at end of file diff --git a/tests/test_kubernetes_compiled/minikube-nginx-kadet/nginx-deploy.sh b/tests/test_kubernetes_compiled/minikube-nginx-kadet/nginx-deploy.sh index 5e0b57044..509063a82 100644 --- a/tests/test_kubernetes_compiled/minikube-nginx-kadet/nginx-deploy.sh +++ b/tests/test_kubernetes_compiled/minikube-nginx-kadet/nginx-deploy.sh @@ -11,4 +11,4 @@ for SECTION in manifests do echo "## run kubectl apply for ${SECTION}" ${KUBECTL} apply -f ${DIR}/${SECTION}/ | column -t -done +done \ No newline at end of file diff --git a/tests/test_resources/charts/acs-engine-autoscaler/templates/NOTES.txt b/tests/test_resources/charts/acs-engine-autoscaler/templates/NOTES.txt index 628694cba..73074f35d 100755 --- a/tests/test_resources/charts/acs-engine-autoscaler/templates/NOTES.txt +++ b/tests/test_resources/charts/acs-engine-autoscaler/templates/NOTES.txt @@ -21,4 +21,4 @@ To update, run: helm upgrade {{ .Release.Name }} \ --set acsenginecluster.resourcegroup=YOUR-RESOURCEGROUP-HERE,acsenginecluster.azurespappid=YOUR-AZURESPAPPID-HERE,acsenginecluster.azurespsecret=YOUR-AZURESPSECRET-HERE,acsenginecluster.azuresptenantid=YOUR-AZURESPTENANTID-HERE,acsenginecluster.kubeconfigprivatekey=YOUR-KUBECONFIGPRIVATEKEY-HERE,acsenginecluster.clientprivatekey=YOUR-CLIENTPRIVATEKEY-HERE stable/acs-engine-autoscaler -{{- end }} +{{- end }} \ No newline at end of file diff --git a/tests/test_resources/charts/acs-engine-autoscaler/templates/_helpers.tpl b/tests/test_resources/charts/acs-engine-autoscaler/templates/_helpers.tpl index ed137b057..81b03cdf5 100755 --- a/tests/test_resources/charts/acs-engine-autoscaler/templates/_helpers.tpl +++ b/tests/test_resources/charts/acs-engine-autoscaler/templates/_helpers.tpl @@ -39,4 +39,4 @@ Example output: */ -}} {{- define "chartref" -}} {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}} -{{- end -}} +{{- end -}} \ No newline at end of file diff --git a/tests/test_resources/charts/acs-engine-autoscaler/templates/deployment.yaml b/tests/test_resources/charts/acs-engine-autoscaler/templates/deployment.yaml index aa481e99b..d6ce37e02 100755 --- a/tests/test_resources/charts/acs-engine-autoscaler/templates/deployment.yaml +++ b/tests/test_resources/charts/acs-engine-autoscaler/templates/deployment.yaml @@ -67,4 +67,4 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} restartPolicy: Always dnsPolicy: Default -{{ end }} +{{ end }} \ No newline at end of file diff --git a/tests/test_resources/charts/acs-engine-autoscaler/templates/secrets.yaml b/tests/test_resources/charts/acs-engine-autoscaler/templates/secrets.yaml index 89f73710c..8778d73b6 100755 --- a/tests/test_resources/charts/acs-engine-autoscaler/templates/secrets.yaml +++ b/tests/test_resources/charts/acs-engine-autoscaler/templates/secrets.yaml @@ -10,4 +10,4 @@ data: azure-sp-secret: {{ default "MISSING" .Values.acsenginecluster.azurespsecret | b64enc | quote }} azure-sp-tenant-id: {{ default "MISSING" .Values.acsenginecluster.azuresptenantid | b64enc | quote }} kubeconfig-private-key: {{ default "MISSING" .Values.acsenginecluster.kubeconfigprivatekey | b64enc | quote }} - client-private-key: {{ default "MISSING" .Values.acsenginecluster.clientprivatekey | b64enc | quote }} + client-private-key: {{ default "MISSING" .Values.acsenginecluster.clientprivatekey | b64enc | quote }} \ No newline at end of file diff --git a/tests/test_resources/charts/acs-engine-autoscaler/values.yaml b/tests/test_resources/charts/acs-engine-autoscaler/values.yaml index e657327bf..7b8f6f3b1 100755 --- a/tests/test_resources/charts/acs-engine-autoscaler/values.yaml +++ b/tests/test_resources/charts/acs-engine-autoscaler/values.yaml @@ -23,3 +23,4 @@ acsenginecluster: ignorepools: # Optional parameter denominating number of nodes to spare in a pool after scaling spareagents: + diff --git a/tests/test_resources/charts/istio/charts/certmanager/templates/NOTES.txt b/tests/test_resources/charts/istio/charts/certmanager/templates/NOTES.txt index 44893d41a..0307ede4c 100644 --- a/tests/test_resources/charts/istio/charts/certmanager/templates/NOTES.txt +++ b/tests/test_resources/charts/istio/charts/certmanager/templates/NOTES.txt @@ -3,4 +3,4 @@ certmanager has been deployed successfully! More information on the different types of issuers and how to configure them can be found in our documentation: -https://cert-manager.readthedocs.io/en/latest/reference/issuers.html +https://cert-manager.readthedocs.io/en/latest/reference/issuers.html \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/certmanager/templates/deployment.yaml b/tests/test_resources/charts/istio/charts/certmanager/templates/deployment.yaml index e904da791..fc9eacc5d 100644 --- a/tests/test_resources/charts/istio/charts/certmanager/templates/deployment.yaml +++ b/tests/test_resources/charts/istio/charts/certmanager/templates/deployment.yaml @@ -19,7 +19,7 @@ spec: app: certmanager chart: {{ template "certmanager.chart" . }} heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + release: {{ .Release.Name }} {{- if .Values.podLabels }} {{ toYaml .Values.podLabels | indent 8 }} {{- end }} diff --git a/tests/test_resources/charts/istio/charts/galley/templates/configmap.yaml b/tests/test_resources/charts/istio/charts/galley/templates/configmap.yaml index 1b71968d6..b138f2ef8 100644 --- a/tests/test_resources/charts/istio/charts/galley/templates/configmap.yaml +++ b/tests/test_resources/charts/istio/charts/galley/templates/configmap.yaml @@ -11,4 +11,4 @@ metadata: istio: galley data: validatingwebhookconfiguration.yaml: |- - {{- include "validatingwebhookconfiguration.yaml.tpl" . | indent 4}} + {{- include "validatingwebhookconfiguration.yaml.tpl" . | indent 4}} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/galley/templates/deployment.yaml b/tests/test_resources/charts/istio/charts/galley/templates/deployment.yaml index e6ae59caf..e565c23fe 100644 --- a/tests/test_resources/charts/istio/charts/galley/templates/deployment.yaml +++ b/tests/test_resources/charts/istio/charts/galley/templates/deployment.yaml @@ -24,7 +24,7 @@ spec: app: {{ template "galley.name" . }} chart: {{ template "galley.chart" . }} heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + release: {{ .Release.Name }} istio: galley annotations: sidecar.istio.io/inject: "false" diff --git a/tests/test_resources/charts/istio/charts/gateways/templates/preconfigured.yaml b/tests/test_resources/charts/istio/charts/gateways/templates/preconfigured.yaml index 766cfa684..8d3dee930 100644 --- a/tests/test_resources/charts/istio/charts/gateways/templates/preconfigured.yaml +++ b/tests/test_resources/charts/istio/charts/gateways/templates/preconfigured.yaml @@ -30,8 +30,8 @@ spec: privateKey: /etc/istio/ingress-certs/tls.key hosts: - "*" -{{ end }} ---- +{{ end }} +--- {{ end }} {{- if .Values.global.meshExpansion.enabled }} diff --git a/tests/test_resources/charts/istio/charts/gateways/templates/serviceaccount.yaml b/tests/test_resources/charts/istio/charts/gateways/templates/serviceaccount.yaml index cb6d6890d..d4f6938c1 100644 --- a/tests/test_resources/charts/istio/charts/gateways/templates/serviceaccount.yaml +++ b/tests/test_resources/charts/istio/charts/gateways/templates/serviceaccount.yaml @@ -21,3 +21,4 @@ metadata: {{- end }} {{- end }} {{- end }} + diff --git a/tests/test_resources/charts/istio/charts/gateways/values.yaml b/tests/test_resources/charts/istio/charts/gateways/values.yaml index 1525cc34c..1289afc92 100644 --- a/tests/test_resources/charts/istio/charts/gateways/values.yaml +++ b/tests/test_resources/charts/istio/charts/gateways/values.yaml @@ -208,7 +208,7 @@ istio-egressgateway: ISTIO_META_ROUTER_MODE: "sni-dnat" nodeSelector: {} tolerations: [] - + # Specify the pod anti-affinity that allows you to constrain which nodes # your pod is eligible to be scheduled based on labels on pods that are # already running on the node rather than based on labels on nodes. diff --git a/tests/test_resources/charts/istio/charts/grafana/templates/service.yaml b/tests/test_resources/charts/istio/charts/grafana/templates/service.yaml index b206679c3..1dfd82c33 100644 --- a/tests/test_resources/charts/istio/charts/grafana/templates/service.yaml +++ b/tests/test_resources/charts/istio/charts/grafana/templates/service.yaml @@ -29,4 +29,4 @@ spec: {{range $rangeList := .Values.service.loadBalancerSourceRanges}} - {{ $rangeList }} {{end}} - {{end}} + {{end}} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/mixer/templates/config.yaml b/tests/test_resources/charts/istio/charts/mixer/templates/config.yaml index eb6d3a3ca..cc0f046da 100644 --- a/tests/test_resources/charts/istio/charts/mixer/templates/config.yaml +++ b/tests/test_resources/charts/istio/charts/mixer/templates/config.yaml @@ -429,7 +429,7 @@ spec: request_protocol: api.protocol | context.protocol | "unknown" response_code: response.code | 200 response_flags: context.proxy_error_code | "-" - permissive_response_code: rbac.permissive.response_code | "none" + permissive_response_code: rbac.permissive.response_code | "none" permissive_response_policyid: rbac.permissive.effective_policy_id | "none" connection_security_policy: conditional((context.reporter.kind | "inbound") == "outbound", "unknown", conditional(connection.mtls | false, "mutual_tls", "none")) monitored_resource_type: '"UNSPECIFIED"' @@ -466,7 +466,7 @@ spec: request_protocol: api.protocol | context.protocol | "unknown" response_code: response.code | 200 response_flags: context.proxy_error_code | "-" - permissive_response_code: rbac.permissive.response_code | "none" + permissive_response_code: rbac.permissive.response_code | "none" permissive_response_policyid: rbac.permissive.effective_policy_id | "none" connection_security_policy: conditional((context.reporter.kind | "inbound") == "outbound", "unknown", conditional(connection.mtls | false, "mutual_tls", "none")) monitored_resource_type: '"UNSPECIFIED"' @@ -503,7 +503,7 @@ spec: request_protocol: api.protocol | context.protocol | "unknown" response_code: response.code | 200 response_flags: context.proxy_error_code | "-" - permissive_response_code: rbac.permissive.response_code | "none" + permissive_response_code: rbac.permissive.response_code | "none" permissive_response_policyid: rbac.permissive.effective_policy_id | "none" connection_security_policy: conditional((context.reporter.kind | "inbound") == "outbound", "unknown", conditional(connection.mtls | false, "mutual_tls", "none")) monitored_resource_type: '"UNSPECIFIED"' diff --git a/tests/test_resources/charts/istio/charts/mixer/templates/service.yaml b/tests/test_resources/charts/istio/charts/mixer/templates/service.yaml index 6da499bed..79cc4a582 100644 --- a/tests/test_resources/charts/istio/charts/mixer/templates/service.yaml +++ b/tests/test_resources/charts/istio/charts/mixer/templates/service.yaml @@ -36,3 +36,4 @@ spec: {{- end }} {{- end }} {{- end }} + diff --git a/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrole.yaml b/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrole.yaml index 8e4ab6d32..9127b05e3 100644 --- a/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrole.yaml +++ b/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrole.yaml @@ -10,4 +10,4 @@ metadata: rules: - apiGroups: [""] resources: ["configmaps"] - verbs: ["get"] + verbs: ["get"] \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrolebinding.yaml b/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrolebinding.yaml index 591e48212..963757e72 100644 --- a/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrolebinding.yaml +++ b/tests/test_resources/charts/istio/charts/nodeagent/templates/clusterrolebinding.yaml @@ -14,4 +14,4 @@ roleRef: subjects: - kind: ServiceAccount name: istio-nodeagent-service-account - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/nodeagent/templates/daemonset.yaml b/tests/test_resources/charts/istio/charts/nodeagent/templates/daemonset.yaml index c6fcb8523..3c30e7044 100644 --- a/tests/test_resources/charts/istio/charts/nodeagent/templates/daemonset.yaml +++ b/tests/test_resources/charts/istio/charts/nodeagent/templates/daemonset.yaml @@ -63,4 +63,4 @@ spec: {{ toYaml .Values.global.defaultTolerations | indent 6 }} {{- end }} updateStrategy: - type: RollingUpdate + type: RollingUpdate \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/nodeagent/templates/serviceaccount.yaml b/tests/test_resources/charts/istio/charts/nodeagent/templates/serviceaccount.yaml index 86853d7e0..b52f852d8 100644 --- a/tests/test_resources/charts/istio/charts/nodeagent/templates/serviceaccount.yaml +++ b/tests/test_resources/charts/istio/charts/nodeagent/templates/serviceaccount.yaml @@ -13,4 +13,4 @@ metadata: app: {{ template "nodeagent.name" . }} chart: {{ template "nodeagent.chart" . }} heritage: {{ .Release.Service }} - release: {{ .Release.Name }} + release: {{ .Release.Name }} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/nodeagent/values.yaml b/tests/test_resources/charts/istio/charts/nodeagent/values.yaml index 812dd84ca..9485731aa 100644 --- a/tests/test_resources/charts/istio/charts/nodeagent/values.yaml +++ b/tests/test_resources/charts/istio/charts/nodeagent/values.yaml @@ -7,7 +7,7 @@ env: # name of authentication provider. CA_PROVIDER: "" # CA endpoint. - CA_ADDR: "" + CA_ADDR: "" # names of authentication provider's plugins. Plugins: "" nodeSelector: {} diff --git a/tests/test_resources/charts/istio/charts/pilot/templates/meshexpansion.yaml b/tests/test_resources/charts/istio/charts/pilot/templates/meshexpansion.yaml index 50dfc0775..4f3d59570 100644 --- a/tests/test_resources/charts/istio/charts/pilot/templates/meshexpansion.yaml +++ b/tests/test_resources/charts/istio/charts/pilot/templates/meshexpansion.yaml @@ -88,3 +88,4 @@ spec: --- {{- end }} {{- end }} + diff --git a/tests/test_resources/charts/istio/charts/prometheus/templates/configmap.yaml b/tests/test_resources/charts/istio/charts/prometheus/templates/configmap.yaml index 040269d3a..1b26fa5a1 100644 --- a/tests/test_resources/charts/istio/charts/prometheus/templates/configmap.yaml +++ b/tests/test_resources/charts/istio/charts/prometheus/templates/configmap.yaml @@ -278,4 +278,4 @@ data: target_label: namespace - source_labels: [__meta_kubernetes_pod_name] action: replace - target_label: pod_name + target_label: pod_name \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/mutatingwebhook.yaml b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/mutatingwebhook.yaml index 82963f1d9..a30dd38e5 100644 --- a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/mutatingwebhook.yaml +++ b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/mutatingwebhook.yaml @@ -36,3 +36,4 @@ webhooks: matchLabels: istio-injection: enabled {{- end }} + diff --git a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/poddisruptionbudget.yaml b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/poddisruptionbudget.yaml index 870b92508..51fb3fc3e 100644 --- a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/poddisruptionbudget.yaml +++ b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/templates/poddisruptionbudget.yaml @@ -15,4 +15,4 @@ spec: app: {{ template "sidecar-injector.name" . }} release: {{ .Release.Name }} istio: sidecar-injector - {{- end }} + {{- end }} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/values.yaml b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/values.yaml index b2c2f934d..eba94679f 100644 --- a/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/values.yaml +++ b/tests/test_resources/charts/istio/charts/sidecarInjectorWebhook/values.yaml @@ -39,4 +39,4 @@ rewriteAppHTTPProbe: false # See https://istio.io/docs/setup/kubernetes/additional-setup/sidecar-injection/#more-control-adding-exceptions neverInjectSelector: [] -alwaysInjectSelector: [] +alwaysInjectSelector: [] \ No newline at end of file diff --git a/tests/test_resources/charts/istio/charts/tracing/templates/service-jaeger.yaml b/tests/test_resources/charts/istio/charts/tracing/templates/service-jaeger.yaml index e8c2bc9d8..23979baf8 100644 --- a/tests/test_resources/charts/istio/charts/tracing/templates/service-jaeger.yaml +++ b/tests/test_resources/charts/istio/charts/tracing/templates/service-jaeger.yaml @@ -87,3 +87,4 @@ items: selector: app: jaeger {{ end }} + diff --git a/tests/test_resources/charts/istio/charts/tracing/values.yaml b/tests/test_resources/charts/istio/charts/tracing/values.yaml index 19102a514..d05b650fc 100644 --- a/tests/test_resources/charts/istio/charts/tracing/values.yaml +++ b/tests/test_resources/charts/istio/charts/tracing/values.yaml @@ -74,3 +74,4 @@ ingress: # - secretName: tracing-tls # hosts: # - tracing.local + diff --git a/tests/test_resources/charts/istio/example-values/values-istio-example-sds-vault.yaml b/tests/test_resources/charts/istio/example-values/values-istio-example-sds-vault.yaml index b392b0645..cf097c7f1 100644 --- a/tests/test_resources/charts/istio/example-values/values-istio-example-sds-vault.yaml +++ b/tests/test_resources/charts/istio/example-values/values-istio-example-sds-vault.yaml @@ -24,4 +24,4 @@ nodeagent: VAULT_AUTH_PATH: "auth/kubernetes/login" VAULT_ROLE: "istio-cert" VAULT_SIGN_CSR_PATH: "istio_ca/sign/istio-pki-role" - VAULT_TLS_ROOT_CERT: '-----BEGIN CERTIFICATE-----\nMIIC3jCCAcagAwIBAgIRAO1S7vuRQmo2He+RtBq3fv8wDQYJKoZIhvcNAQELBQAw\nEDEOMAwGA1UEChMFVmF1bHQwIBcNMTkwNDI3MTY1ODE1WhgPMjExOTA0MDMxNjU4\nMTVaMBAxDjAMBgNVBAoTBVZhdWx0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEA7/CTbnENEIvFZg9hmVtYnOx3OfMy/GNCuP7sqtAeVVTopAKKkcAAWQck\nrhpBooEGpCugNxXGNCuJh/2nu0AfGFRfdafwSJRoI6yHwQouDm0o4r3h9uL3tu5N\nD+x9j+eejbFsoZVn84CxGkEB6oyeXYHjc6eWh3PFGMtKuOQD4pezvDH0yNCx5waK\nhtPuYtl0ebfdbyh+WQuptO+Q9VSaQNqE3ipZ461y8PduwRRll241W0gQB2iasX03\nD36F2ZrMz3KEVRVKM1yCUDCy2RPJqkXPdnVMWmDGbe8Uw69zr25JltzuRZFT9HL3\nY1RnMTecmSc4ikTUHcMhFX3PYbfR5wIDAQABozEwLzAOBgNVHQ8BAf8EBAMCBaAw\nDAYDVR0TAQH/BAIwADAPBgNVHREECDAGhwQiU4HTMA0GCSqGSIb3DQEBCwUAA4IB\nAQCdLh6olDVQB71LD6srbfAE4EsxLEBbIRnv7Nf1S0KQwgW/QxK8DHBwJBxJkr1N\nzgEPx86f2Fo2UsY9m6rvgP3+iquyMsKi0ooUah3y3LSnONuZcdfSTl/HYd38S6Dp\nVkVOZ7781xxpFVUqQ5voQX1Y1Ipn5qw0FyIcNYWLkNX+iMf1b9kpEIWQNhRC/Yiv\nTS0VA/BzQemGyf2UB6QsuZLH+JFEZnzU859qURnNIITa1Wf4YUtka5Sp1kDnEll3\nwj4IlXKU+Wl1CzxJyn4SSQAXy/Lb08ZKrF/YSzcIISnRX5j+wa8ApOSwwA/B7iaT\nTWz1g+RlV9qHap70eIjPsQvb\n-----END CERTIFICATE-----' + VAULT_TLS_ROOT_CERT: '-----BEGIN CERTIFICATE-----\nMIIC3jCCAcagAwIBAgIRAO1S7vuRQmo2He+RtBq3fv8wDQYJKoZIhvcNAQELBQAw\nEDEOMAwGA1UEChMFVmF1bHQwIBcNMTkwNDI3MTY1ODE1WhgPMjExOTA0MDMxNjU4\nMTVaMBAxDjAMBgNVBAoTBVZhdWx0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEA7/CTbnENEIvFZg9hmVtYnOx3OfMy/GNCuP7sqtAeVVTopAKKkcAAWQck\nrhpBooEGpCugNxXGNCuJh/2nu0AfGFRfdafwSJRoI6yHwQouDm0o4r3h9uL3tu5N\nD+x9j+eejbFsoZVn84CxGkEB6oyeXYHjc6eWh3PFGMtKuOQD4pezvDH0yNCx5waK\nhtPuYtl0ebfdbyh+WQuptO+Q9VSaQNqE3ipZ461y8PduwRRll241W0gQB2iasX03\nD36F2ZrMz3KEVRVKM1yCUDCy2RPJqkXPdnVMWmDGbe8Uw69zr25JltzuRZFT9HL3\nY1RnMTecmSc4ikTUHcMhFX3PYbfR5wIDAQABozEwLzAOBgNVHQ8BAf8EBAMCBaAw\nDAYDVR0TAQH/BAIwADAPBgNVHREECDAGhwQiU4HTMA0GCSqGSIb3DQEBCwUAA4IB\nAQCdLh6olDVQB71LD6srbfAE4EsxLEBbIRnv7Nf1S0KQwgW/QxK8DHBwJBxJkr1N\nzgEPx86f2Fo2UsY9m6rvgP3+iquyMsKi0ooUah3y3LSnONuZcdfSTl/HYd38S6Dp\nVkVOZ7781xxpFVUqQ5voQX1Y1Ipn5qw0FyIcNYWLkNX+iMf1b9kpEIWQNhRC/Yiv\nTS0VA/BzQemGyf2UB6QsuZLH+JFEZnzU859qURnNIITa1Wf4YUtka5Sp1kDnEll3\nwj4IlXKU+Wl1CzxJyn4SSQAXy/Lb08ZKrF/YSzcIISnRX5j+wa8ApOSwwA/B7iaT\nTWz1g+RlV9qHap70eIjPsQvb\n-----END CERTIFICATE-----' \ No newline at end of file diff --git a/tests/test_resources/charts/istio/example-values/values-istio-googleca.yaml b/tests/test_resources/charts/istio/example-values/values-istio-googleca.yaml index 643a4dab5..e0c633ea1 100644 --- a/tests/test_resources/charts/istio/example-values/values-istio-googleca.yaml +++ b/tests/test_resources/charts/istio/example-values/values-istio-googleca.yaml @@ -9,7 +9,7 @@ global: sds: enabled: true udsPath: "unix:/var/run/sds/uds_path" - useTrustworthyJwt: true + useTrustworthyJwt: true trustDomain: "" diff --git a/tests/test_resources/charts/istio/files/injection-template.yaml b/tests/test_resources/charts/istio/files/injection-template.yaml index 99d56acac..2f0f3f069 100644 --- a/tests/test_resources/charts/istio/files/injection-template.yaml +++ b/tests/test_resources/charts/istio/files/injection-template.yaml @@ -345,4 +345,4 @@ dnsConfig: {{- range .Values.global.podDNSSearchNamespaces }} - {{ render . }} {{- end }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/tests/test_resources/charts/istio/templates/NOTES.txt b/tests/test_resources/charts/istio/templates/NOTES.txt index be17dcd0b..d17982c66 100644 --- a/tests/test_resources/charts/istio/templates/NOTES.txt +++ b/tests/test_resources/charts/istio/templates/NOTES.txt @@ -26,4 +26,4 @@ $ kubectl apply -f <(istioctl kube-inject -f .yaml) {{- end }} For more information on running Istio, visit: -https://istio.io/ +https://istio.io/ \ No newline at end of file diff --git a/tests/test_resources/charts/istio/templates/configmap.yaml b/tests/test_resources/charts/istio/templates/configmap.yaml index 9f4801dbb..02591ec80 100644 --- a/tests/test_resources/charts/istio/templates/configmap.yaml +++ b/tests/test_resources/charts/istio/templates/configmap.yaml @@ -36,7 +36,7 @@ data: accessLogEncoding: '{{ .Values.global.proxy.accessLogEncoding }}' {{- if .Values.global.istioRemote }} - + {{- if .Values.global.remotePolicyAddress }} {{- if .Values.global.createRemoteSvcEndpoints }} mixerCheckServer: istio-policy.{{ .Release.Namespace }}:15004 @@ -51,7 +51,7 @@ data: mixerReportServer: {{ .Values.global.remoteTelemetryAddress }}:15004 {{- end }} {{- end }} - + {{- else }} {{- if .Values.mixer.policy.enabled }} @@ -68,7 +68,7 @@ data: mixerReportServer: istio-telemetry.{{ .Release.Namespace }}.svc.{{ .Values.global.proxy.clusterDomain }}:9091 {{- end }} {{- end }} - + {{- end }} {{- if or .Values.mixer.policy.enabled (and .Values.global.istioRemote .Values.global.remotePolicyAddress) }} @@ -84,24 +84,24 @@ data: # Default connect timeout for dynamic clusters generated by Pilot and returned via XDS connectTimeout: 10s - + # DNS refresh rate for Envoy clusters of type STRICT_DNS dnsRefreshRate: {{ .Values.global.proxy.dnsRefreshRate }} # Unix Domain Socket through which envoy communicates with NodeAgent SDS to get - # key/cert for mTLS. Use secret-mount files instead of SDS if set to empty. + # key/cert for mTLS. Use secret-mount files instead of SDS if set to empty. sdsUdsPath: {{ .Values.global.sds.udsPath }} - # This flag is used by secret discovery service(SDS). - # If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount - # for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which + # This flag is used by secret discovery service(SDS). + # If set to true(prerequisite: https://kubernetes.io/docs/concepts/storage/volumes/#projected), Istio will inject volumes mount + # for k8s service account JWT, so that K8s API server mounts k8s service account JWT to envoy container, which # will be used to generate key/cert eventually. This isn't supported for non-k8s case. enableSdsTokenMount: {{ .Values.global.sds.useTrustworthyJwt }} - # This flag is used by secret discovery service(SDS). - # If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' - # (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) - # and pass to sds server, which will be used to request key/cert eventually. + # This flag is used by secret discovery service(SDS). + # If set to true, envoy will fetch normal k8s service account JWT from '/var/run/secrets/kubernetes.io/serviceaccount/token' + # (https://kubernetes.io/docs/tasks/access-application-cluster/access-cluster/#accessing-the-api-from-a-pod) + # and pass to sds server, which will be used to request key/cert eventually. # this flag is ignored if enableSdsTokenMount is set. # This isn't supported for non-k8s case. sdsUseK8sSaJwt: {{ .Values.global.sds.useNormalJwt }} @@ -114,7 +114,7 @@ data: # ALLOW_ANY - outbound traffic to unknown destinations will be allowed, in case there are no # services or ServiceEntries for the destination port # REGISTRY_ONLY - restrict outbound traffic to services defined in the service registry as well - # as those defined through ServiceEntries + # as those defined through ServiceEntries outboundTrafficPolicy: mode: {{ .Values.global.outboundTrafficPolicy.mode }} @@ -125,7 +125,7 @@ data: # configuration. {{- if .Values.global.configRootNamespace }} rootNamespace: {{ .Values.global.configRootNamespace }} - {{- else }} + {{- else }} rootNamespace: {{ .Release.Namespace }} {{- end }} @@ -261,7 +261,7 @@ data: discoveryAddress: {{ $pilotAddress }}:15010 {{- end }} {{- end }} - + # Configuration file for the mesh networks to be used by the Split Horizon EDS. meshNetworks: |- {{- if .Values.global.meshNetworks }} diff --git a/tests/test_resources/charts/istio/values-istio-demo-auth.yaml b/tests/test_resources/charts/istio/values-istio-demo-auth.yaml index b6c881a1d..76abed3a0 100644 --- a/tests/test_resources/charts/istio/values-istio-demo-auth.yaml +++ b/tests/test_resources/charts/istio/values-istio-demo-auth.yaml @@ -43,11 +43,11 @@ mixer: requests: cpu: 50m memory: 100Mi - + adapters: stdio: enabled: true - + grafana: enabled: true diff --git a/tests/test_resources/charts/istio/values-istio-demo.yaml b/tests/test_resources/charts/istio/values-istio-demo.yaml index c5d2ab92c..2a9bf89c6 100644 --- a/tests/test_resources/charts/istio/values-istio-demo.yaml +++ b/tests/test_resources/charts/istio/values-istio-demo.yaml @@ -43,11 +43,11 @@ mixer: requests: cpu: 50m memory: 100Mi - + adapters: stdio: enabled: true - + grafana: enabled: true diff --git a/tests/test_resources/charts/istio/values-istio-minimal.yaml b/tests/test_resources/charts/istio/values-istio-minimal.yaml index 6e0d3e9f7..eb92536e8 100644 --- a/tests/test_resources/charts/istio/values-istio-minimal.yaml +++ b/tests/test_resources/charts/istio/values-istio-minimal.yaml @@ -40,5 +40,7 @@ global: enabled: false host: # example: statsd-svc.istio-system port: # example: 9125 - + useMCP: false + + diff --git a/tests/test_resources/charts/istio/values-istio-sds-auth.yaml b/tests/test_resources/charts/istio/values-istio-sds-auth.yaml index 9ec428340..a741bfdcf 100644 --- a/tests/test_resources/charts/istio/values-istio-sds-auth.yaml +++ b/tests/test_resources/charts/istio/values-istio-sds-auth.yaml @@ -17,4 +17,4 @@ nodeagent: env: CA_PROVIDER: "Citadel" CA_ADDR: "istio-citadel:8060" - VALID_TOKEN: true + VALID_TOKEN: true \ No newline at end of file diff --git a/tests/test_resources/charts/istio/values.yaml b/tests/test_resources/charts/istio/values.yaml index 3f419a477..c0bb4528b 100644 --- a/tests/test_resources/charts/istio/values.yaml +++ b/tests/test_resources/charts/istio/values.yaml @@ -87,7 +87,7 @@ kiali: # certmanager: enabled: false - + # # Istio CNI plugin enabled # This must be enabled to use the CNI plugin in Istio. The CNI plugin is installed separately. @@ -235,7 +235,7 @@ global: # available to scrape via the Envoy admin port at either /stats or /stats/prometheus. # # See https://www.envoyproxy.io/docs/envoy/latest/api-v2/config/metrics/v2/metrics_service.proto - # for details about Envoy's Metrics Service API. + # for details about Envoy's Metrics Service API. # # Disabled by default. envoyMetricsService: @@ -410,7 +410,7 @@ global: # services or ServiceEntries for the destination port # REGISTRY_ONLY - restrict outbound traffic to services defined in the service registry as well # as those defined through ServiceEntries - # ALLOW_ANY is the default in 1.1. This means each pod will be able to make outbound requests + # ALLOW_ANY is the default in 1.1. This means each pod will be able to make outbound requests # to services outside of the mesh without any ServiceEntry. # REGISTRY_ONLY was the default in 1.0. If this behavior is desired, set the value below to REGISTRY_ONLY. outboundTrafficPolicy: @@ -425,7 +425,7 @@ global: # rules should be exported to. Currently only one value can be provided in this list. This value # should be one of the following two options: # * implies these objects are visible to all namespaces, enabling any sidecar to talk to any other sidecar. - # . implies these objects are visible to only to sidecars in the same namespace, or if imported as a Sidecar.egress.host + # . implies these objects are visible to only to sidecars in the same namespace, or if imported as a Sidecar.egress.host #defaultConfigVisibilitySettings: #- '*' diff --git a/tests/test_resources/charts/nginx-ingress/templates/podsecuritypolicy.yaml b/tests/test_resources/charts/nginx-ingress/templates/podsecuritypolicy.yaml index 36ab983ca..9222daf3d 100644 --- a/tests/test_resources/charts/nginx-ingress/templates/podsecuritypolicy.yaml +++ b/tests/test_resources/charts/nginx-ingress/templates/podsecuritypolicy.yaml @@ -2,7 +2,7 @@ apiVersion: extensions/v1beta1 kind: PodSecurityPolicy metadata: - name: {{ template "nginx-ingress.fullname" . }} + name: {{ template "nginx-ingress.fullname" . }} labels: app: {{ template "nginx-ingress.name" . }} chart: {{ .Chart.Name }}-{{ .Chart.Version }} diff --git a/tests/test_resources/charts/prometheus/charts/kube-state-metrics/README.md b/tests/test_resources/charts/prometheus/charts/kube-state-metrics/README.md index 6c0ed04bc..5c6456983 100644 --- a/tests/test_resources/charts/prometheus/charts/kube-state-metrics/README.md +++ b/tests/test_resources/charts/prometheus/charts/kube-state-metrics/README.md @@ -49,7 +49,7 @@ $ helm install stable/kube-state-metrics | `collectors.ingresses` | Enable the ingresses collector. | `true` | | `collectors.jobs` | Enable the jobs collector. | `true` | | `collectors.limitranges` | Enable the limitranges collector. | `true` | -| `collectors.mutatingwebhookconfigurations` | Enable the mutatingwebhookconfigurations collector. | `false` | +| `collectors.mutatingwebhookconfigurations` | Enable the mutatingwebhookconfigurations collector. | `false` | | `collectors.namespaces` | Enable the namespaces collector. | `true` | | `collectors.nodes` | Enable the nodes collector. | `true` | | `collectors.persistentvolumeclaims` | Enable the persistentvolumeclaims collector. | `true` | diff --git a/tests/test_resources/charts/prometheus/charts/kube-state-metrics/templates/NOTES.txt b/tests/test_resources/charts/prometheus/charts/kube-state-metrics/templates/NOTES.txt index fde053985..5a646e0cc 100644 --- a/tests/test_resources/charts/prometheus/charts/kube-state-metrics/templates/NOTES.txt +++ b/tests/test_resources/charts/prometheus/charts/kube-state-metrics/templates/NOTES.txt @@ -7,3 +7,4 @@ In your case, {{ template "kube-state-metrics.fullname" . }}.{{ template "kube-s They are served either as plaintext or protobuf depending on the Accept header. They are designed to be consumed either by Prometheus itself or by a scraper that is compatible with scraping a Prometheus client endpoint. + diff --git a/tests/test_resources/charts/prometheus/requirements.yaml b/tests/test_resources/charts/prometheus/requirements.yaml index 7a7ecd182..b28400728 100644 --- a/tests/test_resources/charts/prometheus/requirements.yaml +++ b/tests/test_resources/charts/prometheus/requirements.yaml @@ -4,3 +4,4 @@ dependencies: version: "2.7.*" repository: https://github.com/BurdenBear/kube-charts-mirror/raw/master/docs/ condition: kubeStateMetrics.enabled + diff --git a/tests/test_resources/compiled/jinja2-input-params/test-1/pod.yml b/tests/test_resources/compiled/jinja2-input-params/test-1/pod.yml index c20d20e7f..cea990055 100644 --- a/tests/test_resources/compiled/jinja2-input-params/test-1/pod.yml +++ b/tests/test_resources/compiled/jinja2-input-params/test-1/pod.yml @@ -11,4 +11,4 @@ spec: - "3600" imagePullPolicy: IfNotPresent name: busybox - restartPolicy: Always + restartPolicy: Always \ No newline at end of file diff --git a/tests/test_resources/compiled/jinja2-input-params/test-2/pod.yml b/tests/test_resources/compiled/jinja2-input-params/test-2/pod.yml index 34817b993..f326b61c6 100644 --- a/tests/test_resources/compiled/jinja2-input-params/test-2/pod.yml +++ b/tests/test_resources/compiled/jinja2-input-params/test-2/pod.yml @@ -11,4 +11,4 @@ spec: - "3600" imagePullPolicy: IfNotPresent name: busybox - restartPolicy: Always + restartPolicy: Always \ No newline at end of file diff --git a/tests/test_resources/compiled/nginx/manifests/nginx.conf b/tests/test_resources/compiled/nginx/manifests/nginx.conf index 13a3a8ab0..e2afb6ed2 100644 --- a/tests/test_resources/compiled/nginx/manifests/nginx.conf +++ b/tests/test_resources/compiled/nginx/manifests/nginx.conf @@ -18,4 +18,4 @@ server { location = /50x.html { root /usr/share/nginx/html; } -} +} \ No newline at end of file diff --git a/tests/test_resources/compiled/single-object/list.json b/tests/test_resources/compiled/single-object/list.json index f209aa941..ea3e4cf0a 100644 --- a/tests/test_resources/compiled/single-object/list.json +++ b/tests/test_resources/compiled/single-object/list.json @@ -1,4 +1,4 @@ [ "test", "test2" -] +] \ No newline at end of file diff --git a/tests/test_resources/compiled/single-object/single_object.json b/tests/test_resources/compiled/single-object/single_object.json index 8b8441b91..60bc259b9 100644 --- a/tests/test_resources/compiled/single-object/single_object.json +++ b/tests/test_resources/compiled/single-object/single_object.json @@ -1 +1 @@ -"test" +"test" \ No newline at end of file diff --git a/tests/test_resources/compiled/test-objects/inner.json b/tests/test_resources/compiled/test-objects/inner.json index 22251c2b6..fa22210a3 100644 --- a/tests/test_resources/compiled/test-objects/inner.json +++ b/tests/test_resources/compiled/test-objects/inner.json @@ -1,3 +1,3 @@ { "data": "my_plainref is: I am a plain ref" -} +} \ No newline at end of file diff --git a/tests/test_resources/compiled/test-objects/list.json b/tests/test_resources/compiled/test-objects/list.json index f209aa941..ea3e4cf0a 100644 --- a/tests/test_resources/compiled/test-objects/list.json +++ b/tests/test_resources/compiled/test-objects/list.json @@ -1,4 +1,4 @@ [ "test", "test2" -] +] \ No newline at end of file diff --git a/tests/test_resources/compiled/test-objects/onekey.json b/tests/test_resources/compiled/test-objects/onekey.json index a64f14b11..7e8cdb231 100644 --- a/tests/test_resources/compiled/test-objects/onekey.json +++ b/tests/test_resources/compiled/test-objects/onekey.json @@ -1 +1 @@ -"my_plainref is: I am a plain ref" +"my_plainref is: I am a plain ref" \ No newline at end of file diff --git a/tests/test_resources/compiled/test-objects/single_object.json b/tests/test_resources/compiled/test-objects/single_object.json index 8b8441b91..60bc259b9 100644 --- a/tests/test_resources/compiled/test-objects/single_object.json +++ b/tests/test_resources/compiled/test-objects/single_object.json @@ -1 +1 @@ -"test" +"test" \ No newline at end of file diff --git a/tests/test_resources/compiled/test-objects/string_component_plainref.json b/tests/test_resources/compiled/test-objects/string_component_plainref.json index 4a6b186d4..d77a076ae 100644 --- a/tests/test_resources/compiled/test-objects/string_component_plainref.json +++ b/tests/test_resources/compiled/test-objects/string_component_plainref.json @@ -1 +1 @@ -"my plainref is: I am a plain ref" +"my plainref is: I am a plain ref" \ No newline at end of file diff --git a/tests/test_resources/helm_values_files/prometheus/dev.yml b/tests/test_resources/helm_values_files/prometheus/dev.yml index db8d9e8b1..5958ce5a8 100644 --- a/tests/test_resources/helm_values_files/prometheus/dev.yml +++ b/tests/test_resources/helm_values_files/prometheus/dev.yml @@ -1,2 +1,2 @@ server: - name: dev-server + name: dev-server \ No newline at end of file diff --git a/tests/test_resources/helm_values_files/prometheus/prd.yml b/tests/test_resources/helm_values_files/prometheus/prd.yml index f62a656df..22106f34d 100644 --- a/tests/test_resources/helm_values_files/prometheus/prd.yml +++ b/tests/test_resources/helm_values_files/prometheus/prd.yml @@ -1,2 +1,2 @@ server: - name: prd-server + name: prd-server \ No newline at end of file diff --git a/tests/test_resources/inventory/classes/component/mysql.yml b/tests/test_resources/inventory/classes/component/mysql.yml index 5d4f292b8..ada5e1a60 100644 --- a/tests/test_resources/inventory/classes/component/mysql.yml +++ b/tests/test_resources/inventory/classes/component/mysql.yml @@ -27,6 +27,6 @@ parameters: # password: ?{awskms:mysql/root/password|randomstr|base64} # Generates the sha256 checksum of the previously declared B64'ed password - # It's base64'ed again so that it can be used in kubernetes secrets + # It's base64'ed again so that it can be used in kubernetes secrets password_sha256: ?{gpg:mysql/root/password_sha256|reveal:mysql/root/password|sha256|base64} - storage: 20G # should trigger yamllint error + storage: 20G # should trigger yamllint error \ No newline at end of file diff --git a/tests/test_resources/inventory/classes/test-objects.yml b/tests/test_resources/inventory/classes/test-objects.yml index a3b153f6b..ac75c6afc 100644 --- a/tests/test_resources/inventory/classes/test-objects.yml +++ b/tests/test_resources/inventory/classes/test-objects.yml @@ -10,3 +10,4 @@ parameters: - templates/onekey_component_plainref.jsonnet - templates/simple_component_plainref.jsonnet - templates/string_component_plainref.jsonnet + diff --git a/tests/test_resources/inventory/targets/fail-compile.yml b/tests/test_resources/inventory/targets/fail-compile.yml index 700452079..0b41d4777 100644 --- a/tests/test_resources/inventory/targets/fail-compile.yml +++ b/tests/test_resources/inventory/targets/fail-compile.yml @@ -9,3 +9,6 @@ parameters: continue_on_compile_error: True input_paths: - kadet_functions/fail_compile + + + diff --git a/tests/test_resources/inventory/targets/jinja2-input-params.yml b/tests/test_resources/inventory/targets/jinja2-input-params.yml index b6ae1b687..accc19098 100644 --- a/tests/test_resources/inventory/targets/jinja2-input-params.yml +++ b/tests/test_resources/inventory/targets/jinja2-input-params.yml @@ -18,3 +18,5 @@ parameters: input_params: name: test2 namespace: ns2 + + diff --git a/tests/test_resources/inventory/targets/kadet-test.yml b/tests/test_resources/inventory/targets/kadet-test.yml index 066a3f85c..9acb06f0a 100644 --- a/tests/test_resources/inventory/targets/kadet-test.yml +++ b/tests/test_resources/inventory/targets/kadet-test.yml @@ -31,3 +31,5 @@ parameters: team_name: 'SRE' namespace: 'team-2' post_process_inputs: [gen-test-2] + + diff --git a/tests/test_resources/inventory/targets/test-objects.yml b/tests/test_resources/inventory/targets/test-objects.yml index a59f73daf..3503add0d 100644 --- a/tests/test_resources/inventory/targets/test-objects.yml +++ b/tests/test_resources/inventory/targets/test-objects.yml @@ -7,4 +7,4 @@ parameters: kapitan: vars: target: ${target_name} - namespace: ${target_name} + namespace: ${target_name} \ No newline at end of file diff --git a/tests/test_resources/inventory/targets/toml-output.yml b/tests/test_resources/inventory/targets/toml-output.yml index 613a6c2d2..1cca41dc2 100644 --- a/tests/test_resources/inventory/targets/toml-output.yml +++ b/tests/test_resources/inventory/targets/toml-output.yml @@ -1,5 +1,5 @@ parameters: - input: + input: nested: dictionary: foo: bar @@ -23,3 +23,4 @@ parameters: output_type: toml input_paths: - components/input-to-output/main.jsonnet + \ No newline at end of file diff --git a/tests/test_resources/kadet_functions/add_team_label/__init__.py b/tests/test_resources/kadet_functions/add_team_label/__init__.py index d40959d0c..00701aefd 100644 --- a/tests/test_resources/kadet_functions/add_team_label/__init__.py +++ b/tests/test_resources/kadet_functions/add_team_label/__init__.py @@ -1,12 +1,10 @@ -import glob -import json import os -import time - -import yaml - -from kapitan.inputs import kadet +import json from kapitan.resources import jinja2_render_file, yaml_load +from kapitan.inputs import kadet +import glob +import yaml +import time inventory = kadet.inventory() diff --git a/tests/test_resources/script.sh b/tests/test_resources/script.sh index 872cc515d..27ab1d028 100755 --- a/tests/test_resources/script.sh +++ b/tests/test_resources/script.sh @@ -4,4 +4,4 @@ set -ex compile_dir=$1 -echo "This is going into a file" > "${compile_dir}/${FILE_NAME}" +echo "This is going into a file" > "${compile_dir}/${FILE_NAME}" \ No newline at end of file diff --git a/tests/test_resources/templates/single_object.jsonnet b/tests/test_resources/templates/single_object.jsonnet index 9d40dd8b0..e0016d8d8 100644 --- a/tests/test_resources/templates/single_object.jsonnet +++ b/tests/test_resources/templates/single_object.jsonnet @@ -1 +1 @@ -'test' +'test' \ No newline at end of file diff --git a/tests/test_resources/templates/string_component_plainref.jsonnet b/tests/test_resources/templates/string_component_plainref.jsonnet index f78cb93b1..68a70b7bf 100644 --- a/tests/test_resources/templates/string_component_plainref.jsonnet +++ b/tests/test_resources/templates/string_component_plainref.jsonnet @@ -4,3 +4,4 @@ local inventory = kap.inventory(); local p = inventory.parameters; 'my plainref is: ' + p.my_plainref + diff --git a/tests/test_resources/templates/test_deployment.yaml b/tests/test_resources/templates/test_deployment.yaml index c4ccdab79..5ce006ec1 100644 --- a/tests/test_resources/templates/test_deployment.yaml +++ b/tests/test_resources/templates/test_deployment.yaml @@ -16,4 +16,4 @@ spec: containers: - name: hello image: hello-word - imagePullPolicy: Always + imagePullPolicy: Always \ No newline at end of file diff --git a/tests/test_resources/test_yaml_load.yaml b/tests/test_resources/test_yaml_load.yaml index f49773485..c19901df3 100644 --- a/tests/test_resources/test_yaml_load.yaml +++ b/tests/test_resources/test_yaml_load.yaml @@ -2,4 +2,4 @@ test: key: value array: - ele1 - - ele2 + - ele2 \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/scripts/apply.sh b/tests/test_terraform_compiled/project1/scripts/apply.sh index 8e874d7b5..fd7da83f4 100755 --- a/tests/test_terraform_compiled/project1/scripts/apply.sh +++ b/tests/test_terraform_compiled/project1/scripts/apply.sh @@ -13,4 +13,4 @@ source "${DIR}"/common.sh check_tf_initialized "${TERRAFORM}" apply "$@" -"${DIR}"/update_output.sh +"${DIR}"/update_output.sh \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/scripts/init.sh b/tests/test_terraform_compiled/project1/scripts/init.sh index 6c351eb46..cfcb340f3 100755 --- a/tests/test_terraform_compiled/project1/scripts/init.sh +++ b/tests/test_terraform_compiled/project1/scripts/init.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$TF_DATA_DIR" -"${TERRAFORM}" init "$@" +"${TERRAFORM}" init "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/scripts/plan.sh b/tests/test_terraform_compiled/project1/scripts/plan.sh index 1e4b8ea3d..5721326aa 100755 --- a/tests/test_terraform_compiled/project1/scripts/plan.sh +++ b/tests/test_terraform_compiled/project1/scripts/plan.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN check_tf_initialized -"${TERRAFORM}" plan -lock=false "$@" +"${TERRAFORM}" plan -lock=false "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/scripts/terraform.sh b/tests/test_terraform_compiled/project1/scripts/terraform.sh index 41c88a32a..ee7ae8375 100755 --- a/tests/test_terraform_compiled/project1/scripts/terraform.sh +++ b/tests/test_terraform_compiled/project1/scripts/terraform.sh @@ -10,4 +10,4 @@ source "${DIR}"/common.sh ######################################################################################## # MAIN -"${TERRAFORM}" "$@" +"${TERRAFORM}" "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/scripts/update_output.sh b/tests/test_terraform_compiled/project1/scripts/update_output.sh index d57e76b7e..e6f616d4e 100755 --- a/tests/test_terraform_compiled/project1/scripts/update_output.sh +++ b/tests/test_terraform_compiled/project1/scripts/update_output.sh @@ -12,4 +12,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$OUTPUT_DIR" -"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/terraform/dns.tf.json b/tests/test_terraform_compiled/project1/terraform/dns.tf.json index 25a272179..7026faf51 100644 --- a/tests/test_terraform_compiled/project1/terraform/dns.tf.json +++ b/tests/test_terraform_compiled/project1/terraform/dns.tf.json @@ -43,4 +43,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/terraform/output.tf.json b/tests/test_terraform_compiled/project1/terraform/output.tf.json index ca9340bb8..2f651d097 100644 --- a/tests/test_terraform_compiled/project1/terraform/output.tf.json +++ b/tests/test_terraform_compiled/project1/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project1/terraform/provider.tf.json b/tests/test_terraform_compiled/project1/terraform/provider.tf.json index f94789c80..d94b885ed 100644 --- a/tests/test_terraform_compiled/project1/terraform/provider.tf.json +++ b/tests/test_terraform_compiled/project1/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/scripts/apply.sh b/tests/test_terraform_compiled/project2/scripts/apply.sh index 8e874d7b5..fd7da83f4 100755 --- a/tests/test_terraform_compiled/project2/scripts/apply.sh +++ b/tests/test_terraform_compiled/project2/scripts/apply.sh @@ -13,4 +13,4 @@ source "${DIR}"/common.sh check_tf_initialized "${TERRAFORM}" apply "$@" -"${DIR}"/update_output.sh +"${DIR}"/update_output.sh \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/scripts/init.sh b/tests/test_terraform_compiled/project2/scripts/init.sh index 6c351eb46..cfcb340f3 100755 --- a/tests/test_terraform_compiled/project2/scripts/init.sh +++ b/tests/test_terraform_compiled/project2/scripts/init.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$TF_DATA_DIR" -"${TERRAFORM}" init "$@" +"${TERRAFORM}" init "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/scripts/plan.sh b/tests/test_terraform_compiled/project2/scripts/plan.sh index 1e4b8ea3d..5721326aa 100755 --- a/tests/test_terraform_compiled/project2/scripts/plan.sh +++ b/tests/test_terraform_compiled/project2/scripts/plan.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN check_tf_initialized -"${TERRAFORM}" plan -lock=false "$@" +"${TERRAFORM}" plan -lock=false "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/scripts/terraform.sh b/tests/test_terraform_compiled/project2/scripts/terraform.sh index 41c88a32a..ee7ae8375 100755 --- a/tests/test_terraform_compiled/project2/scripts/terraform.sh +++ b/tests/test_terraform_compiled/project2/scripts/terraform.sh @@ -10,4 +10,4 @@ source "${DIR}"/common.sh ######################################################################################## # MAIN -"${TERRAFORM}" "$@" +"${TERRAFORM}" "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/scripts/update_output.sh b/tests/test_terraform_compiled/project2/scripts/update_output.sh index d57e76b7e..e6f616d4e 100755 --- a/tests/test_terraform_compiled/project2/scripts/update_output.sh +++ b/tests/test_terraform_compiled/project2/scripts/update_output.sh @@ -12,4 +12,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$OUTPUT_DIR" -"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/cloudbuild.tf.json b/tests/test_terraform_compiled/project2/terraform/cloudbuild.tf.json index 7dd50f334..fe170acd0 100644 --- a/tests/test_terraform_compiled/project2/terraform/cloudbuild.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/cloudbuild.tf.json @@ -23,4 +23,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/kms.tf.json b/tests/test_terraform_compiled/project2/terraform/kms.tf.json index 854a43e30..8406baa24 100644 --- a/tests/test_terraform_compiled/project2/terraform/kms.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/kms.tf.json @@ -29,4 +29,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/kubernetes.tf.json b/tests/test_terraform_compiled/project2/terraform/kubernetes.tf.json index 6609103ea..f3a979e66 100644 --- a/tests/test_terraform_compiled/project2/terraform/kubernetes.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/kubernetes.tf.json @@ -77,4 +77,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/logging.tf.json b/tests/test_terraform_compiled/project2/terraform/logging.tf.json index 229690b67..fe05ea6e3 100644 --- a/tests/test_terraform_compiled/project2/terraform/logging.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/logging.tf.json @@ -12,4 +12,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/monitoring.tf.json b/tests/test_terraform_compiled/project2/terraform/monitoring.tf.json index 69c5789be..1bc8a7d8c 100644 --- a/tests/test_terraform_compiled/project2/terraform/monitoring.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/monitoring.tf.json @@ -58,4 +58,4 @@ "type": "string" } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/output.tf.json b/tests/test_terraform_compiled/project2/terraform/output.tf.json index 6f24bd103..06b76a8ab 100644 --- a/tests/test_terraform_compiled/project2/terraform/output.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/provider.tf.json b/tests/test_terraform_compiled/project2/terraform/provider.tf.json index 09890abc6..6548ec164 100644 --- a/tests/test_terraform_compiled/project2/terraform/provider.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project2/terraform/storage.tf.json b/tests/test_terraform_compiled/project2/terraform/storage.tf.json index f1eb90e94..23c00eff6 100644 --- a/tests/test_terraform_compiled/project2/terraform/storage.tf.json +++ b/tests/test_terraform_compiled/project2/terraform/storage.tf.json @@ -49,4 +49,4 @@ }, "google_storage_bucket_iam_policy": {} } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/scripts/apply.sh b/tests/test_terraform_compiled/project3/scripts/apply.sh index 8e874d7b5..fd7da83f4 100755 --- a/tests/test_terraform_compiled/project3/scripts/apply.sh +++ b/tests/test_terraform_compiled/project3/scripts/apply.sh @@ -13,4 +13,4 @@ source "${DIR}"/common.sh check_tf_initialized "${TERRAFORM}" apply "$@" -"${DIR}"/update_output.sh +"${DIR}"/update_output.sh \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/scripts/init.sh b/tests/test_terraform_compiled/project3/scripts/init.sh index 6c351eb46..cfcb340f3 100755 --- a/tests/test_terraform_compiled/project3/scripts/init.sh +++ b/tests/test_terraform_compiled/project3/scripts/init.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$TF_DATA_DIR" -"${TERRAFORM}" init "$@" +"${TERRAFORM}" init "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/scripts/plan.sh b/tests/test_terraform_compiled/project3/scripts/plan.sh index 1e4b8ea3d..5721326aa 100755 --- a/tests/test_terraform_compiled/project3/scripts/plan.sh +++ b/tests/test_terraform_compiled/project3/scripts/plan.sh @@ -11,4 +11,4 @@ source "${DIR}"/common.sh # MAIN check_tf_initialized -"${TERRAFORM}" plan -lock=false "$@" +"${TERRAFORM}" plan -lock=false "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/scripts/terraform.sh b/tests/test_terraform_compiled/project3/scripts/terraform.sh index 41c88a32a..ee7ae8375 100755 --- a/tests/test_terraform_compiled/project3/scripts/terraform.sh +++ b/tests/test_terraform_compiled/project3/scripts/terraform.sh @@ -10,4 +10,4 @@ source "${DIR}"/common.sh ######################################################################################## # MAIN -"${TERRAFORM}" "$@" +"${TERRAFORM}" "$@" \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/scripts/update_output.sh b/tests/test_terraform_compiled/project3/scripts/update_output.sh index d57e76b7e..e6f616d4e 100755 --- a/tests/test_terraform_compiled/project3/scripts/update_output.sh +++ b/tests/test_terraform_compiled/project3/scripts/update_output.sh @@ -12,4 +12,4 @@ source "${DIR}"/common.sh # MAIN mkdir -p "$OUTPUT_DIR" -"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md +"${TERRAFORM}" output README > "${OUTPUT_DIR}"/README.md \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/iam.tf.json b/tests/test_terraform_compiled/project3/terraform/iam.tf.json index 472491e3b..4ec1afb98 100644 --- a/tests/test_terraform_compiled/project3/terraform/iam.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/iam.tf.json @@ -13,4 +13,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/iam_service_account.tf.json b/tests/test_terraform_compiled/project3/terraform/iam_service_account.tf.json index 3ee0f275a..9ec6ca9c4 100644 --- a/tests/test_terraform_compiled/project3/terraform/iam_service_account.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/iam_service_account.tf.json @@ -79,4 +79,4 @@ }, "google_service_account_iam_binding": {} } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/kubernetes.tf.json b/tests/test_terraform_compiled/project3/terraform/kubernetes.tf.json index e0be92995..a77f14067 100644 --- a/tests/test_terraform_compiled/project3/terraform/kubernetes.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/kubernetes.tf.json @@ -64,4 +64,4 @@ } } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/modules.tf.json b/tests/test_terraform_compiled/project3/terraform/modules.tf.json index 38f4f0123..8df0311a5 100644 --- a/tests/test_terraform_compiled/project3/terraform/modules.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/modules.tf.json @@ -28,4 +28,4 @@ "version": "~> 0.1" } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/output.tf.json b/tests/test_terraform_compiled/project3/terraform/output.tf.json index ba834f292..750298f0e 100644 --- a/tests/test_terraform_compiled/project3/terraform/output.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/output.tf.json @@ -12,4 +12,4 @@ "value": "${data.template_file.readme.rendered}" } } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/provider.tf.json b/tests/test_terraform_compiled/project3/terraform/provider.tf.json index dfd61e1a5..6206ebc63 100644 --- a/tests/test_terraform_compiled/project3/terraform/provider.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/provider.tf.json @@ -17,4 +17,4 @@ }, "required_version": ">= 0.11.7" } -} +} \ No newline at end of file diff --git a/tests/test_terraform_compiled/project3/terraform/pubsub.tf.json b/tests/test_terraform_compiled/project3/terraform/pubsub.tf.json index 6e5e6f86c..e454d350f 100644 --- a/tests/test_terraform_compiled/project3/terraform/pubsub.tf.json +++ b/tests/test_terraform_compiled/project3/terraform/pubsub.tf.json @@ -22,4 +22,4 @@ } } } -} +} \ No newline at end of file