Merge pull request #8 from cleverhu/optimize-helm-chart

optimize helm chart

Author: cleverhu

.github/workflows/push-helm-chart.yaml

@@ -19,11 +19,14 @@ jobs:
         uses: actions/checkout@v2
       # 通过 git 命令获取当前 tag 信息, 存入环境变量 APP_VERSION
       - name: Generate Chart Version
-        run: echo CHART_VERSION=`git describe --tags --always| sed 's/^v//g'` >> $GITHUB_ENV
+        run: |
+          echo CHART_VERSION=`git describe --tags --always| sed 's/^v//g'` >> $GITHUB_ENV
+          echo APP_VERSION=`git describe --tags --always` >> $GITHUB_ENV
       - name: Push chart to charts
         run: |
           helm plugin install https://github.com/chartmuseum/helm-push
           helm repo add ${{ env.APP_NAME }} ${{ secrets.REGISTRY }}
+          sed -i 's/imageTag: ""/imageTag: '${{ env.APP_VERSION }}'/g' ./charts/values.yaml
           helm dep up ./charts
           helm package ./charts/ -d dist --version ${{ env.CHART_VERSION }}
           helm cm-push ./dist/${{ env.APP_NAME }}-${{ env.CHART_VERSION }}.tgz ${{ env.APP_NAME }} -a ${{ env.APP_VERSION }} -v ${{ env.CHART_VERSION }} -u ${{ secrets.REGISTRY_USER_NAME }} -p ${{ secrets.REGISTRY_PASSWORD }}

charts/.relok8s-images.yaml

@@ -1,5 +1,5 @@
 # controller
-- "{{ .controller.image.registry }}/{{ .controller.image.repository }}:{{ .controller.image.tag }}"
+- "{{ .controller.image.registry }}/{{ .controller.image.repository }}:{{ .global.controller.imageTag }}"
 
 # cleanup
 - "{{ .cleanup.image.registry }}/{{ .cleanup.image.repository }}:{{ .cleanup.image.tag }}"

charts/Chart.lock

@@ -1,6 +1,3 @@
-dependencies:
-- name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 2.2.1
-digest: sha256:6c67cfa9945bf608209d4e2ca8f17079fca4770907c7902d984187ab5b21811e
-generated: "2022-12-02T16:25:03.611542+08:00"
+dependencies: []
+digest: sha256:643d5437104296e21d906ecb15b2c96ad278f20cfc4af53b12bb6069bd853726
+generated: "2022-12-16T11:08:15.527424+08:00"

charts/Chart.yaml

@@ -4,18 +4,13 @@ description: kubernetes-cronhpa-controller is a kubernetes cron horizontal pod a
   any kind object defined in kubernetes which support scale subresource(such as Deployment
   and StatefulSet).
 apiVersion: v2
-appVersion: 1.3.0
+appVersion: 0.0.1
 kubeVersion: ">=1.7.0-0"
 keywords:
   - cronhpa
   - namespace:kube-system
   - releaseName:kubernetes-cronhpa-controller
   - category:autoscaling
 home: https://github.com/AliyunContainerService/kubernetes-cronhpa-controller
-dependencies:
-  - name: common
-    repository: https://charts.bitnami.com/bitnami
-    tags:
-      - bitnami-common
-    version: 2.x.x
-version: 0.0.3
+dependencies: []
+version: 0.0.1

charts/charts/common-2.2.1.tgz

@@ -0,0 +1,41 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/*
+Return the target Kubernetes version
+*/}}
+{{- define "common.capabilities.kubeVersion" -}}
+{{- if .Values.global }}
+    {{- if .Values.global.kubeVersion }}
+    {{- .Values.global.kubeVersion -}}
+    {{- else }}
+    {{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+    {{- end -}}
+{{- else }}
+{{- default .Capabilities.KubeVersion.Version .Values.kubeVersion -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the proper image name
+{{ include "common.images.image" ( dict "imageRoot" .Values.path.to.the.image "global" $) }}
+*/}}
+{{- define "common.images.image" -}}
+{{- $registryName := .imageRoot.registry -}}
+{{- $repositoryName := .imageRoot.repository -}}
+{{- $tag := .imageRoot.tag | toString -}}
+{{- if .global }}
+    {{- if .global.imageRegistry }}
+     {{- $registryName = .global.imageRegistry -}}
+    {{- end -}}
+{{- end -}}
+{{- if .tag }}
+    {{- if .tag.imageTag }}
+     {{- $tag = .tag.imageTag -}}
+    {{- end -}}
+{{- end -}}
+{{- if $registryName }}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
+{{- else -}}
+{{- printf "%s:%s" $repositoryName $tag -}}
+{{- end -}}
+{{- end -}}

charts/templates/_commons.tpl

@@ -12,7 +12,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Return the cronhpa image name
 */}}
 {{- define "controller.image" -}}
-{{- include "common.images.image" (dict "imageRoot" .Values.controller.image "global" .Values.global) -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.controller.image "global" .Values.global "tag" .Values.global.controller) -}}
 {{- end -}}
 
 {{/*

charts/templates/_helpers.tpl

@@ -6,6 +6,10 @@ global:
   ## @param global.imageRegistry Global Docker image registry
   ##
   imageRegistry: ""
+  controller: 
+    ## @param global.imageTag Global controller image tag
+    ##
+    imageTag: ""
   ## Role Based Access
   ## Ref: https://kubernetes.io/docs/admin/authorization/rbac/
   ## @param global.rbac.create Create ClusterRole and ClusterRoleBinding
@@ -20,9 +24,9 @@ controller:
   ## @param controller.image.pullPolicy Controller image pull policy
   ##
   image: 
-    registry: ghcr.io
+    registry: ghcr.m.daocloud.io
     repository: daocloud/kubernetes-cronhpa-controller
-    tag: "v1.3.0"
+    tag: ""
     pullPolicy: IfNotPresent
 
   ## @param controller.timezone Timezone in controller pod
@@ -49,7 +53,7 @@ cleanup:
   ## @param cleanup.image.pullPolicy Cleanup job image pull policy
   ##
   image:
-    registry: ghcr.io
+    registry: ghcr.m.daocloud.io
     repository: cloudtty/cloudshell
     tag: "v0.5.0"
     pullPolicy: IfNotPresent