Ingress deprecation management (#24)

* if k8s version is >=1.19 use v1

* bump up version

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "2.1.1"
+version: "2.2.3"
 appVersion: "1.1.1"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 2.1.1](https://img.shields.io/badge/Version-2.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
+![Version: 2.2.3](https://img.shields.io/badge/Version-2.2.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.1](https://img.shields.io/badge/AppVersion-1.1.1-informational?style=flat-square)
 
 MLOps platform
 
@@ -131,6 +131,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-cpu.queues | string | `"default"` |  |
 | agentGroups.agent-group-cpu.replicaCount | int | `1` |  |
 | agentGroups.agent-group-cpu.tolerations | list | `[]` |  |
+| agentGroups.agent-group-cpu.updateStrategy | string | `"Recreate"` |  |
 | agentGroups.agent-group-gpu.affinity | object | `{}` |  |
 | agentGroups.agent-group-gpu.agentVersion | string | `""` |  |
 | agentGroups.agent-group-gpu.awsAccessKeyId | string | `nil` |  |
@@ -153,6 +154,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentGroups.agent-group-gpu.queues | string | `"default"` |  |
 | agentGroups.agent-group-gpu.replicaCount | int | `0` |  |
 | agentGroups.agent-group-gpu.tolerations | list | `[]` |  |
+| agentGroups.agent-group-gpu.updateStrategy | string | `"Recreate"` |  |
 | agentservices.affinity | object | `{}` |  |
 | agentservices.agentVersion | string | `""` |  |
 | agentservices.awsAccessKeyId | string | `nil` |  |

charts/clearml/templates/_helpers.tpl

@@ -95,3 +95,48 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+{{/*
+Create the name of the App service to use
+*/}}
+{{- define "clearml.serviceApp" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.tls.secretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- else }}
+{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApp .Values.ingress.host }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-webserver:" (.Values.webserver.service.port | quote) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the Api service to use
+*/}}
+{{- define "clearml.serviceApi" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.tls.secretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- else }}
+{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixApi .Values.ingress.host }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-apiserver:" (.Values.apiserver.service.port | quote) }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create the name of the Files service to use
+*/}}
+{{- define "clearml.serviceFiles" -}}
+{{- if .Values.ingress.enabled }}
+{{- if .Values.ingress.tls.secretName }}
+{{- printf "%s%s%s" "https://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- else }}
+{{- printf "%s%s%s" "http://" .Values.ingress.hostPrefixFiles .Values.ingress.host }}
+{{- end }}
+{{- else }}
+{{- printf "%s%s%s%s" "http://" (include "clearml.fullname" .) "-fileserver:" (.Values.fileserver.service.port | quote) }}
+{{- end }}
+{{- end }}

charts/clearml/templates/deployment-agent.yaml

@@ -9,6 +9,8 @@ metadata:
     {{- include "clearml.labels" $ | nindent 4 }}
 spec:
   replicas: {{ .replicaCount }}
+  strategy:
+    type: {{ .updateStrategy }}
   selector:
     matchLabels:
       {{- include "clearml.selectorLabelsAgent" $ | nindent 6 }}
@@ -38,7 +40,7 @@ spec:
             - -c
             - >
               set -x;
-              while [ $(curl -sw '%{http_code}' "http://{{ include "clearml.fullname" $ }}-apiserver:{{ $.Values.apiserver.service.port }}/debug.ping" -o /dev/null) -ne 200 ] ; do
+              while [ $(curl -sw '%{http_code}' "{{ include "clearml.serviceApi" $ }}/debug.ping" -o /dev/null) -ne 200 ] ; do
                 echo "waiting for apiserver" ;
                 sleep 5 ;
               done
@@ -54,11 +56,11 @@ spec:
                 {{ .nvidiaGpusPerAgent }}
           env:
           - name: CLEARML_API_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-apiserver:{{ $.Values.apiserver.service.port }}'
+            value: {{ include "clearml.serviceApi" $ }}
           - name: CLEARML_WEB_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-webserver:{{ $.Values.webserver.service.port }}'
+            value: {{ include "clearml.serviceApp" $ }}
           - name: CLEARML_FILES_HOST
-            value: 'http://{{ include "clearml.fullname" $ }}-fileserver:{{ $.Values.fileserver.service.port }}'
+            value: {{ include "clearml.serviceFiles" $ }}
           - name: CLEARML_AGENT_GIT_USER
             value: {{ .clearmlGitUser}}
           - name: CLEARML_AGENT_GIT_PASS

charts/clearml/templates/deployment-agentservices.yaml

@@ -30,7 +30,7 @@ spec:
               - -c
               - >
                 set -x;
-                while [ $(curl -sw '%{http_code}' "http://{{ include "clearml.fullname" . }}-apiserver:{{ .Values.apiserver.service.port }}/debug.ping" -o /dev/null) -ne 200 ] ; do
+                while [ $(curl -sw '%{http_code}' "{{ include "clearml.serviceApi" $ }}/debug.ping" -o /dev/null) -ne 200 ] ; do
                   echo "waiting for apiserver" ;
                   sleep 5 ;
                 done
@@ -42,7 +42,7 @@ spec:
           - name: CLEARML_HOST_IP
             value: {{ .Values.agentservices.clearmlHostIp }}
           - name: CLEARML_API_HOST
-            value: "http://{{ include "clearml.fullname" . }}-apiserver:{{ .Values.apiserver.service.port }}"
+            value: {{ include "clearml.serviceApi" $ }}
           - name: CLEARML_WEB_HOST
             value: {{ .Values.agentservices.clearmlWebHost }}
           - name: CLEARML_FILES_HOST

charts/clearml/templates/ingress-api.yaml

@@ -0,0 +1,35 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "clearml.fullname" . -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-api
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls.secretName }}
+  tls:
+    - hosts:
+        - "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
+      secretName: {{ .Values.ingress.tls.secretName }}
+  {{- end }}
+  rules:
+    - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              serviceName: {{ include "clearml.fullname" . }}-apiserver
+              servicePort: {{ .Values.apiserver.service.port }}
+{{- end }}

charts/clearml/templates/ingress-app.yaml

@@ -0,0 +1,35 @@
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "clearml.fullname" . -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-app
+  labels:
+    {{- include "clearml.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if .Values.ingress.tls.secretName }}
+  tls:
+    - hosts:
+        - "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
+      secretName: {{ .Values.ingress.tls.secretName }}
+  {{- end }}
+  rules:
+    - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
+      http:
+        paths:
+          - path: "/"
+            pathType: Prefix
+            backend:
+              serviceName: {{ include "clearml.fullname" . }}-webserver
+              servicePort: {{ .Values.webserver.service.port }}
+{{- end }}

charts/clearml/templates/ingress-files.yaml

@@ -1,13 +1,15 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "clearml.fullname" . -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: {{ $fullName }}-files
   labels:
     {{- include "clearml.labels" . | nindent 4 }}
   {{- with .Values.ingress.annotations }}
@@ -18,28 +20,10 @@ spec:
   {{- if .Values.ingress.tls.secretName }}
   tls:
     - hosts:
-        - "{{ .Values.ingress.hostPrefixAp }}{{ .Values.ingress.host }}"
         - "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
-        - "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
       secretName: {{ .Values.ingress.tls.secretName }}
   {{- end }}
   rules:
-    - host: "{{ .Values.ingress.hostPrefixApp }}{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-webserver
-              servicePort: {{ .Values.webserver.service.port }}
-    - host: "{{ .Values.ingress.hostPrefixApi }}{{ .Values.ingress.host }}"
-      http:
-        paths:
-          - path: "/"
-            pathType: Prefix
-            backend:
-              serviceName: {{ include "clearml.fullname" . }}-apiserver
-              servicePort: {{ .Values.apiserver.service.port }}
     - host: "{{ .Values.ingress.hostPrefixFiles }}{{ .Values.ingress.host }}"
       http:
         paths:

charts/clearml/values.yaml

@@ -186,6 +186,7 @@ agentGroups:
   agent-group-cpu:
     name: agent-group-cpu
     replicaCount: 1
+    updateStrategy: Recreate
     nvidiaGpusPerAgent: 0
     agentVersion: ""  # if set, it *MUST* include comparison operator (e.g. ">=0.16.1")
     queues: "default"  # multiple queues can be specified separated by a space (e.g. "important_jobs default")
@@ -218,6 +219,7 @@ agentGroups:
   agent-group-gpu:
     name: agent-group-gpu
     replicaCount: 0
+    updateStrategy: Recreate
     nvidiaGpusPerAgent: 1
     agentVersion: ""  # if set, it *MUST* include comparison operator (e.g. ">=0.16.1")
     queues: "default"  # multiple queues can be specified separated by a space (e.g. "important_jobs default")