From 261fb8f29d079d179e59df7451d00e6dbb2f3518 Mon Sep 17 00:00:00 2001
From: "Roland.Ma" <rolandma@yunify.com>
Date: Fri, 3 Sep 2021 06:08:27 +0000
Subject: [PATCH] package gateway helm chart into docker image

Signed-off-by: Roland.Ma <rolandma@yunify.com>
---
 build/ks-controller-manager/Dockerfile | 14 +++++++++++++-
 config/watches.yaml                    | 14 ++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 config/watches.yaml

diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile
index fb61a6e61..131546757 100644
--- a/build/ks-controller-manager/Dockerfile
+++ b/build/ks-controller-manager/Dockerfile
@@ -9,9 +9,11 @@ ARG TARGETARCH
 ARG TARGETOS
 ARG HELM_VERSION=v3.5.2
 ARG KUSTOMIZE_VERSION=v4.2.0
+ARG INGRESS_NGINX_VERSION=3.35.0
 
 ENV OUTDIR=/out
 RUN mkdir -p ${OUTDIR}/usr/local/bin
+RUN mkdir -p ${OUTDIR}/var/helm-charts
 
 WORKDIR /tmp
 
@@ -26,7 +28,12 @@ RUN mv /tmp/${TARGETOS}-${TARGETARCH}/helm ${OUTDIR}/usr/local/bin/
 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz /tmp
 RUN tar xvzf /tmp/kustomize_${KUSTOMIZE_VERSION}_linux_${TARGETARCH}.tar.gz -C /tmp
 RUN mv /tmp/kustomize ${OUTDIR}/usr/local/bin/
-    
+
+
+# Install Nginx Ingress Helm Chart
+ADD https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-${INGRESS_NGINX_VERSION}/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz /tmp
+RUN tar xvzf /tmp/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz -C /tmp
+RUN mv /tmp/ingress-nginx ${OUTDIR}/var/helm-charts/
 
 # Build
 
@@ -34,6 +41,7 @@ FROM golang:1.16.3 as build_context
 
 ENV OUTDIR=/out
 RUN mkdir -p ${OUTDIR}/usr/local/bin/
+RUN mkdir -p ${OUTDIR}/var/helm-charts
 
 WORKDIR /workspace
 ADD . /workspace/
@@ -41,6 +49,10 @@ ADD . /workspace/
 RUN make ks-controller-manager
 RUN mv /workspace/bin/cmd/controller-manager ${OUTDIR}/usr/local/bin/
 
+# Copy gateway config and helm chart
+RUN mv /workspace/config/gateway ${OUTDIR}/var/helm-charts/
+RUN mv /workspace/config/watches.yaml ${OUTDIR}/var/helm-charts/
+
 # Final Image
 
 FROM alpine:3.11 
diff --git a/config/watches.yaml b/config/watches.yaml
new file mode 100644
index 000000000..0da18700b
--- /dev/null
+++ b/config/watches.yaml
@@ -0,0 +1,14 @@
+# Use the 'create api' subcommand to add watches to this file.
+- group: gateway.kubesphere.io
+  version: v1alpha1
+  kind: Nginx
+  chart: /var/helm-charts/ingress-nginx
+- group: gateway.kubesphere.io
+  version: v1alpha1
+  kind: Gateway
+  chart: /var/helm-charts/gateway
+# uncomment the following 2 lines, if only allow to run global scope or namespaced scope.
+# Leave the option to CR, when allow to run global and namespaced together.
+  # overrideValues:
+  #   controller.scope.enabled: $SCOPE_ENABLED
+#+kubebuilder:scaffold:watch