Merge pull request #12 from eahydra/support_image_repo_host

support imageRepositoryHost value

Author: hormes

README.md

@@ -5,7 +5,7 @@
 Koordinator Charts is a collection of **community maintained** charts for http://koordinator.sh/ projects. The charts can be added using following command:
 
 ```
-helm repo add koordinator https://koordinator-sh.github.io/charts
+helm repo add koordinator-sh https://koordinator-sh.github.io/charts
 ```
 
 ## Contributing

versions/v0.1.0/README.md

@@ -15,6 +15,7 @@ The following table lists the configurable parameters of the chart and their def
 | `featureGates`                            | Feature gates for Koordinator, empty string means all by default | ` `                             |
 | `installation.namespace`                  | namespace for Koordinator installation                           | `koordinator-system`            |
 | `installation.createNamespace`            | Whether to create the installation.namespace                     | `true`                          |
+| `imageRepositoryHost`                     | Image repository host                                            | ` `                             |
 | `manager.log.level`                       | Log level that koord-manager printed                             | `4`                             |
 | `manager.replicas`                        | Replicas of koord-manager deployment                             | `2`                             |
 | `manager.image.repository`                | Repository for koord-manager image                               | `koordinatorsh/koord-manager`   |
@@ -80,5 +81,5 @@ If you want to enable all feature-gates, set the parameter as `featureGates=AllA
 If you are in China and have problem to pull image from official DockerHub, you can use the registry hosted on Alibaba Cloud:
 
 ```bash
-$ helm install koordinator https://... --set  manager.image.repository=koordinator-registry.cn-hangzhou.cr.aliyuncs.com/koordinator/koord-manager
+$ helm install koordinator https://... --set imageRepositoryHost=koordinator-registry.cn-hangzhou.cr.aliyuncs.com
 ```

versions/v0.1.0/templates/_helpers.tpl

@@ -73,7 +73,7 @@ ports:
 - port: 443
   targetPort: {{ .Values.manager.webhook.port }}
 selector:
-  koord-app: koordinator-manager
+  koord-app: koord-manager
 {{- end -}}
 
 {{- define "webhookSecretData" -}}
@@ -87,22 +87,11 @@ data:
 {{- end -}}
 
 {{- define "serviceAccountManager" -}}
-{{- $sa := lookup "v1" "ServiceAccount" .Values.installation.namespace "koordinator-manager" -}}
+{{- $sa := lookup "v1" "ServiceAccount" .Values.installation.namespace "koord-manager" -}}
 {{- if $sa -}}
 secrets:
 {{- range $v := $sa.secrets }}
 - name: {{ $v.name }}
 {{- end }}
 {{- end }}
 {{- end -}}
-
-{{- define "serviceAccountDaemon" -}}
-{{- $sa := lookup "v1" "ServiceAccount" .Values.installation.namespace "koordinator-daemon" -}}
-{{- if $sa -}}
-secrets:
-{{- range $v := $sa.secrets }}
-- name: {{ $v.name }}
-{{- end }}
-{{- end }}
-{{- end -}}
-

versions/v0.1.0/templates/koord-manager.yaml

@@ -24,14 +24,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    koord-app: koordinator-manager
-  name: koordinator-manager
+    koord-app: koord-manager
+  name: koord-manager
   namespace: {{ .Values.installation.namespace }}
 spec:
   replicas: {{ .Values.manager.replicas }}
   selector:
     matchLabels:
-      koord-app: koordinator-manager
+      koord-app: koord-manager
   minReadySeconds: 3
   strategy:
     type: RollingUpdate
@@ -41,7 +41,7 @@ spec:
   template:
     metadata:
       labels:
-        koord-app: koordinator-manager
+        koord-app: koord-manager
     spec:
 {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -59,7 +59,11 @@ spec:
             - --sync-period={{ .Values.manager.resyncPeriod }}
           command:
             - /koord-manager
+          {{- if .Values.imageRepositoryHost }}
+          image: {{ .Values.imageRepositoryHost }}/{{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}
+          {{- else }}
           image: {{ .Values.manager.image.repository }}:{{ .Values.manager.image.tag }}
+          {{- end}}
           imagePullPolicy: Always
           name: manager
           env:
@@ -89,7 +93,7 @@ spec:
             {{- toYaml .Values.manager.resources | nindent 12 }}
       hostNetwork: {{ .Values.manager.hostNetwork }}
       terminationGracePeriodSeconds: 10
-      serviceAccountName: koordinator-manager
+      serviceAccountName: koord-manager
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -99,7 +103,7 @@ spec:
                 - key: koord-app
                   operator: In
                   values:
-                  - koordinator-manager
+                  - koord-manager
               topologyKey: kubernetes.io/hostname
             weight: 100
 {{- with .Values.manager.nodeAffinity }}
@@ -120,7 +124,7 @@ spec:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: koordinator-manager
+  name: koord-manager
 {{- if .Values.serviceAccount.annotations }}
   annotations:
 {{ toYaml .Values.serviceAccount.annotations | indent 4 }}

versions/v0.1.0/templates/koord-scheduler.yaml

@@ -2,14 +2,14 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    koord-app: koordinator-scheduler
-  name: koordinator-scheduler
+    koord-app: koord-scheduler
+  name: koord-scheduler
   namespace: {{ .Values.installation.namespace }}
 spec:
   replicas: {{ .Values.scheduler.replicas }}
   selector:
     matchLabels:
-      koord-app: koordinator-scheduler
+      koord-app: koord-scheduler
   minReadySeconds: 3
   strategy:
     type: RollingUpdate
@@ -19,7 +19,7 @@ spec:
   template:
     metadata:
       labels:
-        koord-app: koordinator-scheduler
+        koord-app: koord-scheduler
     spec:
 {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -39,7 +39,11 @@ spec:
             - --config=/config/koord-scheduler.config
           command:
             - /koord-scheduler
+          {{- if .Values.imageRepositoryHost }}
+          image: {{ .Values.imageRepositoryHost }}/{{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag }}
+          {{- else }}
           image: {{ .Values.scheduler.image.repository }}:{{ .Values.scheduler.image.tag }}
+          {{- end}}
           imagePullPolicy: Always
           name: scheduler
           volumeMounts:
@@ -53,7 +57,7 @@ spec:
             {{- toYaml .Values.scheduler.resources | nindent 12 }}
       hostNetwork: {{ .Values.scheduler.hostNetwork }}
       terminationGracePeriodSeconds: 10
-      serviceAccountName: koordinator-scheduler
+      serviceAccountName: koord-scheduler
       volumes:
       - configMap:
           defaultMode: 420
@@ -71,7 +75,7 @@ spec:
                 - key: koord-app
                   operator: In
                   values:
-                  - koordinator-scheduler
+                  - koord-scheduler
               topologyKey: kubernetes.io/hostname
             weight: 100
 {{- with .Values.scheduler.nodeAffinity }}

versions/v0.1.0/templates/koordlet.yaml

@@ -31,7 +31,11 @@ spec:
             - -feature-gates=AllAlpha=true
             - --logtostderr=true
             - --v={{ .Values.koordlet.log.level }}
+          {{- if .Values.imageRepositoryHost }}
+          image: {{ .Values.imageRepositoryHost }}/{{ .Values.koordlet.image.repository }}:{{ .Values.koordlet.image.tag }}
+          {{- else }}
           image: {{ .Values.koordlet.image.repository }}:{{ .Values.koordlet.image.tag }}
+          {{- end}}
           imagePullPolicy: Always
           name: koordlet
           env:

versions/v0.1.0/templates/rbac_role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: koordinator-leader-election-role
+  name: koord-leader-election-role
   namespace: {{ .Values.installation.namespace }}
 rules:
 - apiGroups:
@@ -35,7 +35,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   creationTimestamp: null
-  name: koordinator-manager-role
+  name: koord-manager-role
 rules:
 - apiGroups:
   - ""
@@ -150,6 +150,14 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - scheduling.k8s.io
+  resources:
+  - priorityclasses
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - config.koordinator.sh
   - slo.koordinator.sh
@@ -167,28 +175,28 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: koordinator-leader-election-rolebinding
+  name: koord-leader-election-rolebinding
   namespace: {{ .Values.installation.namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: koordinator-leader-election-role
+  name: koord-leader-election-role
 subjects:
   - kind: ServiceAccount
-    name: koordinator-manager
+    name: koord-manager
     namespace: {{ .Values.installation.namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: koordinator-manager-rolebinding
+  name: koord-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: koordinator-manager-role
+  name: koord-manager-role
 subjects:
   - kind: ServiceAccount
-    name: koordinator-manager
+    name: koord-manager
     namespace: {{ .Values.installation.namespace }}
 ---
 apiVersion: v1
@@ -252,31 +260,31 @@ subjects:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: koordinator-scheduler
+  name: koord-scheduler
   namespace: {{ .Values.installation.namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: koordinator-scheduler-rolebinding
+  name: koord-scheduler-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:kube-scheduler
 subjects:
   - kind: ServiceAccount
-    name: koordinator-scheduler
+    name: koord-scheduler
     namespace: {{ .Values.installation.namespace }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: koordinator-scheduler-rolebinding-volume
+  name: koord-scheduler-rolebinding-volume
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:volume-scheduler
 subjects:
   - kind: ServiceAccount
-    name: koordinator-scheduler
+    name: koord-scheduler
     namespace: {{ .Values.installation.namespace }}

versions/v0.1.0/templates/webhookconfiguration.yaml

@@ -65,7 +65,8 @@ webhooks:
     apiVersions:
     - v1
     operations:
+    - CREATE
     - UPDATE
     resources:
     - pods
-{{- end }}
+{{- end }}

versions/v0.1.0/values.yaml

@@ -13,6 +13,8 @@ installation:
 
 featureGates: ""
 
+imageRepositoryHost: ""
+
 koordlet:
   image:
     repository: koordinatorsh/koordlet
@@ -25,13 +27,13 @@ koordlet:
       cpu: "0"
       memory: "0"
   log:
-    # log level for koordinator-manager
+    # log level for koordlet
     level: "4"
 
 manager:
   # settings for log print
   log:
-    # log level for koordinator-manager
+    # log level for koord-manager
     level: "4"
 
   replicas: 2
@@ -47,7 +49,7 @@ manager:
 
   resyncPeriod: "0"
 
-  # resources of koordinator-manager container
+  # resources of koord-manager container
   resources:
     limits:
       cpu: 1000m
@@ -74,7 +76,7 @@ serviceAccount:
 scheduler:
   # settings for log print
   log:
-    # log level for koordinator-manager
+    # log level for koord-scheduler
     level: "4"
 
   replicas: 2
@@ -83,7 +85,7 @@ scheduler:
     tag: v0.1.0-bf37294
   port: 10251
 
-  # resources of koordinator-manager container
+  # resources of koord-scheduler container
   resources:
     limits:
       cpu: 1000m