route_host is not needed anymore

This commit is contained in:
Eugenio Marzo
2021-07-07 23:49:53 +02:00
parent e3ca22485f
commit 98a073438c
7 changed files with 13 additions and 8 deletions

2
Vagrantfile vendored
View File

@@ -61,7 +61,7 @@ Vagrant.configure('2') do |config|
docker rm kubeinvaders -f
docker run -d -v /vagrant/scripts:/usr/local/openresty/nginx/conf/kubeinvaders -p 8080:8080 \
--restart always --name kubeinvaders --env KUBERNETES_SERVICE_HOST=192.168.58.99 --env KUBERNETES_SERVICE_PORT=8443\
--env ROUTE_HOST=kubeinvaders.io --env ENDPOINT=kubeinvaders.io \
--env ENDPOINT=kubeinvaders.io \
--env TOKEN=#{ ENV['KUBEINVADERS_DEV_TOKEN']} --env NAMESPACE="namespace1,namespace2" \
kubeinvaders-dev
SCRIPT

View File

@@ -5,4 +5,4 @@ echo "script for developing on OpenResty component of KubeInvaders"
docker build . -t kubeinvaders-dev
(docker ps | grep kubeinvaders-openresty) && sudo docker rm kubeinvaders-openresty -f
docker run -d -v $PWD/scripts:/usr/local/openresty/nginx/conf/kubeinvaders -p 8080:8080 \
--restart always --name kubeinvaders-openresty --env KUBERNETES_SERVICE_HOST=192.168.178.35 --env KUBERNETES_SERVICE_PORT=6443 --env ROUTE_HOST=192.168.178.35 --env ENDPOINT=192.168.178.35 --env K8S_TOKEN=$K8S_TOKEN --env NAMESPACE="namespace1,namespace2" kubeinvaders-dev
--restart always --name kubeinvaders-openresty --env KUBERNETES_SERVICE_HOST=192.168.178.35 --env KUBERNETES_SERVICE_PORT=6443 --env ENDPOINT=192.168.178.35 --env K8S_TOKEN=$K8S_TOKEN --env NAMESPACE="namespace1,namespace2" kubeinvaders-dev

View File

@@ -0,0 +1,8 @@
#!/bin/bash
docker build . -t docker.io/luckysideburn/kubeinvaders:develop
docker push luckysideburn/kubeinvaders:develop
kubectl create namespace kubeinvaders
export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
helm upgrade kubeinvaders --set-string target_namespace="namespace1\,namespace2" -n kubeinvaders ./helm-charts/kubeinvaders/ --set service.type="NodePort" --set nodePort.setPortUrl="true" --set nodePort.hostName=kubeinvaders.io --set ingress.enabled=false --set image.tag=develop -i
kubectl delete pod --all -n kubeinvaders

View File

@@ -4,5 +4,5 @@ docker build . -t docker.io/luckysideburn/kubeinvaders:develop
docker push luckysideburn/kubeinvaders:develop
kubectl create namespace kubeinvaders
export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
helm upgrade kubeinvaders --set-string target_namespace="namespace1\,namespace2" -n kubeinvaders ./helm-charts/kubeinvaders/ --set service.type="NodePort" --set ingress.hostName=kubeinvaders.io --set image.tag=develop -i
helm upgrade kubeinvaders --set-string target_namespace="namespace1\,namespace2" -n kubeinvaders ./helm-charts/kubeinvaders/ --set service.type="NodePort" --set image.tag=develop -i
kubectl delete pod --all -n kubeinvaders

View File

@@ -1,4 +1,4 @@
Thank you for installing KubeInvaders!
{{- if .Values.ingress.enabled }}
Visit http://{{ .Values.ingress.hostName }}
Visit https://{{ .Values.ingress.hostName }}
{{- end }}

View File

@@ -24,8 +24,6 @@ spec:
- env:
- name: ENDPOINT
value: "{{ .Values.ingress.hostName }}"
- name: ROUTE_HOST
value: "{{ .Values.ingress.hostName }}"
- name: NAMESPACE
value: {{ .Values.target_namespace }}
name: {{ .Chart.Name }}

View File

@@ -40,8 +40,7 @@ ingress:
annotations:
nginx.ingress.kubernetes.io/ssl-redirect: "true"
hostName: kubeinvaders.local
tls:
# secretName: kubeinvaders.local
tls: {}
resources: {}
nodeSelector: {}