diff --git a/README.md b/README.md index c85e9e0..33f3b12 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,9 @@ cd canal-server && helm dependency update && cd .. helm upgrade -i canal-server canal-server/ --values local-values/canal/crm1.yaml -n crm1 +helm upgrade -i canal-server canal-server/ --values local-values/canal/review.yaml -n crm-review + + ``` ## torna-server https://hub.fastgit.org/nacos-group/nacos-k8s.git diff --git a/builder-docker/java11/Dockerfile b/builder-docker/java11/Dockerfile index a89da52..5028f1c 100644 --- a/builder-docker/java11/Dockerfile +++ b/builder-docker/java11/Dockerfile @@ -1,6 +1,18 @@ -FROM openjdk:11.0.13-slim-buster +FROM openjdk:11-jdk -RUN apt-get update && apt-get install -y curl +RUN apt-get update && apt-get install -y curl iotop wget procps lsof lib32gcc-s1 + +# RUN echo 'deb http://mirrors.163.com/debian/ stretch main non-free contrib' > /etc/apt/sources.list \ +# && echo 'deb http://mirrors.163.com/debian/ stretch-updates main non-free contrib' >> /etc/apt/sources.list \ +# && echo 'deb http://mirrors.163.com/debian-security/ stretch/updates main non-free contrib' >> /etc/apt/sources.list \ +# && apt-get update \ +# && apt-get install -y fontconfig ttf-dejavu +# ENV LANG en_US.UTF-8 + +# RUN ln -s /lib/libc.musl-x86_64.so.1 /usr/lib/libc.musl-x86_64.so.1 + +# RUN sudo apt-get update && sudo apt-get install -y curl iotop wget procps lsof +# RUN sudo apt-get update && sudo apt-get install -y lsof CMD ["java","--version"] diff --git a/local-values/mysql/crm1.yaml b/local-values/mysql/crm1.yaml index 93d0551..75ff169 100644 --- a/local-values/mysql/crm1.yaml +++ b/local-values/mysql/crm1.yaml @@ -183,7 +183,7 @@ primary: sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES log-bin=mysql-bin binlog-format=ROW - + max_connections=1000 [client] port=3306 socket=/opt/bitnami/mysql/tmp/mysql.sock diff --git a/local-values/xxl-job/review.yaml b/local-values/xxl-job/review.yaml new file mode 100644 index 0000000..260c340 --- /dev/null +++ b/local-values/xxl-job/review.yaml @@ -0,0 +1,113 @@ +# Default values for aldi_back_merchant-web. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 +image: + repository: xuxueli/xxl-job-admin + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "2.3.0" + +imagePullSecrets: [] + # - name: images.pull.secret + +nameOverride: "" +fullnameOverride: "" + +PARAMS_VALUE: "--spring.datasource.url=jdbc:mysql://192.168.10.21:3306/xxl_job?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai --spring.datasource.username=root --spring.datasource.password=nczl@sino_db" + +healthChk: + enabled: true + content: + livenessProbe: + failureThreshold: 3 + httpGet: + path: /xxl-job-admin/chk.html + port: 8080 + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 60 + readinessProbe: + failureThreshold: 3 + httpGet: + path: /xxl-job-admin/chk.html + port: 8080 + scheme: HTTP + initialDelaySeconds: 30 + periodSeconds: 300 + successThreshold: 1 + timeoutSeconds: 60 + +resources: + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + enabled: true + content: + type: NodePort + port: 8080 + targetPort: 8080 + nodePort: 31033 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} +