Merge pull request kubesphere#7 from pixiake/advanced-2.0.2

add persistence options

deploy/kubesphere-installer.yaml

@@ -7,7 +7,9 @@ data:
     etcd_endpoint_ips: 192.168.0.2
     disableMultiLogin: True
     elk_prefix: logstash
-  #  local_registry: 192.168.1.2:5000
+    persistence:
+      enabled: false
+      storageClass: ""
 kind: ConfigMap
 metadata:
   name: kubesphere-config

roles/ks-devops/jenkins/tasks/wait_sonar.yaml

@@ -30,10 +30,19 @@
     - sonar_server_url is not defined
     - sonar_server_token is not defined
 
+- name: ks-devops | Getting ks-sonarqube ClusterIP
+  shell: "{{ bin_dir }}/kubectl get svc ks-sonarqube-sonarqube -n kubesphere-devops-system -o=jsonpath='{.spec.clusterIP}'"
+  register:  ks_sonarqube_clusterIP
+  when: 
+    - sonarqube_enable is defined
+    - sonarqube_enable == true
+    - sonar_server_url is not defined
+    - sonar_server_token is not defined
+
 - name: ks-devops | Waitting for ks-sonarqube port to become open
   wait_for:
-    host: "{{ ks_sonarqube_nodeIP.stdout }}"
-    port: "{{ ks_sonarqube_nodePort.stdout }}"
+    host: "{{ ks_sonarqube_clusterIP.stdout }}"
+    port: 9000
     delay: 3
     timeout: 600
   when: 
@@ -42,6 +51,15 @@
     - sonar_server_url is not defined
     - sonar_server_token is not defined
 
+- name: ks-devops | Setting ks-sonarqube url
+  set_fact: 
+    sonar_server_url_internal: "http://{{ ks_sonarqube_clusterIP.stdout }}:9000"
+  when: 
+    - sonarqube_enable is defined
+    - sonarqube_enable == true
+    - sonar_server_url is not defined
+    - sonar_server_token is not defined
+
 - name: ks-devops | Setting ks-sonarqube url
   set_fact: 
     sonar_server_url: "http://{{ ks_sonarqube_nodeIP.stdout }}:{{ ks_sonarqube_nodePort.stdout }}"
@@ -53,7 +71,7 @@
 
 - name: ks-devops | Waiting for ks-sonarqube
   shell: >
-    curl -I -s -u {{ sonarqube_user_name }}:{{ sonarqube_user_passwd }} -X POST {{ sonar_server_url }}/api/user_tokens/generate|awk '{if(NR==1){print $2}}'
+    curl -I -s -u {{ sonarqube_user_name }}:{{ sonarqube_user_passwd }} -X POST {{ sonar_server_url_internal }}/api/user_tokens/generate|awk '{if(NR==1){print $2}}'
   register: result
   until: 
     - result is succeeded
@@ -69,7 +87,7 @@
 
 - name: ks-devops | Checking ks-sonarqube token
   uri:
-    url: "{{ sonar_server_url }}/api/user_tokens/search"
+    url: "{{ sonar_server_url_internal }}/api/user_tokens/search"
     method: POST
     user: "{{ sonarqube_user_name }}"
     password: "{{ sonarqube_user_passwd }}"
@@ -87,7 +105,7 @@
 
 - name: ks-devops | Deleting ks-sonarqube old token 
   uri:
-    url: "{{ sonar_server_url }}/api/user_tokens/revoke?name=jenkins"
+    url: "{{ sonar_server_url_internal }}/api/user_tokens/revoke?name=jenkins"
     method: POST
     user: "{{ sonarqube_user_name }}"
     password: "{{ sonarqube_user_passwd }}"
@@ -102,7 +120,7 @@
 
 - name: ks-devops | Generating ks-sonarqube token 
   uri:
-    url: "{{ sonar_server_url }}/api/user_tokens/generate?name=jenkins"
+    url: "{{ sonar_server_url_internal }}/api/user_tokens/generate?name=jenkins"
     method: POST
     user: "{{ sonarqube_user_name }}"
     password: "{{ sonarqube_user_passwd }}"
@@ -116,7 +134,7 @@
 
 - name: ks-devops | Setting user permission(admin)
   uri:
-    url: "{{ sonar_server_url }}/api/permissions/add_user"
+    url: "{{ sonar_server_url_internal }}/api/permissions/add_user"
     method: POST
     user: admin
     password: admin
@@ -133,7 +151,7 @@
 
 - name: ks-devops | Setting user permission(gateadmin)
   uri:
-    url: "{{ sonar_server_url }}/api/permissions/add_user"
+    url: "{{ sonar_server_url_internal }}/api/permissions/add_user"
     method: POST
     user: admin
     password: admin
@@ -150,7 +168,7 @@
 
 - name: ks-devops | Setting user permission(profileadmin)
   uri:
-    url: "{{ sonar_server_url }}/api/permissions/add_user"
+    url: "{{ sonar_server_url_internal }}/api/permissions/add_user"
     method: POST
     user: admin
     password: admin
@@ -167,7 +185,7 @@
 
 - name: ks-devops | Creating ks-jenkins webhook(internal)
   uri:
-    url: "{{ sonar_server_url }}/api/webhooks/create"
+    url: "{{ sonar_server_url_internal }}/api/webhooks/create"
     method: POST
     user: "{{ sonarqube_user_name }}"
     password: "{{ sonarqube_user_passwd }}"

roles/ks-devops/jenkins/templates/custom-values-jenkins.yaml.j2

@@ -420,8 +420,14 @@ rbac:
   install: true
 
 Persistence:
-  # StorageClass: nfs-client
-
+  Enabled: {% if persistence.enable is defined and persistence.enable == true %}true{% else %}false{% endif %}
+
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+  StorageClass: "{{ persistence.storageClass }}"
+{% endif %}
+  AccessMode: ReadWriteOnce
+  Size: 8Gi
+
   volumes:
   - name: casc-config
     configMap:

roles/ks-devops/sonarqube/templates/custom-values-sonarqube.yaml.j2

@@ -160,7 +160,15 @@ postgresql:
   # Specify the TCP port that PostgreSQL should use
   service:
     port: 5432
-
+  persistence:
+    enabled: {% if persistence.enable is defined and persistence.enable == true %}true{% else %}false{% endif %}
+
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+    storageClass: "{{ persistence.storageClass }}"
+{% endif %}
+    accessMode: ReadWriteOnce
+    size: 8Gi
+
 mysql:
   # Enable to deploy the mySQL chart
   enabled: false

roles/ks-logging/templates/custom-values-elasticsearch.yaml.j2

@@ -78,11 +78,14 @@ master:
   heapSize: "512m"
   # additionalJavaOpts: "-XX:MaxRAM=512m"
   persistence:
-    enabled: true
+    enabled: {% if persistence.enable is defined and persistence.enable == true %}true{% else %}false{% endif %}
+
     accessMode: ReadWriteOnce
     name: data
     size: "4Gi"
-    # storageClass: "ssd"
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+    storageClass: "{{ persistence.storageClass }}"
+{% endif %}
   readinessProbe:
     httpGet:
       path: /_cluster/health?local=true
@@ -127,11 +130,14 @@ data:
   heapSize: "1536m"
   # additionalJavaOpts: "-XX:MaxRAM=1536m"
   persistence:
-    enabled: true
+    enabled: {% if persistence.enable is defined and persistence.enable == true %}true{% else %}false{% endif %}
+
     accessMode: ReadWriteOnce
     name: data
     size: "{{ elasticsearch_volume_size }}"
-    # storageClass: "ssd"
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+    storageClass: "{{ persistence.storageClass }}"
+{% endif %}
   readinessProbe:
     httpGet:
       path: /_cluster/health?local=true

roles/ks-monitor/defaults/main.yaml

@@ -17,4 +17,6 @@ etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
 etcd_tls_enable: true
 etcd_client_ca_crt: "{{ etcd_cert_dir }}/ca.pem"
 etcd_client_crt: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
-etcd_client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
+etcd_client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
+
+etcd_port: 2379

roles/ks-monitor/templates/prometheus-endpointsEtcd.yaml.j2

@@ -14,5 +14,5 @@ subsets:
 {% endfor %}
   ports:
   - name: metrics
-    port: 2379
+    port: {{ etcd_port }}
     protocol: TCP

roles/ks-monitor/templates/prometheus-prometheus.yaml.j2

@@ -57,11 +57,18 @@ spec:
       - kubelet
       - prometheus-system
   storage:
+{% if persistence.enable is defined and persistence.enable == true %} 
     volumeClaimTemplate:
       spec:
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+        storageClassName: {{ persistence.storageClass }}
+{% endif %}
         resources:
           requests:
             storage: {{ prometheus_volume_size }}
+{% else %}
+    emptyDir: {}
+{% endif %}
   tolerations:
   - effect: NoSchedule
     key: dedicated

roles/ks-monitor/templates/prometheus-prometheusSystem.yaml.j2

@@ -64,11 +64,18 @@ spec:
       - kube-scheduler
       - kube-controller-manager
   storage:
+{% if persistence.enable is defined and persistence.enable == true %} 
     volumeClaimTemplate:
       spec:
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+        storageClassName: {{ persistence.storageClass }}
+{% endif %}
         resources:
           requests:
             storage: {{ prometheus_volume_size }}
+{% else %}
+    emptyDir: {}
+{% endif %}
   tolerations:
   - effect: NoSchedule
     key: dedicated

roles/openpitrix/templates/etcd.yaml.j2

@@ -16,6 +16,8 @@ spec:
     protocol: TCP
     port: 2379
     targetPort: 2379
+
+{% if persistence.enable is defined and persistence.enable == true %} 
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -28,9 +30,13 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+  storageClassName: {{ persistence.storageClass }}
+{% endif %}
   resources:
     requests:
       storage: 20Gi
+{% endif %}
 ---
 apiVersion: apps/v1beta2
 kind: Deployment
@@ -70,5 +76,11 @@ spec:
           mountPath: /data
       volumes:
       - name: etcd-persistent-storage
+{% if persistence.enable is defined and persistence.enable == true %}  
         persistentVolumeClaim:
           claimName: openpitrix-etcd-pvc
+{% else %} 
+        hostPath:
+          path: /var/lib/kubesphere/etcd-data
+          type: DirectoryOrCreate
+{% endif %}

roles/openpitrix/templates/minio.yaml.j2

@@ -16,6 +16,8 @@ spec:
     protocol: TCP
     port: 9000
     targetPort: 9000
+
+{% if persistence.enable is defined and persistence.enable == true %} 
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -28,9 +30,14 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+  storageClassName: {{ persistence.storageClass }}
+{% endif %}
   resources:
     requests:
       storage: 20Gi
+{% endif %}
+
 ---
 apiVersion: apps/v1beta2
 kind: Deployment
@@ -79,5 +86,11 @@ spec:
           mountPath: /data
       volumes:
       - name: minio-persistent-storage
+{% if persistence.enable is defined and persistence.enable == true %}  
         persistentVolumeClaim:
           claimName: openpitrix-minio-pvc
+{% else %} 
+        hostPath:
+          path: /var/lib/kubesphere/minio-data
+          type: DirectoryOrCreate
+{% endif %}

roles/openpitrix/templates/mysql.yaml.j2

@@ -16,6 +16,8 @@ spec:
     protocol: TCP
     port: 3306
     targetPort: 3306
+
+{% if persistence.enable is defined and persistence.enable == true %}     
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -28,9 +30,14 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
+{% if persistence.storageClass is defined and persistence.storageClass != None %} 
+  storageClassName: {{ persistence.storageClass }}
+{% endif %}
   resources:
     requests:
       storage: 20Gi
+{% endif %}
+
 ---
 apiVersion: apps/v1beta2
 kind: Deployment
@@ -107,5 +114,11 @@ spec:
                 - "" 
       volumes:
       - name: db-persistent-storage
+{% if persistence.enable is defined and persistence.enable == true %}  
         persistentVolumeClaim:
           claimName: openpitrix-db-pvc
+{% else %} 
+        hostPath:
+          path: /var/lib/kubesphere/db-data
+          type: DirectoryOrCreate
+{% endif %}