✨ Update ingress templates, add pathType support

🔖 Fix missing version bump
ppy · Sep 5, 2023 · c2366da · c2366da
1 parent 0d0704e
commit c2366da
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 48 deletions.
diff --git a/osu/osu-beatmap-difficulty-lookup-cache/Chart.yaml b/osu/osu-beatmap-difficulty-lookup-cache/Chart.yaml
@@ -15,10 +15,10 @@ 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: 2022.818.0
+version: 2023.905.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2022.615.1"
+appVersion: "2022.1017.0"
diff --git a/osu/osu-beatmap-difficulty-lookup-cache/templates/ingress.yaml b/osu/osu-beatmap-difficulty-lookup-cache/templates/ingress.yaml
@@ -37,18 +37,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if eq $apiVersion "networking.k8s.io/v1" }}
-            pathType: Prefix
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if not (eq $apiVersion "networking.k8s.io/v1") }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- else }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
-                  name: http
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/osu/osu-beatmap-difficulty-lookup-cache/values.yaml b/osu/osu-beatmap-difficulty-lookup-cache/values.yaml
@@ -53,13 +53,15 @@ service:
 
 ingress:
   enabled: false
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  hosts: []
-    # - host: osu-beatmap-difficulty-lookup-cache.ppy.sh
-    #   paths:
-    #   - path: /
+  hosts:
+    - host: chart-example.local
+      paths:
+        - path: /
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/osu/osu-notification-server/Chart.yaml b/osu/osu-notification-server/Chart.yaml
@@ -15,10 +15,10 @@ 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: 2023.612.0
+version: 2023.905.0
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2022.819.0"
+appVersion: "2023.816.0"
diff --git a/osu/osu-notification-server/templates/ingress.yaml b/osu/osu-notification-server/templates/ingress.yaml
@@ -37,18 +37,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if eq $apiVersion "networking.k8s.io/v1" }}
-            pathType: Prefix
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if not (eq $apiVersion "networking.k8s.io/v1") }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- else }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
-                  name: http
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/osu/osu-notification-server/values.yaml b/osu/osu-notification-server/values.yaml
@@ -69,13 +69,15 @@ service:
 
 ingress:
   enabled: true
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
     - host: notify.ppy.sh
       paths:
-      - path: /
+        - path: /
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/osu/osu-server-spectator/Chart.yaml b/osu/osu-server-spectator/Chart.yaml
@@ -15,7 +15,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: 2023.901.0
+version: 2023.905.0
 
 # 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

diff --git a/osu/osu-server-spectator/templates/ingress.yaml b/osu/osu-server-spectator/templates/ingress.yaml
@@ -40,18 +40,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if eq $apiVersion "networking.k8s.io/v1" }}
-            pathType: Prefix
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if not (eq $apiVersion "networking.k8s.io/v1") }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- else }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
-                  name: http
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/osu/osu-server-spectator/values.yaml b/osu/osu-server-spectator/values.yaml
@@ -63,14 +63,15 @@ service:
 
 ingress:
   enabled: true
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
-  # ingressClassName: nginx
   hosts:
     - host: spectator.ppy.sh
       paths:
-      - path: /
+        - path: /
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/osu/osu-web/Chart.yaml b/osu/osu-web/Chart.yaml
@@ -15,7 +15,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: 2023.901.2
+version: 2023.905.0
 
 # 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

diff --git a/osu/osu-web/templates/ingress.yaml b/osu/osu-web/templates/ingress.yaml
@@ -53,18 +53,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if eq $apiVersion "networking.k8s.io/v1" }}
-            pathType: Prefix
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if not (eq $apiVersion "networking.k8s.io/v1") }}
-              serviceName: {{ $fullName }}{{ $config.serviceSuffix }}
-              servicePort: {{ $svcPort }}
-              {{- else }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}{{ $config.serviceSuffix }}
                 port:
                   name: http
+              {{- else }}
+              serviceName: {{ $fullName }}{{ $config.serviceSuffix }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/osu/osu-web/values.yaml b/osu/osu-web/values.yaml
@@ -376,10 +376,15 @@ service:
 
 ingress:
   enabled: true
+  className: ""
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
   hosts:
     - host: REPLACE_BY_APP_URL
       paths:
         - path: /
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:
@@ -425,6 +430,7 @@ ingressAssets:
     - host: REPLACE_BY_APP_URL
       paths:
         - path: /(assets/|images/|docs|favicon\.ico$|site\.webmanifest$)
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts:

diff --git a/osu/s3-nginx-proxy/Chart.yaml b/osu/s3-nginx-proxy/Chart.yaml
@@ -15,7 +15,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: 2023.512.0
+version: 2023.905.0
 
 # 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

diff --git a/osu/s3-nginx-proxy/templates/ingress.yaml b/osu/s3-nginx-proxy/templates/ingress.yaml
@@ -37,18 +37,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if eq $apiVersion "networking.k8s.io/v1" }}
-            pathType: Prefix
+            {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ .pathType }}
             {{- end }}
             backend:
-              {{- if not (eq $apiVersion "networking.k8s.io/v1") }}
-              serviceName: {{ $fullName }}
-              servicePort: {{ $svcPort }}
-              {{- else }}
+              {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
                 name: {{ $fullName }}
                 port:
-                  name: http
+                  number: {{ $svcPort }}
+              {{- else }}
+              serviceName: {{ $fullName }}
+              servicePort: {{ $svcPort }}
               {{- end }}
           {{- end }}
     {{- end }}

diff --git a/osu/s3-nginx-proxy/values.yaml b/osu/s3-nginx-proxy/values.yaml
@@ -104,13 +104,15 @@ service:
 
 ingress:
   enabled: true
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   hosts:
     - host: a.ppy.sh
       paths:
         - path: /
+          pathType: ImplementationSpecific
   tls: []
   #  - secretName: chart-example-tls
   #    hosts: