From 9734ccbfc8868242997b26ed25262aa635120ed2 Mon Sep 17 00:00:00 2001
From: huiwq1990 <huiwq1990@163.com>
Date: Wed, 2 Mar 2022 10:22:43 +0800
Subject: [PATCH] fix

---
 Dockerfile                                                | 5 ++++-
 backend/scripts/pod_start.sh                              | 2 +-
 {config => charts/yurt-dashboard/crds}/user_crd.yaml      | 6 ------
 .../yurt-dashboard/templates}/user_controller.yaml        | 8 +++-----
 charts/yurt-dashboard/values.yaml                         | 7 +++++++
 5 files changed, 15 insertions(+), 13 deletions(-)
 rename {config => charts/yurt-dashboard/crds}/user_crd.yaml (97%)
 rename {config => charts/yurt-dashboard/templates}/user_controller.yaml (91%)

diff --git a/Dockerfile b/Dockerfile
index f72718f..ccd916d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod readonly -a  -o apiserve
 ##Build ui
 FROM node:14.17.6-alpine3.14 as build-ui
 
-RUN apk update && apk add bash
+#RUN apk update && apk add bash
 
 WORKDIR /workspace
 
@@ -29,6 +29,9 @@ WORKDIR /openyurt/backend/
 COPY --from=builder /workspace/config config
 COPY --from=builder /workspace/apiserver .
 COPY --from=builder /workspace/scripts/pod_start.sh pod_start.sh
+RUN chmod +x pod_start.sh
+RUN chmod +x apiserver
+
 COPY --from=build-ui /workspace/build ../../frontend/build
 
 CMD [ "sh", "-c", "./pod_start.sh"]
\ No newline at end of file
diff --git a/backend/scripts/pod_start.sh b/backend/scripts/pod_start.sh
index b8df529..0de2fa1 100644
--- a/backend/scripts/pod_start.sh
+++ b/backend/scripts/pod_start.sh
@@ -25,7 +25,7 @@ users:
 - name: default-user
   user:
     token: ${token}
-" > kubeconfig.conf
+" > /openyurt/config/kubeconfig.conf
 
 cd /openyurt/backend/
 ./apiserver
\ No newline at end of file
diff --git a/config/user_crd.yaml b/charts/yurt-dashboard/crds/user_crd.yaml
similarity index 97%
rename from config/user_crd.yaml
rename to charts/yurt-dashboard/crds/user_crd.yaml
index b298222..8d1d206 100644
--- a/config/user_crd.yaml
+++ b/charts/yurt-dashboard/crds/user_crd.yaml
@@ -1,9 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: yurt-user-controller-system
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
diff --git a/config/user_controller.yaml b/charts/yurt-dashboard/templates/user_controller.yaml
similarity index 91%
rename from config/user_controller.yaml
rename to charts/yurt-dashboard/templates/user_controller.yaml
index 0a2d7c4..d805dea 100644
--- a/config/user_controller.yaml
+++ b/charts/yurt-dashboard/templates/user_controller.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: yurt-user-controller-controller-manager
-  namespace: yurt-user-controller-system
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -10,7 +9,6 @@ metadata:
   labels:
     control-plane: controller-manager
   name: yurt-user-controller-controller-manager
-  namespace: yurt-user-controller-system
 spec:
   replicas: 1
   selector:
@@ -44,8 +42,8 @@ spec:
             - --user-valid-period=7
           command:
             - /manager
-          image: openyurt/yurt-user-controller:test
-          imagePullPolicy: IfNotPresent
+          image: "{{ .Values.usercontroller.image.repository }}:{{ .Values.usercontroller.image.tag }}"
+          imagePullPolicy: {{ .Values.usercontroller.image.pullPolicy }}
           livenessProbe:
             httpGet:
               path: /healthz
@@ -80,7 +78,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: yurt-user-controller-controller-manager
-    namespace: yurt-user-controller-system
+    namespace: {{ .Release.Namespace | quote }}
 roleRef:
   kind: ClusterRole
   name: cluster-admin
diff --git a/charts/yurt-dashboard/values.yaml b/charts/yurt-dashboard/values.yaml
index 4f3491e..da9546f 100644
--- a/charts/yurt-dashboard/values.yaml
+++ b/charts/yurt-dashboard/values.yaml
@@ -2,6 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+imagePullSecrets: []
 replicaCount: 1
 
 image:
@@ -14,3 +15,9 @@ service:
 ingress:
   host: dashboard.yurt.local
 
+usercontroller:
+  image:
+    repository: openyurt/yurt-dashboard
+    pullPolicy: IfNotPresent
+    tag: 0.0.6
+