Merge branch 'main' of https://github.com/drycc-addons/addons into main

Author: EamonZhang

.woodpecker/build.yml

@@ -1,9 +1,8 @@
-platform: linux/amd64
-
 labels:
   type: exec
+  platform: linux/amd64
 
-pipeline:
+steps:
 - name: check
   image: bash
   commands:

addons/airflow/2/chart/airflow/templates/_git_helpers.tpl

@@ -100,12 +100,12 @@ Usage:
       . /opt/drycc/scripts/libfs.sh
     {{- if .context.Values.git.dags.enabled }}
       {{- range .context.Values.git.dags.repositories }}
-      is_dir_empty "/dags/{{ include "airflow.git.repository.name" . }}" && git clone {{ .repository }} --branch {{ .branch }} /dags/{{ include "airflow.git.repository.name" . }}
+      is_dir_empty "/dags/{{ include "airflow.git.repository.name" . }}" && git clone {{ .repository }} --branch {{ .branch }} /dags/{{ include "airflow.git.repository.name" . }} && cd /dags/{{ include "airflow.git.repository.name" . }} &&  git config pull.rebase true
       {{- end }}
     {{- end }}
     {{- if .context.Values.git.plugins.enabled }}
       {{- range .context.Values.git.plugins.repositories }}
-      is_dir_empty "/plugins/{{ include "airflow.git.repository.name" . }}" && git clone {{ .repository }} --branch {{ .branch }} /plugins/{{ include "airflow.git.repository.name" . }}
+      is_dir_empty "/plugins/{{ include "airflow.git.repository.name" . }}" && git clone {{ .repository }} --branch {{ .branch }} /plugins/{{ include "airflow.git.repository.name" . }} cd /plugins/{{ include "airflow.git.repository.name" . }} &&  git config pull.rebase true
       {{- end }}
     {{- end }}
 {{- end }}

addons/airflow/2/chart/airflow/templates/web/networkpolicy-web.yaml

@@ -17,6 +17,9 @@ spec:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
       app.kubernetes.io/component: web
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     {{- if or .Values.networkPolicy.allowCurrentNamespace .Values.networkPolicy.allowNamespaces }}
     - from:
       {{- if .Values.networkPolicy.allowCurrentNamespace }}
@@ -32,4 +35,5 @@ spec:
       {{- end }}
       {{- end }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/flink/1.17/chart/flink/templates/jobmanager/networkpolicy.yaml

@@ -59,6 +59,9 @@ spec:
     {{- end }}
   {{- end }}
   ingress:
+    {{- if eq .Values.jobmanager.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.jobmanager.containerPorts.blob }}
         - port: {{ .Values.jobmanager.containerPorts.rpc }}
@@ -91,4 +94,5 @@ spec:
     {{- if .Values.jobmanager.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.jobmanager.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/flink/1.17/chart/flink/templates/taskmanager/networkpolicy.yaml

@@ -59,6 +59,9 @@ spec:
     {{- end }}
   {{- end }}
   ingress:
+    {{- if eq .Values.taskmanager.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     - ports:
         - port: {{ .Values.taskmanager.containerPorts.data }}
         - port: {{ .Values.taskmanager.containerPorts.rpc }}
@@ -90,4 +93,5 @@ spec:
     {{- if .Values.taskmanager.networkPolicy.extraIngress }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.taskmanager.networkPolicy.extraIngress "context" $ ) | nindent 4 }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/kafka/3.6/chart/kafka/templates/network-policy/networkpolicy-ingress.yaml

@@ -19,6 +19,9 @@ spec:
   policyTypes:
     - Ingress
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow client connections
     - ports:
         - port: {{ .Values.listeners.client.containerPort }}
@@ -56,4 +59,5 @@ spec:
     - ports:
         - port: {{ .Values.metrics.kafka.containerPorts.metrics }}
     {{- end }}
+    {{- end }}
 {{- end }}

addons/minio/2023/chart/minio/templates/networkpolicy.yaml

@@ -15,6 +15,9 @@ spec:
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   ingress:
+    {{- if eq .Values.service.type "LoadBalancer" }}
+    - {}
+    {{- else }}
     # Allow inbound connections
     - ports:
         - port: {{ .Values.containerPorts.console }}
@@ -42,4 +45,5 @@ spec:
         {{- toYaml .Values.networkPolicy.extraFromClauses | nindent 8 }}
         {{- end }}
       {{- end }}
+    {{- end }}
 {{- end }}

addons/minio/2023/plans/standard-v4s1024/values.yaml

@@ -13,11 +13,11 @@ fullnameOverride: hb-minio-standard-10
 ##
 resources:
   limits:
-    cpu: 2000m
-    memory: 8192Mi
+    cpu: 4000m
+    memory: 16Gi
   requests:
-    cpu: 200m
-    memory: 4096Mi
+    cpu: 400m
+    memory: 8Gi
 
 ## @section Persistence parameters
 

addons/minio/2023/plans/standard-v4s128/values.yaml

@@ -14,10 +14,10 @@ fullnameOverride: hb-minio-standard-10
 resources:
   limits:
     cpu: 1000m
-    memory: 1024Mi
+    memory: 2048Mi
   requests:
     cpu: 100m
-    memory: 512Mi
+    memory: 1024Mi
 
 ## @section Persistence parameters
 

addons/minio/2023/plans/standard-v4s256/values.yaml

@@ -13,11 +13,11 @@ fullnameOverride: hb-minio-standard-10
 ##
 resources:
   limits:
-    cpu: 1000m
-    memory: 2048Mi
+    cpu: 2000m
+    memory: 4Gi
   requests:
-    cpu: 100m
-    memory: 1024Mi
+    cpu: 200m
+    memory: 2Gi
 
 ## @section Persistence parameters