fix

lucky-sideburn · Sep 11, 2024 · 7074222 · 7074222
1 parent 28939cd
commit 7074222
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,36 @@
-FROM 10.10.10.3:5000/local/kubeinvaders_base:develop
+FROM nginx:stable
+
+# Update repo and install some utilities and prerequisites
+RUN apt-get update -y
+RUN apt-get -y install wget at procps gnupg ca-certificates jq openssl task-spooler apt-transport-https python3 python3-pip redis libssl-dev  python3-yaml python3-kubernetes python3-redis python3-requests
+
+# Install kubectl
+RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
+RUN chmod +x ./kubectl
+RUN mv ./kubectl /usr/local/bin/kubectl
+
+# Install Openresty
+RUN wget -O - https://openresty.org/package/pubkey.gpg | apt-key add -
+RUN codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release` && echo "deb http://openresty.org/package/debian $codename openresty" | tee /etc/apt/sources.list.d/openresty.list
+RUN apt-get update -y
+RUN apt-get -y install openresty
+RUN chmod 777 /usr/local/openresty/nginx
+
+# Install LUA Module
+RUN apt-get -y install luarocks lua-json lua-socket libyaml-dev
+RUN apt-get update --fix-missing
+
+RUN for pkg in luasec lunajson lyaml; do luarocks install $pkg; done
+
+# Install kube-linter
+RUN curl -L -O https://github.com/stackrox/kube-linter/releases/download/0.6.0/kube-linter-linux.tar.gz
+RUN tar -xvf kube-linter-linux.tar.gz && rm -f kube-linter-linux.tar.gz
+RUN cp kube-linter /usr/local/bin/ && chmod 775 /usr/local/bin/kube-linter
+RUN mkdir /tmp/kube-linter-pods && chmod 777 /tmp/kube-linter-pods
+
+# Installl parser script for kubelinter
+COPY kube-linter/kube-linter-parser.sh /opt/kube-linter-parser.sh
+RUN chmod +x /opt/kube-linter-parser.sh
 
 # Install KubeInvaders (html and js)
 COPY html5/ /var/www/html
@@ -39,4 +71,6 @@ COPY ./entrypoint.sh /
 
 RUN chmod a+rwx ./entrypoint.sh
 
+RUN apt clean && rm -rf /var/lib/apt/lists/*
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Dockerfile_full b/Dockerfile_full
@@ -2,9 +2,7 @@ FROM nginx:stable
 
 # Update repo and install some utilities and prerequisites
 RUN apt-get update -y
-RUN apt-get -y install git vim wget curl at gnupg procps
-RUN apt-get -y install ca-certificates jq openssl task-spooler apt-transport-https python3 python3-pip redis libssl-dev
-RUN apt-get -y install python3-yaml python3-kubernetes python3-redis python3-requests
+RUN apt-get -y install wget at procps gnupg ca-certificates jq openssl task-spooler apt-transport-https python3 python3-pip redis libssl-dev  python3-yaml python3-kubernetes python3-redis python3-requests
 
 # Install kubectl
 RUN curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
@@ -21,9 +19,8 @@ RUN chmod 777 /usr/local/openresty/nginx
 # Install LUA Module
 RUN apt-get -y install luarocks lua-json lua-socket libyaml-dev
 RUN apt-get update --fix-missing
-RUN luarocks install luasec
-RUN luarocks install lunajson
-RUN luarocks install lyaml
+
+RUN for pkg in luasec lunajson lyaml; do luarocks install $pkg; done
 
 # Install kube-linter
 RUN curl -L -O https://github.com/stackrox/kube-linter/releases/download/0.6.0/kube-linter-linux.tar.gz
@@ -74,4 +71,6 @@ COPY ./entrypoint.sh /
 
 RUN chmod a+rwx ./entrypoint.sh
 
+RUN apt clean && rm -rf /var/lib/apt/lists/*
+
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/README.md b/README.md
@@ -197,8 +197,15 @@ helm repo update
 
 kubectl create namespace kubeinvaders
 
+# With ingress and TLS enabled
 helm install kubeinvaders --set-string config.target_namespace="namespace1\,namespace2" \
 -n kubeinvaders kubeinvaders/kubeinvaders --set ingress.enabled=true --set ingress.hostName=kubeinvaders.io --set deployment.image.tag=latest
+
+# With ingress enabled but TLS disabled (in case you have a reverse-proxy that does TLS termination and nginx controller in http)
+
+helm install kubeinvaders --set-string config.target_namespace="namespace1\,namespace2" \
+-n kubeinvaders kubeinvaders/kubeinvaders --set ingress.enabled=true --set ingress.tls_enabled=false --set ingress.hostName=kubeinvaders.io --set deployment.image.tag=latest
+
 ```
 
 ### Example for K3S

diff --git a/helm-charts/kubeinvaders/kubeinvaders-1.9.7.tgz b/helm-charts/kubeinvaders/kubeinvaders-1.9.7.tgz
diff --git a/helm-charts/kubeinvaders/templates/ingress.yaml b/helm-charts/kubeinvaders/templates/ingress.yaml
@@ -18,9 +18,11 @@ metadata:
 spec:
   ingressClassName: {{ .Values.ingress.className }}
   tls:
+  {{- if .Values.ingress.tls_enabled -}}
     - hosts:
       - {{ .Values.ingress.hostName | quote }}
       secretName: {{ .Values.ingress.secretName }}
+  {{- end }}
   rules:
   - host: {{ .Values.ingress.hostName }}
     http:

diff --git a/helm-charts/kubeinvaders/values.yaml b/helm-charts/kubeinvaders/values.yaml
@@ -66,6 +66,7 @@ ingress:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
   hostName: ""
   tls: {}
+  tls_enabled: true
 
 # Use route_host only if ingress is disabled - please specify also the port like route_host: "kubeinvaders.example.com:8080"
 # The port must be the same of the NodePort service