diff --git a/helmfile.yaml b/helmfile.yaml index 39758d4..e6e3cee 100644 --- a/helmfile.yaml +++ b/helmfile.yaml @@ -11,14 +11,6 @@ templates: values: - '{{ requiredEnv "PWD" }}/istio.yaml' - ext-tcp-routes: - dependencies: - - chart: bedag/raw - version: 2.0.0 - alias: traefik - values: - - '{{ requiredEnv "PWD" }}/tcp-route.yaml' - repositories: - name: bedag url: https://bedag.github.io/helm-charts/ @@ -29,11 +21,10 @@ releases: - name: minecraft chart: minecraft/minecraft namespace: minecraft-application - version: 4.19.0 + version: 4.15.0 values: - ./values.yaml secrets: - ./secrets.yaml inherit: - template: ext-istio-resource - - template: ext-tcp-routes diff --git a/tcp-route.yaml b/tcp-route.yaml deleted file mode 100644 index 5331ede..0000000 --- a/tcp-route.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -traefik: - templates: - - | - {{ range .Values.tcpRoutes }} - --- - apiVersion: traefik.io/v1alpha1 - kind: IngressRouteTCP - metadata: - name: {{ .name }} - spec: - entryPoints: - - {{ .entrypoint }} - routes: - - match: {{ .match }} - services: - - name: {{ .service }} - nativeLB: true - port: {{ .port }} - {{- end }} diff --git a/values.yaml b/values.yaml index 864f7f4..e5df96a 100644 --- a/values.yaml +++ b/values.yaml @@ -14,20 +14,21 @@ service-account: # -- Istio extenstion. Just because I'm # -- not using ingress nginx # ------------------------------------------ -traefik: +istio: enabled: true - tcpRoutes: + istio: - name: minecraft-tcp - entrypoint: minecraft gateway: istio-system/badhouseplants-minecraft - match: HostSNI(`*`) + kind: tcp + port_match: 25565 + hostname: "*" service: minecraft-minecraft port: 25565 # -------------------------------------------------- # -- Main values # -------------------------------------------------- image: - tag: java17-graalvm + tag: java17-graalvm-ce pullPolicy: Always resources: