From 38bd4a05bf530c3ffa4d8ae33915b790240edbf1 Mon Sep 17 00:00:00 2001 From: Eugenio Marzo Date: Thu, 28 May 2020 06:30:43 +0000 Subject: [PATCH] fixed helm chart --- README.md | 22 +++++++++--------- helm-charts/kubeinvaders/templates/NOTES.txt | 19 +-------------- .../kubeinvaders/templates/deployment.yaml | 2 +- .../kubeinvaders/templates/ingress.yaml | 7 ++++-- helm-charts/kubeinvaders/values.yaml | 4 ++-- helm-charts/kubeinvaderss-0.2.8.tar.gz | Bin 0 -> 3570 bytes 6 files changed, 20 insertions(+), 34 deletions(-) create mode 100644 helm-charts/kubeinvaderss-0.2.8.tar.gz diff --git a/README.md b/README.md index d879683..77b8a9f 100644 --- a/README.md +++ b/README.md @@ -26,16 +26,6 @@ Through KubeInvaders you can stress Kubernetes cluster in a fun way and check ho Move the spaceship over a white alien -### Environment Variables - Make the game more difficult to win! - -Set the following variables in Kubernetes Deployment or Openshift DeploymentConfig - -| ENV Var | Description | -|-----------------------------|-------------------------------------------------------------------------------| -| ALIENPROXIMITY (default 15) | Reduce the value to increase distance between aliens | -| HITSLIMIT (default 0) | Seconds of CPU time to wait before shooting | -| UPDATETIME (default 1) | Seconds to wait before update PODs status (you can set also 0.x Es: 0.5) | - ### Install with HELM ``` @@ -46,10 +36,20 @@ kubectl create namespace kubeinvaders helm install kubeinvaders --set-string target_namespace="namespace1\,namespace2" \ --namespace kubeinvaders ./helm-charts/kubeinvaders \ ---set ingress.hostname=kubeinvaders.io +--set ingress.hostName=kubeinvaders.io ``` +### Environment Variables - Make the game more difficult to win! + +Set the following variables in Kubernetes Deployment or Openshift DeploymentConfig + +| ENV Var | Description | +|-----------------------------|-------------------------------------------------------------------------------| +| ALIENPROXIMITY (default 15) | Reduce the value to increase distance between aliens | +| HITSLIMIT (default 0) | Seconds of CPU time to wait before shooting | +| UPDATETIME (default 1) | Seconds to wait before update PODs status (you can set also 0.x Es: 0.5) | + ### Install client on your workstation The easy way to install KubeInvader is run it on you workstation. diff --git a/helm-charts/kubeinvaders/templates/NOTES.txt b/helm-charts/kubeinvaders/templates/NOTES.txt index 83d57ee..a37870b 100644 --- a/helm-charts/kubeinvaders/templates/NOTES.txt +++ b/helm-charts/kubeinvaders/templates/NOTES.txt @@ -1,21 +1,4 @@ Thank you for installing KubeInvaders! {{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "kubeinvaders.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "kubeinvaders.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "kubeinvaders.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "kubeinvaders.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 +Visit http://{{ .Values.ingress.hostName }} {{- end }} diff --git a/helm-charts/kubeinvaders/templates/deployment.yaml b/helm-charts/kubeinvaders/templates/deployment.yaml index a85eb63..93bea62 100644 --- a/helm-charts/kubeinvaders/templates/deployment.yaml +++ b/helm-charts/kubeinvaders/templates/deployment.yaml @@ -22,7 +22,7 @@ spec: containers: - env: - name: ROUTE_HOST - value: "{{ .Values.ingress.hostname }}" + value: "{{ .Values.ingress.hostName }}" - name: NAMESPACE value: {{ .Values.target_namespace }} - name: TOKEN diff --git a/helm-charts/kubeinvaders/templates/ingress.yaml b/helm-charts/kubeinvaders/templates/ingress.yaml index 6898b70..fb7358f 100644 --- a/helm-charts/kubeinvaders/templates/ingress.yaml +++ b/helm-charts/kubeinvaders/templates/ingress.yaml @@ -1,3 +1,5 @@ +{{- if .Values.ingress.enabled -}} + apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -14,13 +16,14 @@ metadata: spec: tls: - hosts: - - {{ .Values.ingress.hostname | quote }} + - {{ .Values.ingress.hostName | quote }} secretName: {{ .Values.ingress.secretName }} rules: - - host: {{ .Values.ingress.hostname }} + - host: {{ .Values.ingress.hostName }} http: paths: - path: / backend: serviceName: kubeinvaders servicePort: 8080 +{{- end }} diff --git a/helm-charts/kubeinvaders/values.yaml b/helm-charts/kubeinvaders/values.yaml index 90d6c7f..d528ebf 100644 --- a/helm-charts/kubeinvaders/values.yaml +++ b/helm-charts/kubeinvaders/values.yaml @@ -40,9 +40,9 @@ ingress: enabled: true annotations: nginx.ingress.kubernetes.io/ssl-redirect: "true" - hostName: + hostName: kubeinvaders.local tls: - + # secretName: kubeinvaders.local resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/helm-charts/kubeinvaderss-0.2.8.tar.gz b/helm-charts/kubeinvaderss-0.2.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8df2c9c39cf4ba6cdcaeb2589bc26d0ad4962a25 GIT binary patch literal 3570 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 literal 0 HcmV?d00001