diff --git a/README.md b/README.md index cdd0cb1..3ab28a8 100644 --- a/README.md +++ b/README.md @@ -56,8 +56,13 @@ Create .KubeInv.json file on your home. This is an example: ### Install with HELM! ``` -# Please set target_namespace to set your target namespace! -helm install --set-string target_namespace="namespace1\,namespace2" --name kubeinvaders --namespace kubeinvaders ./helm-charts/kubeinvaders +# Set target_namespace and ingress.hostname! + +kubectl create namespace kubeinvaders +helm install kubeinvaders --set-string target_namespace="namespace1\,namespace2" \ +--namespace kubeinvaders ./helm-charts/kubeinvaders \ +--set ingress.hostname=kubeinvaders.io + ``` ### Install KubeInvaders on Openshift diff --git a/helm-charts/kubeinvaders-0.2.8.tar.gz b/helm-charts/kubeinvaders-0.2.8.tar.gz index a530c82..234a1c0 100644 Binary files a/helm-charts/kubeinvaders-0.2.8.tar.gz and b/helm-charts/kubeinvaders-0.2.8.tar.gz differ diff --git a/helm-charts/kubeinvaders/templates/NOTES.txt b/helm-charts/kubeinvaders/templates/NOTES.txt index 3069fc5..83d57ee 100644 --- a/helm-charts/kubeinvaders/templates/NOTES.txt +++ b/helm-charts/kubeinvaders/templates/NOTES.txt @@ -1,4 +1,4 @@ -1. Get the application URL by running these commands: +Thank you for installing KubeInvaders! {{- if .Values.ingress.enabled }} {{- range $host := .Values.ingress.hosts }} {{- range .paths }} diff --git a/helm-charts/kubeinvaders/templates/deployment.yaml b/helm-charts/kubeinvaders/templates/deployment.yaml index a8f300f..a85eb63 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.route_host }}" + 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 d4523fa..6898b70 100644 --- a/helm-charts/kubeinvaders/templates/ingress.yaml +++ b/helm-charts/kubeinvaders/templates/ingress.yaml @@ -1,4 +1,3 @@ -{{- if .Values.ingress.enabled -}} apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -13,26 +12,15 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: -{{- if .Values.ingress.tls }} tls: - {{- range .Values.ingress.tls }} - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} + - {{ .Values.ingress.hostname | quote }} + secretName: {{ .Values.ingress.secretName }} rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ . }} - backend: - serviceName: kubeinvaders - servicePort: http - {{- end }} - {{- end }} -{{- end }} + - host: {{ .Values.ingress.hostname }} + http: + paths: + - path: / + backend: + serviceName: kubeinvaders + servicePort: 8080 diff --git a/helm-charts/kubeinvaders/templates/rbac-role.yaml b/helm-charts/kubeinvaders/templates/rbac-role.yaml index d3ba271..c9b8310 100644 --- a/helm-charts/kubeinvaders/templates/rbac-role.yaml +++ b/helm-charts/kubeinvaders/templates/rbac-role.yaml @@ -1,10 +1,8 @@ -{{- if and .Values.rbac.create (eq .Values.clusterRole.create false) -}} -{{- range $namespace := (append .Values.allowedNamespaces .Release.Namespace) }} kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: name: kubeinvaders-role - namespace: {{ $namespace }} + namespace: {{ .Release.Namespace }} labels: app: kubeinvaders chart: {{ template "kubeinvaders.chart" $ }} @@ -12,17 +10,14 @@ metadata: heritage: {{ $.Release.Service }} rules: - apiGroups: [""] - resources: ["pods"] - verbs: ["get", "watch", "list", "delete"] -- apiGroups: [""] - resources: ["pods/log"] - verbs: ["get", "watch", "list"] + resources: ["pods", "pods/log"] + verbs: ["get", "list", "delete"] --- kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: name: kubeinvaders-rolebinding - namespace: {{ $namespace }} + namespace: {{ .Release.Namespace }} labels: app: kubeinvaders chart: {{ template "kubeinvaders.chart" $ }} @@ -31,10 +26,8 @@ metadata: subjects: - kind: ServiceAccount name: {{ template "kubeinvaders.serviceAccountName" $ }} - namespace: {{ $namespace }} + namespace: {{ .Release.Namespace }} roleRef: kind: Role name: kubeinvaders-role apiGroup: rbac.authorization.k8s.io -{{- end -}} -{{- end -}} diff --git a/helm-charts/kubeinvaders/templates/rbac.yaml b/helm-charts/kubeinvaders/templates/rbac.yaml index 96a7934..d80aa07 100644 --- a/helm-charts/kubeinvaders/templates/rbac.yaml +++ b/helm-charts/kubeinvaders/templates/rbac.yaml @@ -11,7 +11,7 @@ metadata: heritage: {{ .Release.Service }} rules: - apiGroups: [""] - resources: ["pods"] + resources: ["pods","pods/log"] verbs: ["get", "watch", "list", "delete"] {{- end -}} {{- if or .Values.clusterRole.create .Values.clusterRole.name }} diff --git a/helm-charts/kubeinvaders/values.yaml b/helm-charts/kubeinvaders/values.yaml index 276977d..90d6c7f 100644 --- a/helm-charts/kubeinvaders/values.yaml +++ b/helm-charts/kubeinvaders/values.yaml @@ -40,14 +40,8 @@ ingress: enabled: true annotations: nginx.ingress.kubernetes.io/ssl-redirect: "true" - hosts: - - host: kubeinvaders.local - paths: ["/"] - + hostName: tls: - - secretName: chart-example-tls - hosts: - - chart-example.local resources: {} @@ -65,8 +59,9 @@ resources: {} nodeSelector: {} tolerations: [] -route_host: kubeinvaders.local +route_host: kubernetes.default.svc target_namespace: "foobar" hitslimit: 1 alienproximity: 15 updatetime: 1 +