Merge pull request #2266 from mohamed-rafraf/controller-refactor

Refactoring the code of Controller
kubesphere · Feb 20, 2024 · 4ef6750 · 4ef6750
2 parents ef79bee + 4522b71
commit 4ef6750
Show file tree

Hide file tree

Showing 12 changed files with 743 additions and 730 deletions.
diff --git a/.github/workflows/e2e-TEST.yml b/.github/workflows/e2e-TEST.yml
@@ -35,7 +35,7 @@ jobs:
       run: |
         echo ${{ github.base_ref }}
         tag=${{ github.base_ref }} && sed -i "2idev_tag\: $tag" roles/download/defaults/main.yml && sed -i "/    \"version\"/s/\:.*/\: \"$tag\"/g" controller/installRunner.py
-        docker build . --file Dockerfile --tag ks-installer
+        docker build . --file Dockerfile.complete --tag ks-installer
       
     - name: Build image (push)
       if: ${{ github.event_name == 'push' }}

diff --git a/Dockerfile.complete b/Dockerfile.complete
@@ -35,12 +35,12 @@ RUN apk --no-cache add jq yq bash curl unzip openssl && \
     adduser -D -g kubesphere -u 1002 kubesphere
 
 COPY --from=0 /go/src/github.com/flant/shell-operator/shell-operator /
-ADD controller/* /hooks/kubesphere/
+COPY controller/ /hooks/kubesphere/
 
 RUN chown -R kubesphere:kubesphere /shell-operator && \
     chown -R kubesphere:kubesphere /hooks && \
     chown -R kubesphere:kubesphere /kubesphere && \
-    chmod +x -R /hooks/kubesphere
+    chmod +x  /hooks/kubesphere/installRunner.py
 
 USER kubesphere