Merge pull request #37 from ding-insper/master

update to v1.1

configs/configs.yml

@@ -20,10 +20,13 @@ minio:
   secretKey: Minio123456 #Set Mongo secretKey. Required when enabled is true  设置minio secretKey，enabled为true时必填
 #Service profile 服务的配置文件
 image:
-  repo: qxcr.io/qxp
-  tag: v1.0.0
+  repo: qxcr.io/lowcode
+  tag: v1.1.1
 imagePullSecrets: ""
 domain: example.com       #设置访问平台的域名
+persis:
+  enabled: false
+  storageClassName: "csi-ssd-enterprise"
 args:
   enabled: true   #如果使用的是未被公网解析的域名，需要设置enabled为true
   endpoint: "example.com:31198"    #fileserver 域名    域名要与domain设置的域名一致

deployment/quanxiang_charts/structor/Chart.yaml → deployment/kibana/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
-name: structor
+name: kibana
 version: 0.1.0

deployment/quanxiang_charts/structor/templates/_helpers.tpl → deployment/kibana/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "structor.name" -}}
+{{- define "audit.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "structor.fullname" -}}
+{{- define "audit.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,16 +27,16 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "structor.chart" -}}
+{{- define "audit.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Common labels
 */}}
-{{- define "structor.labels" -}}
-app.kubernetes.io/name: {{ include "structor.name" . }}
-helm.sh/chart: {{ include "structor.chart" . }}
+{{- define "audit.labels" -}}
+app.kubernetes.io/name: {{ include "audit.name" . }}
+helm.sh/chart: {{ include "audit.chart" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
@@ -47,9 +47,9 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "structor.serviceAccountName" -}}
+{{- define "audit.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "structor.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "audit.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}

deployment/kibana/templates/configmap.yaml

@@ -0,0 +1,26 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: kibana
+  namespace: {{ .Values.namespace }}
+  annotations:
+    kubesphere.io/creator: admin
+data:
+  kibana.yml: >-
+
+    # ** THIS IS AN AUTO-GENERATED FILE **
+
+    #
+
+
+    # Default Kibana configuration for docker target
+
+    server.name: kibana
+
+    server.host: "0"
+
+    #elasticsearch.hosts:
+
+    elasticsearch.hosts: [ "http://192.168.208.23:9200","http://192.168.208.24:9200","http://192.168.208.25:9200" ]
+
+    #xpack.monitoring.ui.container.elasticsearch.enabled: true

deployment/kibana/templates/deployment.yaml

@@ -0,0 +1,57 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: kibana
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: kibana
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+    kubesphere.io/creator: admin
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: kibana
+  template:
+    metadata:
+      creationTimestamp: null
+      labels:
+        app: kibana
+      annotations:
+        logging.kubesphere.io/logsidecar-config: '{}'
+    spec:
+      volumes:
+        - name: volume-zuhjax
+          configMap:
+            name: kibana
+            defaultMode: 420
+      containers:
+        - name: container-q54rb6
+          image: 'kibana:7.16.1'
+          ports:
+            - name: http-5601
+              containerPort: 5601
+              protocol: TCP
+          resources: {}
+          volumeMounts:
+            - name: volume-zuhjax
+              readOnly: true
+              mountPath: /usr/share/kibana/config
+          terminationMessagePath: /dev/termination-log
+          terminationMessagePolicy: File
+          imagePullPolicy: IfNotPresent
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst
+      serviceAccountName: default
+      serviceAccount: default
+      securityContext: {}
+      schedulerName: default-scheduler
+  strategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 25%
+      maxSurge: 25%
+  revisionHistoryLimit: 10
+  progressDeadlineSeconds: 600

deployment/kibana/templates/service.yaml

@@ -0,0 +1,22 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: kibana
+  namespace: {{ .Values.namespace }}
+  labels:
+    app: kibana
+  annotations:
+    kubesphere.io/creator: admin
+spec:
+  ports:
+    - name: http-5601
+      protocol: TCP
+      port: 5601
+      targetPort: 5601
+  selector:
+    app: kibana
+  type: ClusterIP
+  sessionAffinity: None
+  ipFamilies:
+    - IPv4
+  ipFamilyPolicy: SingleStack

deployment/kibana/values.yaml

@@ -0,0 +1,2 @@
+namespace: ""
+#images: ramencloud/kibana-oss:6.8.21/daduryi/kibana-oss-7.2.0

deployment/middleware_deployment/elasticsearch/README.md

@@ -99,8 +99,8 @@ volumes in a StatefulSet. By setting it up this way it makes it possible to add
 more nodes with a new storage size then drain the old ones. It also solves the
 problem of allowing the user to determine which node groups to update first when
 doing upgrades or changes.
-* We have designed this chart to be very un-opinionated about how to configure
-Elasticsearch. It exposes ways to set environment variables and mount secrets
+* W**e have designed this chart to be very un-opinionated about how to configure
+Elasticsearch. It exposes ways to set environment variables** and mount secrets
 inside of the container. Doing this makes it much easier for this chart to
 support multiple versions with minimal changes.
 

deployment/middleware_deployment/elasticsearch/values.yaml

@@ -92,6 +92,7 @@ networkHost: "0.0.0.0"
 
 volumeClaimTemplate:
   accessModes: ["ReadWriteOnce"]
+  storageClassName: "csi-high-perf"
   resources:
     requests:
       storage: 10Gi

deployment/middleware_deployment/etcd-operator/templates/etcd-cluster-crd.yaml

@@ -20,3 +20,4 @@ spec:
 {{ toYaml .Values.etcdCluster.tls | indent 4 }}
   {{- end }}
 {{- end }}
+

deployment/middleware_deployment/etcd-operator/values-persis.yaml

@@ -0,0 +1,173 @@
+# Default values for etcd-operator.
+# This is a YAML-formatted file.
+
+#设置tls认证请参考：https://github.com/coreos/etcd-operator/blob/master/doc/user/cluster_tls.md
+
+# Declare variables to be passed into your templates.
+global:
+  ## Reference to one or more secrets to be used when pulling images
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  imagePullSecrets: []
+  # - name: "image-pull-secret"
+
+## Install Default RBAC roles and bindings
+rbac:
+  create: true
+  apiVersion: v1
+
+## Service account name and whether to create it
+serviceAccount:
+  create: true
+  name:
+
+# Select what to deploy
+deployments:
+  etcdOperator: true
+  # one time deployment, delete once completed,
+  # Ref: https://github.com/coreos/etcd-operator/blob/master/doc/user/walkthrough/backup-operator.md
+  backupOperator: true
+  # one time deployment, delete once completed
+  # Ref: https://github.com/coreos/etcd-operator/blob/master/doc/user/walkthrough/restore-operator.md
+  restoreOperator: true
+
+# creates custom resources, not all required,
+# you could use `helm template --values <values.yaml> --name release_name ... `
+# and create the resources yourself to deploy on your cluster later
+customResources:
+  createEtcdClusterCRD: true
+  createBackupCRD: false
+  createRestoreCRD: false
+
+# etcdOperator
+etcdOperator:
+  priorityClassName: ""
+  name: etcd-operator
+  replicaCount: 1
+  image:
+    repository: quay.io/coreos/etcd-operator
+    tag: v0.9.4
+    pullPolicy: Always
+  resources:
+    cpu: 100m
+    memory: 128Mi
+  ## Node labels for etcd-operator pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  ## additional command arguments go here; will be translated to `--key=value` form
+  ## e.g., analytics: true
+  commandArgs: {}
+  tolerations: []
+  ## Configurable health checks against the /readyz endpoint that etcd-operator exposes
+  readinessProbe:
+    enabled: false
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+  livenessProbe:
+    enabled: false
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    timeoutSeconds: 1
+    successThreshold: 1
+    failureThreshold: 3
+
+# backup spec
+backupOperator:
+  priorityClassName: ""
+  name: etcd-backup-operator
+  replicaCount: 1
+  image:
+    repository: quay.io/coreos/etcd-operator
+    tag: v0.9.4
+    pullPolicy: Always
+  resources:
+    cpu: 100m
+    memory: 128Mi
+  spec:
+    storageType: S3
+    s3:
+      s3Bucket:
+      awsSecret:
+  ## Node labels for etcd pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  ## additional command arguments go here; will be translated to `--key=value` form
+  ## e.g., analytics: true
+  commandArgs: {}
+  securityContext: {}
+  tolerations: []
+
+# restore spec
+restoreOperator:
+  priorityClassName: ""
+  name: etcd-restore-operator
+  replicaCount: 1
+  image:
+    repository: quay.io/coreos/etcd-operator
+    tag: v0.9.4
+    pullPolicy: Always
+  port: 19999
+  resources:
+    cpu: 100m
+    memory: 128Mi
+  spec:
+    s3:
+      # The format of "path" must be: "<s3-bucket-name>/<path-to-backup-file>"
+      # e.g: "etcd-snapshot-bucket/v1/default/example-etcd-cluster/3.2.10_0000000000000001_etcd.backup"
+      path:
+      awsSecret:
+  ## Node labels for etcd pod assignment
+  ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+  nodeSelector: {}
+  ## additional command arguments go here; will be translated to `--key=value` form
+  ## e.g., analytics: true
+  commandArgs: {}
+  securityContext: {}
+  tolerations: []
+
+## etcd-cluster specific values
+etcdCluster:
+  name: etcd-cluster
+  size: 3
+  version: 3.2.25
+  image:
+    repository: quay.io/coreos/etcd
+    tag: v3.2.25
+    pullPolicy: Always
+  enableTLS: false
+  # TLS configs
+  tls:
+    static:
+      member:
+        peerSecret: etcd-peer-tls
+        serverSecret: etcd-server-tls
+      operatorSecret: etcd-client-tls
+  ## etcd cluster pod specific values
+  ## Ref: https://github.com/coreos/etcd-operator/blob/master/doc/user/spec_examples.md#three-members-cluster-with-resource-requirement
+  pod:
+    busyboxImage: busybox:1.28.0-glibc
+    ## Antiaffinity for etcd pod assignment
+    ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+    antiAffinity: false
+    persistentVolumeClaimSpec:
+      storageClassName: csi-high-capacity
+      accessModes:
+        - ReadWriteOnce
+      resources:
+        requests:
+          storage: 5Gi
+    resources:
+      limits:
+        cpu: 200m
+        memory: 1Gi
+      requests:
+        cpu: 200m
+        memory: 1Gi
+    ## Node labels for etcd pod assignment
+    ## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+    nodeSelector: {}
+    securityContext: {}
+    tolerations: []