Modify images (#17)

* Feature add configmap * Feature hotplug * Feature add crd label * fix(charts): change thanos' chart name to kubecube-thanos * modify front version from v1.0.0 to v1.0.1 * mv images.list to oss * remove images.list * fix cmd less * skip download if docker binary already exist * modify images * move images.list back and modify frontend image * add auth configmap (#12) * add auth configmap * fix param with value * fix Cg== to empty string * feat(monitoring): 1. upgrade kubecube-monitoring helm chart (#14) 2. add pre-fetch images Signed-off-by: just1900 <[email protected]> * fix image of cube to v1.0.1 (#15) * modify webconsole to v1.0.1, audit to v1.0.1, frontend to v1.0.2 Co-authored-by: fusida <[email protected]> Co-authored-by: zhujianfeng <[email protected]> Co-authored-by: just1900 <[email protected]> Co-authored-by: JiahuiZhao11 <[email protected]>
kubecube-io · Sep 3, 2021 · 4901b89 · 4901b89
1 parent 5d377d1
commit 4901b89
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ All manifests for deploying kubecube, deploy details please follow [doc](https:/
 ## Quick start
 set version
 ```bash
-KUBECUBE_VERSION=v1.0.0-rc0
+KUBECUBE_VERSION=v1.0.0
 ```
 
 ### All in one install

diff --git a/audit/audit.yaml b/audit/audit.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: kubecube-audit
-          image: hub.c.163.com/kubecube/audit:v1.0.0-rc0
+          image: hub.c.163.com/kubecube/audit:v1.0.1
           ports:
             - containerPort: 8888
           env:

diff --git a/frontend/frontend.yaml b/frontend/frontend.yaml
@@ -144,7 +144,7 @@ spec:
     spec:
       containers:
         - name: nginx
-          image: hub.c.163.com/kubecube/frontend:0.01-beta
+          image: hub.c.163.com/kubecube/frontend:v1.0.2
           lifecycle:
             preStop:
               exec:

diff --git a/images/v1.18.20/images.list b/images/v1.18.20/images.list
@@ -1,8 +1,8 @@
-hub.c.163.com/kubecube/audit:v1.0.0
-hub.c.163.com/kubecube/cloudshell:v1.0.0
-hub.c.163.com/kubecube/webconsole:v1.0.0
-hub.c.163.com/kubecube/frontend:v1.0.0
-hub.c.163.com/kubecube/cube:v1.0.0
+hub.c.163.com/kubecube/audit:v1.0.1
+hub.c.163.com/kubecube/cloudshell:v1.0.1
+hub.c.163.com/kubecube/webconsole:v1.0.1
+hub.c.163.com/kubecube/frontend:v1.0.2
+hub.c.163.com/kubecube/cube:v1.0.1
 hub.c.163.com/kubecube/warden:v1.0.0
 hub.c.163.com/kubecube/warden-init:v1.0.0
 hub.c.163.com/kubecube/alertmanager:v0.21.0
@@ -12,7 +12,9 @@ hub.c.163.com/kubecube/grafana:7.5.5
 hub.c.163.com/kubecube/kube-state-metrics:v1.9.8
 hub.c.163.com/kubecube/prometheus-operator:v0.47.0
 hub.c.163.com/kubecube/node-exporter:v1.1.2
-hub.c.163.com/kubecube/prometheus:v2.26.0
+hub.c.163.com/kubecube/prometheus:v2.26.1
+hub.c.163.com/kubecube/thanos:v0.22.0
+hub.c.163.com/kubecube/kubectl-tools:1.21.0
 hub.c.163.com/kubecube/hnc/hnc-manager:v0.8.0-kubecube.1
 hub.c.163.com/kubecube/ingress-nginx/controller:v0.46.0-m
 hub.c.163.com/kubecube/calico/node:v3.19.1-m

diff --git a/images/v1.19.13/images.list b/images/v1.19.13/images.list
@@ -1,8 +1,8 @@
-hub.c.163.com/kubecube/audit:v1.0.0
-hub.c.163.com/kubecube/cloudshell:v1.0.0
-hub.c.163.com/kubecube/webconsole:v1.0.0
-hub.c.163.com/kubecube/frontend:v1.0.0
-hub.c.163.com/kubecube/cube:v1.0.0
+hub.c.163.com/kubecube/audit:v1.0.1
+hub.c.163.com/kubecube/cloudshell:v1.0.1
+hub.c.163.com/kubecube/webconsole:v1.0.1
+hub.c.163.com/kubecube/frontend:v1.0.2
+hub.c.163.com/kubecube/cube:v1.0.1
 hub.c.163.com/kubecube/warden:v1.0.0
 hub.c.163.com/kubecube/warden-init:v1.0.0
 hub.c.163.com/kubecube/alertmanager:v0.21.0
@@ -12,7 +12,9 @@ hub.c.163.com/kubecube/grafana:7.5.5
 hub.c.163.com/kubecube/kube-state-metrics:v1.9.8
 hub.c.163.com/kubecube/prometheus-operator:v0.47.0
 hub.c.163.com/kubecube/node-exporter:v1.1.2
-hub.c.163.com/kubecube/prometheus:v2.26.0
+hub.c.163.com/kubecube/prometheus:v2.26.1
+hub.c.163.com/kubecube/thanos:v0.22.0
+hub.c.163.com/kubecube/kubectl-tools:1.21.0
 hub.c.163.com/kubecube/hnc/hnc-manager:v0.8.0-kubecube.1
 hub.c.163.com/kubecube/ingress-nginx/controller:v0.46.0-m
 hub.c.163.com/kubecube/calico/node:v3.19.1-m

diff --git a/images/v1.20.9/images.list b/images/v1.20.9/images.list
@@ -1,8 +1,8 @@
-hub.c.163.com/kubecube/audit:v1.0.0
-hub.c.163.com/kubecube/cloudshell:v1.0.0
-hub.c.163.com/kubecube/webconsole:v1.0.0
-hub.c.163.com/kubecube/frontend:v1.0.0
-hub.c.163.com/kubecube/cube:v1.0.0
+hub.c.163.com/kubecube/audit:v1.0.1
+hub.c.163.com/kubecube/cloudshell:v1.0.1
+hub.c.163.com/kubecube/webconsole:v1.0.1
+hub.c.163.com/kubecube/frontend:v1.0.2
+hub.c.163.com/kubecube/cube:v1.0.1
 hub.c.163.com/kubecube/warden:v1.0.0
 hub.c.163.com/kubecube/warden-init:v1.0.0
 hub.c.163.com/kubecube/alertmanager:v0.21.0
@@ -12,7 +12,9 @@ hub.c.163.com/kubecube/grafana:7.5.5
 hub.c.163.com/kubecube/kube-state-metrics:v1.9.8
 hub.c.163.com/kubecube/prometheus-operator:v0.47.0
 hub.c.163.com/kubecube/node-exporter:v1.1.2
-hub.c.163.com/kubecube/prometheus:v2.26.0
+hub.c.163.com/kubecube/prometheus:v2.26.1
+hub.c.163.com/kubecube/thanos:v0.22.0
+hub.c.163.com/kubecube/kubectl-tools:1.21.0
 hub.c.163.com/kubecube/hnc/hnc-manager:v0.8.0-kubecube.1
 hub.c.163.com/kubecube/ingress-nginx/controller:v0.46.0-m
 hub.c.163.com/kubecube/calico/node:v3.19.1-m

diff --git a/images/v1.21.2/images.list b/images/v1.21.2/images.list
@@ -1,8 +1,8 @@
-hub.c.163.com/kubecube/audit:v1.0.0
-hub.c.163.com/kubecube/cloudshell:v1.0.0
-hub.c.163.com/kubecube/webconsole:v1.0.0
-hub.c.163.com/kubecube/frontend:v1.0.0
-hub.c.163.com/kubecube/cube:v1.0.0
+hub.c.163.com/kubecube/audit:v1.0.1
+hub.c.163.com/kubecube/cloudshell:v1.0.1
+hub.c.163.com/kubecube/webconsole:v1.0.1
+hub.c.163.com/kubecube/frontend:v1.0.2
+hub.c.163.com/kubecube/cube:v1.0.1
 hub.c.163.com/kubecube/warden:v1.0.0
 hub.c.163.com/kubecube/warden-init:v1.0.0
 hub.c.163.com/kubecube/alertmanager:v0.21.0
@@ -12,7 +12,9 @@ hub.c.163.com/kubecube/grafana:7.5.5
 hub.c.163.com/kubecube/kube-state-metrics:v1.9.8
 hub.c.163.com/kubecube/prometheus-operator:v0.47.0
 hub.c.163.com/kubecube/node-exporter:v1.1.2
-hub.c.163.com/kubecube/prometheus:v2.26.0
+hub.c.163.com/kubecube/prometheus:v2.26.1
+hub.c.163.com/kubecube/thanos:v0.22.0
+hub.c.163.com/kubecube/kubectl-tools:1.21.0
 hub.c.163.com/kubecube/hnc/hnc-manager:v0.8.0-kubecube.1
 hub.c.163.com/kubecube/ingress-nginx/controller:v0.46.0-m
 hub.c.163.com/kubecube/calico/node:v3.19.1-m

diff --git a/install_k8s.sh b/install_k8s.sh
@@ -3,7 +3,7 @@
 set -e
 
 DOCKER_VER=19.03.8
-OFFLINE_INSTALL="flase"
+OFFLINE_INSTALL="false"
 BASE="/etc/kubecube"
 K8S_REGISTR="k8s.gcr.io"
 CN_K8S_REGISTR="registry.cn-hangzhou.aliyuncs.com/google_containers"
@@ -21,6 +21,8 @@ function offline_pkg_download() {
 }
 
 function docker_bin_get() {
+  systemctl status docker|grep Active|grep -q running && { clog warn "docker is already running."; return 0; }
+
   if [[ -f "$BASE/down/docker-${DOCKER_VER}.tgz" ]];then
     clog warn "docker binaries already existed"
   else
@@ -323,22 +325,10 @@ function k8s_bin_download() {
 function images_download() {
     clog info "downloading images"
 
-#    /usr/local/bin/kubeadm config images list >> /etc/kubecube/manifests/images.list
-
-#    spin & spinpid=$!
-#    echo
-#    clog debug "spin pid: ${spinpid}"
-#    trap 'kill ${spinpid} && exit 1' SIGINT
     for image in $(cat /etc/kubecube/manifests/images/v${KUBERNETES_VERSION}/images.list)
     do
-#      if [[ "$ZONE" == cn ]];then
-#        if [[ ${image} =~ ${K8S_REGISTR} ]]; then
-#          image=${image/$K8S_REGISTR/$CN_K8S_REGISTR}
-#        fi
-#      fi
       /usr/bin/docker pull ${image}
     done
-#    kill "$spinpid" > /dev/null
 }
 
 function preparation() {

diff --git a/install_kubecube.sh b/install_kubecube.sh
@@ -120,9 +120,9 @@ spec:
             - url: http://${IPADDR}:31291/api/v1/receive
       name: kubecube-monitoring
       namespace: kubecube-monitoring
-      pkgName: kubecube-monitoring-15.4.10.tgz
+      pkgName: kubecube-monitoring-15.4.11.tgz
       status: enabled
-    - name: thanos
+    - name: kubecube-thanos
       namespace: kubecube-monitoring
       pkgName: thanos-3.18.0.tgz
       status: disabled
@@ -149,6 +149,7 @@ spec:
       name: kubecube-monitoring
     - env: |
         receive:
+          tsdbRetention: 7d
           replicaCount: 1
           replicationFactor: 1
       name: kubecube-thanos

diff --git a/kubecube/v1.0.0/templates/authconfigmap.yaml b/kubecube/v1.0.0/templates/authconfigmap.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: kubecube-auth-config
+  namespace: kubecube-system
+data:
+  github: |
+    enabled: {{ .Values.auth.github.enabled }}
+    clientId: {{ .Values.auth.github.clientId }}
+    clientSecret: {{ .Values.auth.github.clientSecret }}
diff --git a/kubecube/v1.0.0/values.yaml b/kubecube/v1.0.0/values.yaml
@@ -2,7 +2,7 @@
 
 kubecube:
   replicas: 1
-  image: hub.c.163.com/kubecube/cube:v1.0.0-rc0
+  image: hub.c.163.com/kubecube/cube:v1.0.1
 
   args:
     logLevel: info
@@ -11,8 +11,8 @@ kubecube:
     leaderElect: true
 
   env:
-    wardenImage: hub.c.163.com/kubecube/warden:v1.0.0-rc0
-    wardenInitImage: hub.c.163.com/kubecube/warden-init:v1.0.0-rc0
+    wardenImage: hub.c.163.com/kubecube/warden:v1.0.0
+    wardenInitImage: hub.c.163.com/kubecube/warden-init:v1.0.0
     pivotCubeSvc: kubecube.kubecube-system:7443
     pivotCubeHost: "Cg=="
     jwtSecret: "56F0D8DB90241C6E"
@@ -32,3 +32,9 @@ pivotCluster:
   kubernetesAPIEndpoint: "Cg=="
   kubeconfig: "Cg=="
 
+auth:
+  github:
+    enabled: false
+    clientId: ""
+    clientSecret: ""
+
diff --git a/third-charts/kubecube-monitoring-15.4.10.tgz b/third-charts/kubecube-monitoring-15.4.10.tgz
diff --git a/third-charts/kubecube-monitoring-15.4.11.tgz b/third-charts/kubecube-monitoring-15.4.11.tgz
diff --git a/third-charts/thanos-3.18.0.tgz b/third-charts/thanos-3.18.0.tgz
diff --git a/webconsole/webconsole.yaml b/webconsole/webconsole.yaml
@@ -20,7 +20,7 @@ spec:
             - name: JWT_SECRET
               value: 56F0D8DB90241C6E
           name: kubecube-webconsole
-          image: hub.c.163.com/kubecube/webconsole:v1.0.0-rc0
+          image: hub.c.163.com/kubecube/webconsole:v1.0.1
           ports:
             - containerPort: 9081
 ---
@@ -45,7 +45,7 @@ spec:
           name: localtime
       containers:
         - name: cloud-shell
-          image: hub.c.163.com/kubecube/cloudshell:v1.0.0-rc0
+          image: hub.c.163.com/kubecube/cloudshell:v1.0.1
           terminationMessagePath: "/dev/termination-log"
           terminationMessagePolicy: "File"
           imagePullPolicy: "IfNotPresent"