Merge b7e7aac into 46853ba

caicloud · Dec 21, 2020 · 614ee3a · 614ee3a
2 parents 46853ba + b7e7aac
commit 614ee3a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 22 deletions.
diff --git a/manifests/cyclone/templates/_helpers.tpl b/manifests/cyclone/templates/_helpers.tpl
@@ -30,3 +30,11 @@ Create chart name and version as used by the chart label.
 {{- define "cyclone.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "cyclone.registry.release" -}}
+{{- printf "%s/%s" .Values.platformConfig.imageRegistry .Values.platformConfig.imageRepositoryRelease -}}
+{{- end -}}
+
+{{- define "cyclone.registry.library" -}}
+{{- printf "%s/%s" .Values.platformConfig.imageRegistry .Values.platformConfig.imageRepositoryLibrary -}}
+{{- end -}}
diff --git a/manifests/cyclone/templates/controller.yaml b/manifests/cyclone/templates/controller.yaml
@@ -12,13 +12,13 @@ data:
   workflow-controller.json: |
     {
       "images": {
-        "git-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-git:{{ .Chart.AppVersion }}",
-        "svn-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-svn:{{ .Chart.AppVersion }}",
-        "image-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-image:{{ .Chart.AppVersion }}",
-        "http-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-http:{{ .Chart.AppVersion }}",
-        "coordinator": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-workflow-coordinator:{{ .Chart.AppVersion }}",
-        "toolbox": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-toolbox:{{ .Chart.AppVersion }}",
-        "gc": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.engine.images.gc }}"
+        "git-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-git:{{ .Chart.AppVersion }}",
+        "svn-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-svn:{{ .Chart.AppVersion }}",
+        "image-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-image:{{ .Chart.AppVersion }}",
+        "http-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-http:{{ .Chart.AppVersion }}",
+        "coordinator": "{{ include "cyclone.registry.release" . }}/cyclone-workflow-coordinator:{{ .Chart.AppVersion }}",
+        "toolbox": "{{ include "cyclone.registry.release" . }}/cyclone-toolbox:{{ .Chart.AppVersion }}",
+        "gc": "{{ include "cyclone.registry.library" . }}/{{ .Values.engine.images.gc }}"
       },
       "logging": {
         "level": "info"
@@ -87,7 +87,7 @@ spec:
       - name: controller
         command:
         - /workspace/controller
-        image: "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-workflow-controller:{{ .Chart.AppVersion }}"
+        image: "{{ include "cyclone.registry.release" . }}/cyclone-workflow-controller:{{ .Chart.AppVersion }}"
         imagePullPolicy: Always
         env:
         - name: DEVELOP_MODE

diff --git a/manifests/cyclone/templates/server.yaml b/manifests/cyclone/templates/server.yaml
@@ -27,7 +27,7 @@ data:
       "init_default_tenant": {{ .Values.server.init.defaultTenant }},
       "open_control_cluster": {{ .Values.server.openControlCluster }},
       "storage_usage_watcher": {
-        "image": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-watcher:{{ .Chart.AppVersion }}",
+        "image": "{{ include "cyclone.registry.release" . }}/cyclone-watcher:{{ .Chart.AppVersion }}",
         "report_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:6041/apis/v1alpha1/storage/usages",
         "interval_seconds": "{{ .Values.server.storageWatcher.intervalSeconds }}",
         "resource_requirements": {
@@ -38,7 +38,7 @@ data:
         }
       },
       "cache_cleaner": {
-        "image": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.server.cacheCleaner.image }}",
+        "image": "{{ include "cyclone.registry.library" . }}/{{ .Values.server.cacheCleaner.image }}",
         "resource_requirements": {
           "limits.cpu": "{{ .Values.server.cacheCleaner.resourceRequirements.limits.cpu }}",
           "limits.memory": "{{ .Values.server.cacheCleaner.resourceRequirements.limits.memory }}",
@@ -47,7 +47,7 @@ data:
         }
       },
       "images": {
-        "gc": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.engine.images.gc }}"
+        "gc": "{{ include "cyclone.registry.library" . }}/{{ .Values.engine.images.gc }}"
       },
       "notifications": [
         {
@@ -97,7 +97,7 @@ spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
       - name: server
-        image: "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-server:{{ .Chart.AppVersion }}"
+        image: "{{ include "cyclone.registry.release" . }}/cyclone-server:{{ .Chart.AppVersion }}"
         imagePullPolicy: Always
         command:
         - /cyclone-server
@@ -145,8 +145,9 @@ spec:
           path: /etc/localtime
           type: File
       - name: cyclone-data
-        persistentVolumeClaim:
-          claimName: cyclone-server-cyclone-data
+        emptyDir: {}
+        #persistentVolumeClaim:
+        #  claimName: cyclone-server-cyclone-data
 
 ---
 kind: Service

diff --git a/pkg/server/biz/integration/cluster/cluster.go b/pkg/server/biz/integration/cluster/cluster.go
@@ -168,7 +168,7 @@ func Close(in *api.Integration, tenant string) (err error) {
 	}
 
 	// delete resource quota
-	quotaName := svrcommon.TenantResourceQuota(tenant)
+	quotaName := svrcommon.ResourceQuotaName(cluster.Namespace)
 	err = clusterClient.CoreV1().ResourceQuotas(cluster.Namespace).Delete(context.TODO(), quotaName, meta_v1.DeleteOptions{})
 	if err != nil {
 		if strings.Contains(err.Error(), "dial tcp") && strings.Contains(err.Error(), "connect: connection refused") {

diff --git a/pkg/server/common/cluster.go b/pkg/server/common/cluster.go
@@ -52,7 +52,7 @@ func CreateResourceQuota(tenant *api.Tenant, namespace string, client *kubernete
 		nsname = namespace
 	}
 
-	quota, err := buildResourceQuota(tenant)
+	quota, err := buildResourceQuota(tenant, nsname)
 	if err != nil {
 		log.Warningf("Build resource quota for tenant %s error %v", tenant.Name, err)
 		return err
@@ -67,15 +67,15 @@ func CreateResourceQuota(tenant *api.Tenant, namespace string, client *kubernete
 	return nil
 }
 
-func buildResourceQuota(tenant *api.Tenant) (*core_v1.ResourceQuota, error) {
+func buildResourceQuota(tenant *api.Tenant, namespace string) (*core_v1.ResourceQuota, error) {
 	// parse resource list
 	rl, err := ParseResourceList(tenant.Spec.ResourceQuota)
 	if err != nil {
 		log.Warningf("Parse resource quota for tenant %s error %v", tenant.Name, err)
 		return nil, err
 	}
 
-	quotaName := TenantResourceQuota(tenant.Name)
+	quotaName := ResourceQuotaName(namespace)
 	quota := &core_v1.ResourceQuota{
 		ObjectMeta: meta_v1.ObjectMeta{
 			Name: quotaName,
@@ -104,7 +104,7 @@ func UpdateResourceQuota(tenant *api.Tenant, namespace string, client *kubernete
 
 	return retry.RetryOnConflict(retry.DefaultRetry, func() error {
 		quota, err := client.CoreV1().ResourceQuotas(nsname).Get(
-			context.TODO(), TenantResourceQuota(tenant.Name), meta_v1.GetOptions{})
+			context.TODO(), ResourceQuotaName(nsname), meta_v1.GetOptions{})
 		if err != nil {
 			log.Errorf("Get ResourceQuota for tenant %s error %v", tenant.Name, err)
 			return err

diff --git a/pkg/server/common/utils.go b/pkg/server/common/utils.go
@@ -20,7 +20,8 @@ func TenantPVC(tenant string) string {
 	return TenantPVCPrefix + tenant
 }
 
-// TenantResourceQuota returns resource quota name related the tenant
-func TenantResourceQuota(tenant string) string {
-	return tenant
+// ResourceQuotaName returns resource quota name according to the namespace.
+// Currently the name of resource quota is the same as namespace.
+func ResourceQuotaName(namespace string) string {
+	return namespace
 }