Merge pull request #61 from jianxiaoguo/main

set the domain depends cert_manager_enabled and fix update resources bug

Author: duanhongyi

charts/controller/templates/_helpers.tpl

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

rootfs/api/serializers.py

@@ -735,7 +735,7 @@ def update(self, instance, validated_data):
         if instance.plan.split(':')[0] != validated_data.get('plan', '').split(':')[0]:  # noqa
             raise DryccException("the resource cann't changed")
         instance.plan = validated_data.get('plan')
-        instance.options = validated_data.get('options')
+        instance.options.update(validated_data.get('options', {}))
         instance.attach_update()
         instance.save()
         return instance