Fix glue agent image (#78)

* Changed: avoid latest image

* Changed: version bump

* Fixed: pull policy

* Removed: specific ci for glue since now it's on by default

* Fixed: don't refresh dependencies

* Changed: testing chart action version update

* Fixed: action

* Changed: dependency updates required

* Fixed: lint and install

* Revert "Changed: dependency updates required"

This reverts commit 34ee22d.

* Changed: use copy of dep charts because ththey may become unavailable

* Changed: updated readme

.github/workflows/ci.yaml

@@ -33,11 +33,7 @@ jobs:
           version: v0.11.1
           node_image: kindest/node:${{ matrix.k8s }}
       - name: Set up chart-testing
-        uses: helm/[email protected]
-      - name: Add bitnami repo
-        run: helm repo add bitnami https://charts.bitnami.com/bitnami
-      - name: Add elastic repo
-        run: helm repo add elastic https://helm.elastic.co
+        uses: helm/[email protected]
       - name: Run chart-testing (list-changed)
         id: list-changed
         run: |

charts/clearml/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: redis
-  repository: https://charts.bitnami.com/bitnami
+  repository: file://../../dependency_charts/redis
   version: 10.9.0
 - name: mongodb
-  repository: https://charts.bitnami.com/bitnami
+  repository: file://../../dependency_charts/mongodb
   version: 10.3.4
 - name: elasticsearch
-  repository: https://helm.elastic.co
+  repository: file://../../dependency_charts/elasticsearch
   version: 7.16.2
-digest: sha256:ac733cb02d50e8398c1d2832988333896f1c7b765c19a0f1eea5e9b24bdb8207
-generated: "2022-01-05T07:52:34.913745+01:00"
+digest: sha256:149b5a49382d280b1e083f3c193d014d3d2eb7fcdf3ec1402008996960cc173a
+generated: "2022-06-02T21:09:00.961174+02:00"

charts/clearml/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clearml
 description: MLOps platform
 type: application
-version: "3.10.2"
+version: "3.10.3"
 appVersion: "1.4.0"
 home: https://clear.ml
 icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
@@ -19,13 +19,13 @@ keywords:
 dependencies:
   - name: redis
     version: "10.9.0"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "file://../../dependency_charts/redis"
     condition: redis.enabled
   - name: mongodb
     version: "10.3.4"
-    repository: "https://charts.bitnami.com/bitnami"
+    repository: "file://../../dependency_charts/mongodb"
     condition: mongodb.enabled
   - name: elasticsearch
     version: "7.16.2"
-    repository: "https://helm.elastic.co"
+    repository: "file://../../dependency_charts/elasticsearch"
     condition: elasticsearch.enabled

charts/clearml/README.md

@@ -1,6 +1,6 @@
 # ClearML Ecosystem for Kubernetes
 
-![Version: 3.10.2](https://img.shields.io/badge/Version-3.10.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
+![Version: 3.10.3](https://img.shields.io/badge/Version-3.10.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.0](https://img.shields.io/badge/AppVersion-1.4.0-informational?style=flat-square)
 
 MLOps platform
 
@@ -121,9 +121,9 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://charts.bitnami.com/bitnami | mongodb | 10.3.4 |
-| https://charts.bitnami.com/bitnami | redis | 10.9.0 |
-| https://helm.elastic.co | elasticsearch | 7.16.2 |
+| file://../../dependency_charts/elasticsearch | elasticsearch | 7.16.2 |
+| file://../../dependency_charts/mongodb | mongodb | 10.3.4 |
+| file://../../dependency_charts/redis | redis | 10.9.0 |
 
 ## Values
 
@@ -181,7 +181,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
 | agentk8sglue.enabled | bool | `true` |  |
 | agentk8sglue.id | string | `"k8s-agent"` |  |
 | agentk8sglue.image.repository | string | `"allegroai/clearml-agent-k8s"` |  |
-| agentk8sglue.image.tag | string | `"latest"` |  |
+| agentk8sglue.image.tag | string | `"base-1.21"` |  |
 | agentk8sglue.maxPods | int | `10` |  |
 | agentk8sglue.podTemplate.env | list | `[]` |  |
 | agentk8sglue.podTemplate.nodeSelector | object | `{}` |  |

charts/clearml/templates/deployment-agentk8s.yaml

@@ -18,7 +18,7 @@ spec:
       containers:
       - name: k8s-glue-container
         image: "{{ .Values.agentk8sglue.image.repository }}:{{ .Values.agentk8sglue.image.tag }}"
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         command: ["/bin/bash", "-c", "export PATH=$PATH:$HOME/bin; source /root/.bashrc && /root/entrypoint.sh"]
         volumeMounts:
           - name: k8sagent-pod-template

charts/clearml/values.yaml

@@ -331,7 +331,7 @@ agentk8sglue:
   enabled: true
   image:
     repository: "allegroai/clearml-agent-k8s"
-    tag: "latest"
+    tag: "base-1.21"
   serviceAccountName: default
   maxPods: 10
   defaultDockerImage: nvidia/cuda:11.3.1-cudnn8-runtime-ubuntu20.04   # default docker image that is spawned as new pod

dependency_charts/elasticsearch/.helmignore

@@ -0,0 +1,2 @@
+tests/
+.pytest_cache/

dependency_charts/elasticsearch/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+appVersion: 7.16.2
+description: Official Elastic helm chart for Elasticsearch
+home: https://github.com/elastic/helm-charts
+icon: https://helm.elastic.co/icons/elasticsearch.png
+maintainers:
+- email: [email protected]
+  name: Elastic
+name: elasticsearch
+sources:
+- https://github.com/elastic/elasticsearch
+version: 7.16.2

dependency_charts/elasticsearch/Makefile

@@ -0,0 +1 @@
+include ../helpers/common.mk