Merge pull request #67 from qmhu/crane-release-v0.6.0

Bump up to v0.6.0

Author: qmhu

charts/crane/Chart.yaml

@@ -16,6 +16,6 @@ sources:
 
 type: application
 
-version: 0.5.0
+version: 0.6.0
 
-appVersion: v0.5.0
+appVersion: v0.6.0

charts/crane/templates/craned-deployment.yaml

@@ -29,6 +29,13 @@ spec:
         - name: craned
           image: "{{ .Values.craned.image.repository }}:{{ .Values.craned.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.craned.image.pullPolicy }}
+          env:
+            - name: TZ
+              value: Asia/Shanghai
+            - name: CRANE_SYSTEM_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           command:
             - /craned
           args:
@@ -185,7 +192,7 @@ data:
     }
 
     upstream cluster {
-        server craned.crane-system:8082;
+        server craned.{{ .Release.Namespace }}:8082;
     }
 
     resolver kube-dns.kube-system.svc.cluster.local valid=5s;
@@ -205,7 +212,7 @@ data:
             try_files $uri $uri/ /index.html;
         }
         location /grafana {
-            set $upstream_grafana grafana.crane-system.svc.cluster.local;
+            set $upstream_grafana grafana.{{ .Release.Namespace }}.svc.cluster.local;
             proxy_connect_timeout       180;
             proxy_send_timeout          180;
             proxy_read_timeout          180;

charts/scheduler/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 0.1.0
+appVersion: 0.2.0

charts/scheduler/templates/controller-deployment.yaml

@@ -22,6 +22,10 @@ spec:
           env:
             - name: TZ
               value: Asia/Shanghai
+            - name: CRANE_SYSTEM_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
           command:
             - /controller
             - --policy-config-path=/data/policy.yaml

charts/scheduler/templates/scheduler-configmap.yaml

@@ -6,7 +6,11 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   scheduler-config.yaml: |
+    {{- if ge .Capabilities.KubeVersion.Minor "22" }}
     apiVersion: kubescheduler.config.k8s.io/v1beta2
+    {{- else }}
+    apiVersion: kubescheduler.config.k8s.io/v1beta1
+    {{- end }}
     kind: KubeSchedulerConfiguration
     leaderElection:
       leaderElect: false

charts/scheduler/templates/scheduler-deployment.yaml

@@ -22,7 +22,11 @@ spec:
         - /scheduler
         - --leader-elect=false
         - --config=/etc/kubernetes/kube-scheduler/scheduler-config.yaml
-        image: "{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag | default .Chart.AppVersion }}"
+        { { - if ge .Capabilities.KubeVersion.Minor "22" } }
+        image: "{{ .Values.scheduler.image.repository }}:0.0.23"
+        { { - else } }
+        image: "{{ .Values.scheduler.image.repository }}:0.0.20"
+        { { - end } }
         livenessProbe:
           httpGet:
             path: /healthz

charts/scheduler/values.yaml

@@ -7,7 +7,7 @@ scheduler:
   name: crane-scheduler
   image:
     repository: docker.io/gocrane/crane-scheduler
-    tag: 0.0.23
+    tag: 0.1.23
   replicaCount: 1
 
 controller: