chore: remove Kustomize (#3081)

Everything is now managed by helm
block · Oct 11, 2024 · e518502 · e518502
1 parent e1adfce
commit e518502
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -103,8 +103,11 @@ jobs:
           password: ${{ secrets.FTL_DOCKER_PUSH_TOKEN }}
       - name: Push Helm Chart
         run: |
-          version="$(git describe --tags --abbrev=0 | sed s/v//)"
+          helm registry login -u ftl0 -p "$PASSWORD" registry-1.docker.io
+          version="$(git describe --tags --abbrev=0)"
           just chart release oci://registry-1.docker.io/ftl0/ftl-charts "$version"
+        env:
+          PASSWORD: ${{ secrets.FTL_DOCKER_PUSH_TOKEN }}
       - name: Push Docker Images
         run: |
           version="$(git describe --tags --abbrev=0)"

diff --git a/bin/.kustomize-5.4.3.pkg b/bin/.kustomize-5.4.3.pkg
diff --git a/bin/kustomize b/bin/kustomize
diff --git a/charts/Chart.lock b/charts/Chart.lock
@@ -6,4 +6,4 @@ dependencies:
   repository: https://helm.goharbor.io
   version: 1.15.1
 digest: sha256:54ee3d28306509e5360950f19a6ff0add5552f2a90adef6c50dcecf77d7fd119
-generated: "2024-10-10T14:53:25.059332+11:00"
+generated: "2024-10-11T12:37:53.504441+11:00"
diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -12,4 +12,4 @@ dependencies:
   - name: harbor
     version: v1.15.1
     repository: https://helm.goharbor.io
-    condition: harbor.enabled
+    condition: harbor.enabled
diff --git a/deployment/istio/istio.yaml → charts/templates/istio.yaml b/deployment/istio/istio.yaml → charts/templates/istio.yaml
@@ -1,10 +1,8 @@
-
----
+{{- if .Values.istio.enabled }}
 apiVersion: networking.istio.io/v1alpha3
 kind: EnvoyFilter
 metadata:
   name: enable-trailers
-  namespace: istio-system
 spec:
   configPatches:
     - applyTo: NETWORK_FILTER
@@ -30,4 +28,5 @@ spec:
               "@type": type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions
               explicit_http_config:
                 http_protocol_options:
-                  enable_trailers: true
+                  enable_trailers: true
+{{- end }}
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -159,3 +159,6 @@ postgresql:
         username: ftl
         password: ftl
         database: ftl
+
+istio:
+  enabled: false # set to true to have this chart install the grpc config to enable trailers
diff --git a/deployment/Justfile b/deployment/Justfile
@@ -57,7 +57,6 @@ install-istio:
       helm install istiod istio/istiod -n istio-system --wait
   fi
   kubectl label namespace default istio-injection=enabled --overwrite
-  kubectl kustomize --load-restrictor=LoadRestrictionsNone istio | kubectl apply -f -
 
 setup: setup-registry setup-cluster
 

diff --git a/deployment/istio/kustomization.yml b/deployment/istio/kustomization.yml
diff --git a/deployment/values.yaml b/deployment/values.yaml
@@ -11,4 +11,7 @@ controller:
   service:
     ports:
       - name: "http-8892"
-        port: 8892
+        port: 8892
+
+istio:
+  enabled: true