Merge pull request #62 from jianxiaoguo/main

change cert_manager_enabled to boolean type and modify alpinelinux repositories

Author: duanhongyi

charts/controller/templates/_helpers.tpl

@@ -142,7 +142,7 @@ env:
 {{- end }}
 {{- if eq .Values.global.passport_location "on-cluster"}}
 - name: "DRYCC_PASSPORT_DOMAIN"
-{{- if eq .Values.global.cert_manager_enabled "true" }}
+{{- if .Values.global.cert_manager_enabled }}
   value: https://drycc-passport.{{ .Values.global.platform_domain }}
 {{- else }}
   value: http://drycc-passport.{{ .Values.global.platform_domain }}

charts/controller/values.yaml

@@ -93,5 +93,5 @@ global:
   # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME"
   platform_domain: ""
   # Whether cert_manager is enabled to automatically generate controller certificates
-  cert_manager_enabled: "true"
+  cert_manager_enabled: true
   passport_location: "on-cluster"

rootfs/Dockerfile.test

@@ -7,7 +7,7 @@ ENV PGDATA /var/lib/postgresql/12
 
 ENV PATH="/app/.venv/bin:${PATH}"
 
-RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >>/etc/apk/repositories \
+RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/main >>/etc/apk/repositories \
   && apk add --update --virtual .build-deps \
     gcc \
     rust \