release v1.2.0 (#39)

release v1.2.0

.gitignore

@@ -0,0 +1 @@
+.idea

README.md

@@ -49,5 +49,7 @@ os_arch=amd64
 
 ### Build dependence image
 ```bash
+wget https://kubecube.nos-eastchina1.126.net/helm/helm-v3.5.4-linux-amd64.tar.gz -O helm.tar.gz
 docker build -f ./dependence.Dockerfile -t hub.c.163.com/kubecube/warden-dependence:latest .
+rm ./helm.tar.gz
 ```

dependence.Dockerfile

@@ -19,12 +19,13 @@ ARG arch=amd64
 ARG kubectl_version=v1.22.2
 
 # load dependces into image
-COPY hnc/hnc.yaml /etc/kubecube/manifests/hnc/hnc.yaml
-COPY ingress-controller/ingress-controller.yaml /etc/kubecube/manifests/ingress-controller/ingress-controller.yaml
-COPY local-path-storage/local-path-storage.yaml /etc/kubecube/manifests/local-path-storage/local-path-storage.yaml
-COPY metrics-server/metrics-server.yaml /etc/kubecube/manifests/metrics-server/metrics-server.yaml
+COPY kubecube /etc/kubecube/manifests/kubecube
 COPY install_third_dependence.sh install_third_dependence.sh
 
+# add helm bin
+ADD helm.tar.gz .
+RUN chmod +x ./linux-${arch}/helm && mv ./linux-${arch}/helm /bin/helm
+
 # downloads kubectl
 RUN wget https://storage.googleapis.com/kubernetes-release/release/${kubectl_version}/bin/linux/${arch}/kubectl --no-check-certificate
 RUN chmod +x kubectl && mv kubectl /bin/kubectl

entry.sh

@@ -42,7 +42,7 @@ function env_check() {
     fi
 
     echo -e "\033[32m|---------------------------------------------------------------------|\033[0m"
-    echo -e "\033[32m|     sshpass     |    conntrack    |      unzip    |  libseccomp_has |\033[0m"
+    echo -e "\033[32m|     sshpass     |    conntrack    |      unzip    |  libseccomp     |\033[0m"
     echo -e "\033[32m|---------------------------------------------------------------------|\033[0m"
     echo -e "\033[32m|     ${sshpass_has}           |    ${conntrack_has}            |      ${unzip_has}        |         ${libseccomp_has}       |\033[0m"
     echo -e "\033[32m|---------------------------------------------------------------------|\033[0m"
@@ -64,7 +64,7 @@ if [ -e "./manifests" ]; then
   echo -e "$(date +'%Y-%m-%d %H:%M:%S') \033[32mINFO\033[0m manifests already exist"
 else
   echo -e "$(date +'%Y-%m-%d %H:%M:%S') \033[32mINFO\033[0m downloading manifests for kubecube"
-  wget https://kubecube.nos-eastchina1.126.net/kubecube-installer/v1.1/manifests.tar.gz -O manifests.tar.gz
+  wget https://kubecube.nos-eastchina1.126.net/kubecube-installer/v1.2/manifests.tar.gz -O manifests.tar.gz
 
   tar -xzvf manifests.tar.gz > /dev/null
 fi
@@ -75,9 +75,7 @@ if [[ ${CUSTOMIZE} = "true" ]]; then
   echo -e "\033[32m 'cd /etc/kubecube/manifests'                   \033[0m"
   echo -e "\033[32m 2. Please modify install.conf                  \033[0m"
   echo -e "\033[32m 'vi install.conf'                              \033[0m"
-  echo -e "\033[32m 3. Please modify cube.conf(optional)           \033[0m"
-  echo -e "\033[32m 'vi cube.conf'                                 \033[0m"
-  echo -e "\033[32m 4. Confirm every args then do command below:   \033[0m"
+  echo -e "\033[32m 3. Confirm every args then do command below:   \033[0m"
   echo -e "\033[32m '/bin/bash install.sh'                         \033[0m"
   echo -e "\033[32m================================================\033[0m"
   exit 0