Fix lint errors caught by chart-testing (#5072)

flyteorg · Mar 21, 2024 · 049d99b · 049d99b
1 parent 2db8eed
commit 049d99b
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 70 deletions.
diff --git a/.github/workflows/validate-helm-charts.yaml b/.github/workflows/validate-helm-charts.yaml
@@ -28,6 +28,9 @@ jobs:
           python-version: "3.10"
           check-latest: true
 
+      - uses: unionai/[email protected]
+        name: Setup flytectl
+
       - name: Set up chart-testing
         uses: helm/chart-testing-action@v2
 
@@ -41,15 +44,16 @@ jobs:
 
       - name: Run chart-testing (lint)
         if: steps.charts-changed.outputs.changed == 'true'
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
-
-      - name: Create KinD cluster
-        if: steps.charts-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1
-
-      - name: Run chart-testing (install)
-        if: steps.charts-changed.outputs.changed == 'true'
-        run: ct install --target-branch ${{ github.event.repository.default_branch }}
+        run: |
+          ct lint \
+            --target-branch ${{ github.event.repository.default_branch }} \
+            --validate-maintainers=false \
+            --check-version-increment=false \
+            --chart-repos spark-operator=https://kubeflow.github.io/spark-operator \
+            --chart-repos dask=https://helm.dask.org \
+            --chart-repos bitnami=https://charts.bitnami.com/bitnami \
+            --chart-repos twuni=https://helm.twun.io \
+            --chart-repos kubernetes-dashboard=https://kubernetes.github.io/dashboard
 
   validate-manifests:
     needs:

diff --git a/Makefile b/Makefile
@@ -112,3 +112,8 @@ go-tidy:
 	make -C flyteplugins go-tidy
 	make -C flytestdlib go-tidy
 	make -C flytecopilot go-tidy
+
+.PHONY: lint-helm-charts
+lint-helm-charts:
+	# This pressuposes that you have act installed
+	act pull_request -W .github/workflows/validate-helm-charts.yaml --container-architecture linux/amd64 -e charts/event.json
diff --git a/charts/event.json b/charts/event.json
@@ -0,0 +1,5 @@
+{
+  "repository": {
+    "default_branch": "master"
+  }
+}
diff --git a/charts/flyte-binary/Chart.yaml b/charts/flyte-binary/Chart.yaml
@@ -7,7 +7,7 @@ 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: v0.1.10 # VERSION
+version: v0.1.10  # VERSION
 
 # 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
@@ -18,5 +18,5 @@ dependencies:
   - name: flyteagent
     condition: flyteagent.enabled
     alias: flyteagent
-    version: v0.1.10 # VERSION
-    repository: file://../flyteagent # REPOSITORY
+    version: v0.1.10  # VERSION
+    repository: file://../flyteagent  # REPOSITORY
diff --git a/charts/flyte-binary/values.yaml b/charts/flyte-binary/values.yaml
@@ -157,9 +157,9 @@ configuration:
     # image Configure image to use for CoPilot sidecar
     image:
       # repository CoPilot sidecar image repository
-      repository: cr.flyte.org/flyteorg/flytecopilot # FLYTECOPILOT_IMAGE
+      repository: cr.flyte.org/flyteorg/flytecopilot  # FLYTECOPILOT_IMAGE
       # tag CoPilot sidecar image tag
-      tag: v1.11.0 # FLYTECOPILOT_TAG
+      tag: v1.11.0  # FLYTECOPILOT_TAG
   # agentService Flyte Agent configuration
   agentService:
     defaultAgent:
@@ -209,9 +209,9 @@ deployment:
   # image Configure image to use for Flyte
   image:
     # repository Flyte image repository
-    repository: cr.flyte.org/flyteorg/flyte-binary # FLYTE_IMAGE
+    repository: cr.flyte.org/flyteorg/flyte-binary  # FLYTE_IMAGE
     # tag Flyte image tag
-    tag: latest # FLYTE_TAG
+    tag: latest  # FLYTE_TAG
     # pullPolicy Flyte image pull policy
     pullPolicy: IfNotPresent
   # extraEnvVars Array with extra environment variables to add to Flyte

diff --git a/charts/flyte-core/Chart.yaml b/charts/flyte-core/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 name: flyte-core
 description: A Helm chart for Flyte core
 type: application
-version: v0.1.10 # VERSION
+version: v0.1.10  # VERSION
 dependencies:
   - name: flyteagent
     condition: flyteagent.enabled
     alias: flyteagent
-    version: v0.1.10 # VERSION
-    repository: file://../flyteagent # REPOSITORY
+    version: v0.1.10  # VERSION
+    repository: file://../flyteagent  # REPOSITORY
diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml
@@ -15,8 +15,8 @@ flyteadmin:
   replicaCount: 1
   image:
     # -- Docker image for Flyteadmin deployment
-    repository: cr.flyte.org/flyteorg/flyteadmin # FLYTEADMIN_IMAGE
-    tag: v1.11.0 # FLYTEADMIN_TAG
+    repository: cr.flyte.org/flyteorg/flyteadmin  # FLYTEADMIN_IMAGE
+    tag: v1.11.0  # FLYTEADMIN_TAG
     pullPolicy: IfNotPresent
   # -- Additional flyteadmin container environment variables
   #
@@ -140,9 +140,9 @@ flytescheduler:
   runPrecheck: true
   image:
     # -- Docker image for Flytescheduler deployment
-    repository: cr.flyte.org/flyteorg/flytescheduler # FLYTESCHEDULER_IMAGE
+    repository: cr.flyte.org/flyteorg/flytescheduler  # FLYTESCHEDULER_IMAGE
     # -- Docker image tag
-    tag: v1.11.0 # FLYTESCHEDULER_TAG
+    tag: v1.11.0  # FLYTESCHEDULER_TAG
     # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flytescheduler deployment
@@ -206,9 +206,9 @@ datacatalog:
   replicaCount: 1
   image:
     # -- Docker image for Datacatalog deployment
-    repository: cr.flyte.org/flyteorg/datacatalog # DATACATALOG_IMAGE
+    repository: cr.flyte.org/flyteorg/datacatalog  # DATACATALOG_IMAGE
     # -- Docker image tag
-    tag: v1.11.0 # DATACATALOG_TAG
+    tag: v1.11.0  # DATACATALOG_TAG
     # -- Docker image pull policy
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Datacatalog deployment
@@ -295,8 +295,8 @@ flytepropeller:
   replicaCount: 1
   image:
     # -- Docker image for Flytepropeller deployment
-    repository: cr.flyte.org/flyteorg/flytepropeller # FLYTEPROPELLER_IMAGE
-    tag: v1.11.0 # FLYTEPROPELLER_TAG
+    repository: cr.flyte.org/flyteorg/flytepropeller  # FLYTEPROPELLER_IMAGE
+    tag: v1.11.0  # FLYTEPROPELLER_TAG
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flytepropeller deployment
   resources:
@@ -378,8 +378,8 @@ flyteconsole:
   replicaCount: 1
   image:
     # -- Docker image for Flyteconsole deployment
-    repository: cr.flyte.org/flyteorg/flyteconsole # FLYTECONSOLE_IMAGE
-    tag: v1.10.3 # FLYTECONSOLE_TAG
+    repository: cr.flyte.org/flyteorg/flyteconsole  # FLYTECONSOLE_IMAGE
+    tag: v1.10.3  # FLYTECONSOLE_TAG
     pullPolicy: IfNotPresent
   # -- Default resources requests and limits for Flyteconsole deployment
   resources:
@@ -731,7 +731,7 @@ configmap:
         # -- Structure documented [here](https://pkg.go.dev/github.com/lyft/[email protected]/go/tasks/pluginmachinery/flytek8s/config#FlyteCoPilotConfig)
         co-pilot:
           name: flyte-copilot-
-          image: cr.flyte.org/flyteorg/flytecopilot:v1.11.0 # FLYTECOPILOT_IMAGE
+          image: cr.flyte.org/flyteorg/flytecopilot:v1.11.0  # FLYTECOPILOT_IMAGE
           start-timeout: 30s
 
   # -- Core propeller configuration
@@ -869,7 +869,7 @@ external_events:
     # writing to fifo sns topics.
     topicName: "arn:aws:sns:us-east-2:123456:123-my-topic"
     eventTypes:
-      - all # Or workflow, node, task. Or "*"
+      - all  # Or workflow, node, task. Or "*"
 
 # Cloud events are used to send events (unprocessed, as Admin see them) in cloud event format to
 # an SNS topic (or gcp equivalent)
@@ -883,7 +883,7 @@ cloud_events:
     # writing to fifo sns topics.
     topicName: "arn:aws:sns:us-east-2:123456:123-my-topic"
     eventTypes:
-      - all # Or workflow, node, task. Or "*"
+      - all  # Or workflow, node, task. Or "*"
 
 # -- Configuration for the Cluster resource manager component. This is an optional component, that enables automatic
 # cluster configuration. This is useful to set default quotas, manage namespaces etc that map to a project/domain

diff --git a/charts/flyte-deps/Chart.yaml b/charts/flyte-deps/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: flyte-deps
 description: A Helm chart for Flyte dependency
 type: application
-version: v0.1.10 # VERSION
+version: v0.1.10  # VERSION
 dependencies:
   - name: contour
     version: 7.10.1

diff --git a/charts/flyte/Chart.yaml b/charts/flyte/Chart.yaml
@@ -2,12 +2,12 @@ apiVersion: v2
 name: flyte
 description: A Helm chart for Flyte Sandbox
 type: application
-version: v0.1.10 # VERSION
+version: v0.1.10  # VERSION
 dependencies:
   - name: flyte-core
     alias: flyte
-    version: v0.1.10 # VERSION
-    repository: file://../flyte-core # REPOSITORY
+    version: v0.1.10  # VERSION
+    repository: file://../flyte-core  # REPOSITORY
   - name: contour
     version: 7.10.1
     repository: https://charts.bitnami.com/bitnami

diff --git a/charts/flyte/values.yaml b/charts/flyte/values.yaml
@@ -1,4 +1,3 @@
---- # ---------------------------------------------------------------------
 # ---------------------------------------------------------------------
 # Core System settings
 # This section consists of Core components of Flyte and their deployment
@@ -14,9 +13,9 @@ flyte:
     replicaCount: 1
     image:
       # -- Docker image for Flyteadmin deployment
-      repository: cr.flyte.org/flyteorg/flyteadmin # FLYTEADMIN_IMAGE
+      repository: cr.flyte.org/flyteorg/flyteadmin  # FLYTEADMIN_IMAGE
       # -- Docker image tag
-      tag: v1.11.0 # FLYTEADMIN_TAG
+      tag: v1.11.0  # FLYTEADMIN_TAG
       # -- Docker image pull policy
       pullPolicy: IfNotPresent
     # -- Additional flyteadmin container environment variables
@@ -82,9 +81,9 @@ flyte:
   flytescheduler:
     image:
       # -- Docker image for Flytescheduler deployment
-      repository: cr.flyte.org/flyteorg/flytescheduler # FLYTESCHEDULER_IMAGE
+      repository: cr.flyte.org/flyteorg/flytescheduler  # FLYTESCHEDULER_IMAGE
       # -- Docker image tag
-      tag: v1.11.0 # FLYTESCHEDULER_TAG
+      tag: v1.11.0  # FLYTESCHEDULER_TAG
       # -- Docker image pull policy
       pullPolicy: IfNotPresent
     # -- Default resources requests and limits for Flytescheduler deployment
@@ -127,9 +126,9 @@ flyte:
     replicaCount: 1
     image:
       # -- Docker image for Datacatalog deployment
-      repository: cr.flyte.org/flyteorg/datacatalog # DATACATALOG_IMAGE
+      repository: cr.flyte.org/flyteorg/datacatalog  # DATACATALOG_IMAGE
       # -- Docker image tag
-      tag: v1.11.0 # DATACATALOG_TAG
+      tag: v1.11.0  # DATACATALOG_TAG
       # -- Docker image pull policy
       pullPolicy: IfNotPresent
     # -- Default resources requests and limits for Datacatalog deployment
@@ -176,9 +175,9 @@ flyte:
     manager: false
     image:
       # -- Docker image for Flytepropeller deployment
-      repository: cr.flyte.org/flyteorg/flytepropeller # FLYTEPROPELLER_IMAGE
+      repository: cr.flyte.org/flyteorg/flytepropeller  # FLYTEPROPELLER_IMAGE
       # -- Docker image tag
-      tag: v1.11.0 # FLYTEPROPELLER_TAG
+      tag: v1.11.0  # FLYTEPROPELLER_TAG
       # -- Docker image pull policy
       pullPolicy: IfNotPresent
     # -- Default resources requests and limits for Flytepropeller deployment
@@ -221,9 +220,9 @@ flyte:
     replicaCount: 1
     image:
       # -- Docker image for Flyteconsole deployment
-      repository: cr.flyte.org/flyteorg/flyteconsole # FLYTECONSOLE_IMAGE
+      repository: cr.flyte.org/flyteorg/flyteconsole  # FLYTECONSOLE_IMAGE
       # -- Docker image tag
-      tag: v1.10.3 # FLYTECONSOLE_TAG
+      tag: v1.10.3  # FLYTECONSOLE_TAG
       # -- Docker image pull policy
       pullPolicy: IfNotPresent
     # -- Default resources requests and limits for Flyteconsole deployment
@@ -471,7 +470,7 @@ flyte:
           # -- Structure documented [here](https://pkg.go.dev/github.com/lyft/[email protected]/go/tasks/pluginmachinery/flytek8s/config#FlyteCoPilotConfig)
           co-pilot:
             name: flyte-copilot-
-            image: cr.flyte.org/flyteorg/flytecopilot:v1.11.0 # FLYTECOPILOT_IMAGE
+            image: cr.flyte.org/flyteorg/flytecopilot:v1.11.0  # FLYTECOPILOT_IMAGE
             start-timeout: 30s
 
     # -- Core propeller configuration

diff --git a/charts/flyteagent/Chart.yaml b/charts/flyteagent/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 name: flyteagent
 description: A Helm chart for Flyte agent
 type: application
-version: v0.1.10 # VERSION
+version: v0.1.10  # VERSION
diff --git a/charts/flyteagent/values.yaml b/charts/flyteagent/values.yaml
@@ -23,7 +23,7 @@ image:
   # -- Docker image for flyteagent deployment
   repository: ghcr.io/flyteorg/flyteagent
   # -- Docker image tag
-  tag: 1.10.8b4 # FLYTEAGENT_TAG
+  tag: 1.10.8b4  # FLYTEAGENT_TAG
   # -- Docker image pull policy
   pullPolicy: IfNotPresent
 ports:

diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml
@@ -816,7 +816,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: U0tNSVV0aUwzZzYxNVZnVQ==
+  haSharedSecret: cXlqVDl3WXZzQkdNakZYMQ==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1412,7 +1412,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: e0d4db2f1f52d2e4d16959b463e9470d657899ab22db5d8eb2fbc605cdcda0a2
+        checksum/secret: e8771c5d0e150ac22e8f1e40a0d9bcd0ebe566f4d103895b57453c2265a1eb3f
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml
@@ -796,7 +796,7 @@ type: Opaque
 ---
 apiVersion: v1
 data:
-  haSharedSecret: bmNtdzJkQ0l2Rm5BS3VZSg==
+  haSharedSecret: RUcxZW8xZ1JDUzE1YWZ3cw==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -1360,7 +1360,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: b1ca10c95becb2e7214c9ece8101acc322ecde650f1e70bdb1bbb37323c948f6
+        checksum/secret: b811e69f9269eac2e23e99932ddee4f60da5e159b77380a2f172d53015ffce9d
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml
@@ -499,7 +499,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  haSharedSecret: S2hmRkxmVjdKZUpoTkR6OQ==
+  haSharedSecret: b01yOG9RRDI2SzNUNFdaRg==
   proxyPassword: ""
   proxyUsername: ""
 kind: Secret
@@ -934,7 +934,7 @@ spec:
     metadata:
       annotations:
         checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81
-        checksum/secret: 446da9acad72026ea6684e9f0cf3e47f8a458fa10d29d61ac3f8bc509afc7c11
+        checksum/secret: 13d5e62f1350c3c3a73b6a42bf1ec1ee492fe4d34ed050b66907368f5cd502ce
       labels:
         app: docker-registry
         release: flyte-sandbox

diff --git a/script/release.sh b/script/release.sh
@@ -9,23 +9,23 @@ FLYTEKIT_TAG=$(curl --silent "https://api.github.com/repos/flyteorg/flytekit/rel
 FLYTECONSOLE_TAG=v1.10.3
 
 # bump latest release of flyte component in helm
-sed -i "s,tag:[^P]*# FLYTEADMIN_TAG,tag: ${VERSION} # FLYTEADMIN_TAG," ./charts/flyte/values.yaml
-sed -i "s,tag:[^P]*# FLYTEADMIN_TAG,tag: ${VERSION} # FLYTEADMIN_TAG," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# FLYTEADMIN_TAG,tag: ${VERSION}  # FLYTEADMIN_TAG," ./charts/flyte/values.yaml
+sed -i "s,tag:[^P]*# FLYTEADMIN_TAG,tag: ${VERSION}  # FLYTEADMIN_TAG," ./charts/flyte-core/values.yaml
 
-sed -i "s,tag:[^P]*# FLYTESCHEDULER_TAG,tag: ${VERSION} # FLYTESCHEDULER_TAG," ./charts/flyte/values.yaml
-sed -i "s,tag:[^P]*# FLYTESCHEDULER_TAG,tag: ${VERSION} # FLYTESCHEDULER_TAG," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# FLYTESCHEDULER_TAG,tag: ${VERSION}  # FLYTESCHEDULER_TAG," ./charts/flyte/values.yaml
+sed -i "s,tag:[^P]*# FLYTESCHEDULER_TAG,tag: ${VERSION}  # FLYTESCHEDULER_TAG," ./charts/flyte-core/values.yaml
 
-sed -i "s,tag:[^P]*# DATACATALOG_TAG,tag: ${VERSION} # DATACATALOG_TAG," ./charts/flyte/values.yaml
-sed -i "s,tag:[^P]*# DATACATALOG_TAG,tag: ${VERSION} # DATACATALOG_TAG," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# DATACATALOG_TAG,tag: ${VERSION}  # DATACATALOG_TAG," ./charts/flyte/values.yaml
+sed -i "s,tag:[^P]*# DATACATALOG_TAG,tag: ${VERSION}  # DATACATALOG_TAG," ./charts/flyte-core/values.yaml
 
-sed -i "s,tag:[^P]*# FLYTECONSOLE_TAG,tag: ${FLYTECONSOLE_TAG} # FLYTECONSOLE_TAG," ./charts/flyte/values.yaml
-sed -i "s,tag:[^P]*# FLYTECONSOLE_TAG,tag: ${FLYTECONSOLE_TAG} # FLYTECONSOLE_TAG," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# FLYTECONSOLE_TAG,tag: ${FLYTECONSOLE_TAG}  # FLYTECONSOLE_TAG," ./charts/flyte/values.yaml
+sed -i "s,tag:[^P]*# FLYTECONSOLE_TAG,tag: ${FLYTECONSOLE_TAG}  # FLYTECONSOLE_TAG," ./charts/flyte-core/values.yaml
 
-sed -i "s,tag:[^P]*# FLYTEPROPELLER_TAG,tag: ${VERSION} # FLYTEPROPELLER_TAG," ./charts/flyte/values.yaml
-sed -i "s,tag:[^P]*# FLYTEPROPELLER_TAG,tag: ${VERSION} # FLYTEPROPELLER_TAG," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# FLYTEPROPELLER_TAG,tag: ${VERSION}  # FLYTEPROPELLER_TAG," ./charts/flyte/values.yaml
+sed -i "s,tag:[^P]*# FLYTEPROPELLER_TAG,tag: ${VERSION}  # FLYTEPROPELLER_TAG," ./charts/flyte-core/values.yaml
 
-sed -i "s,image:[^P]*# FLYTECOPILOT_IMAGE,image: cr.flyte.org/flyteorg/flytecopilot:${VERSION} # FLYTECOPILOT_IMAGE," ./charts/flyte/values.yaml
-sed -i "s,image:[^P]*# FLYTECOPILOT_IMAGE,image: cr.flyte.org/flyteorg/flytecopilot:${VERSION} # FLYTECOPILOT_IMAGE," ./charts/flyte-core/values.yaml
-sed -i "s,tag:[^P]*# FLYTECOPILOT_TAG,tag: ${VERSION} # FLYTECOPILOT_TAG," ./charts/flyte-binary/values.yaml
+sed -i "s,image:[^P]*# FLYTECOPILOT_IMAGE,image: cr.flyte.org/flyteorg/flytecopilot:${VERSION}  # FLYTECOPILOT_IMAGE," ./charts/flyte/values.yaml
+sed -i "s,image:[^P]*# FLYTECOPILOT_IMAGE,image: cr.flyte.org/flyteorg/flytecopilot:${VERSION}  # FLYTECOPILOT_IMAGE," ./charts/flyte-core/values.yaml
+sed -i "s,tag:[^P]*# FLYTECOPILOT_TAG,tag: ${VERSION}  # FLYTECOPILOT_TAG," ./charts/flyte-binary/values.yaml
 
-sed -i "s,tag:[^P]*# FLYTEAGENT_TAG,tag: ${FLYTEKIT_TAG} # FLYTEAGENT_TAG," ./charts/flyteagent/values.yaml
+sed -i "s,tag:[^P]*# FLYTEAGENT_TAG,tag: ${FLYTEKIT_TAG}  # FLYTEAGENT_TAG," ./charts/flyteagent/values.yaml