Merge branch 'main' into gateway_tests

Author: DanielRaapDev

charts/o-neko/Chart.yaml

@@ -2,13 +2,13 @@ apiVersion: v2
 name: o-neko
 description: A Helm chart for O-Neko
 type: application
-version: 2.0.0
+version: 2.0.1
 annotations:
   artifacthub.io/changes: |
-    - kind: removed
-      description: "Removed mongodb Bitnami helm chart dependency. You need to provide MongoDB yourself. Consider using the Helm chart mongodb by groundhog2k. All values `mongodb.*` are obsolete now."
+    - kind: changed
+      description: "Updated O-Neko to 1.8.2"
 
-appVersion: "1.8.0"
+appVersion: "1.8.2"
 sources:
   - https://github.com/subshell/o-neko/
   - https://github.com/subshell/helm-charts/tree/main/charts/o-neko

charts/o-neko/values.yaml

@@ -33,7 +33,7 @@ oneko:
   ## @param oneko.image.imagePullPolicy Image Pull Policy
   image:
     name: subshellgmbh/o-neko
-    tag: 1.8.0
+    tag: 1.8.2
     imagePullPolicy: IfNotPresent
 
   ## @extra oneko.env array of environment variables passed to the container

charts/sophora-importer/Chart.yaml

@@ -15,11 +15,11 @@ 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: 2.3.0
+version: 2.4.1
 annotations:
   artifacthub.io/changes: |
-    - kind: added
-      description: "enable custom pod labels"
+    - kind: fixed
+      description: "fix service Port of httproute"
 
 # 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

charts/sophora-importer/templates/httproute.yaml

@@ -0,0 +1,36 @@
+{{- if .Values.httpRoute.enabled -}}
+{{- $fullName := include "sophora-importer.fullname" . -}}
+{{- $svcPort := .Values.service.httpPort -}}
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: {{ $fullName }}
+  labels:
+    {{- include "sophora-importer.labels" . | nindent 4 }}
+  {{- with .Values.httpRoute.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  parentRefs:
+    {{- with .Values.httpRoute.parentRefs }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.httpRoute.hostnames }}
+  hostnames:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  rules:
+    {{- range .Values.httpRoute.rules }}
+    - matches:
+        {{- toYaml .matches | nindent 8 }}
+      {{- with .filters }}
+      filters:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      backendRefs:
+        - name: {{ $fullName }}
+          port: {{ $svcPort }}
+          weight: 1
+    {{- end }}
+{{- end }}

charts/sophora-importer/test-values.yaml

@@ -126,3 +126,23 @@ extraIngress:
       foo: baz
     hosts:
     tls: []
+
+httpRoute:
+  # HTTPRoute enabled.
+  enabled: true
+  # HTTPRoute annotations.
+  annotations: {}
+  # Which Gateways this Route is attached to.
+  parentRefs:
+    - name: gateway
+      sectionName: http
+      # namespace: default
+  # Hostnames matching HTTP header.
+  hostnames:
+    - chart-example.local
+  # List of rules and filters applied.
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /headers

charts/sophora-importer/values.yaml

@@ -133,3 +133,23 @@ additionalVolumeMounts:
 
 # This option can be used to create a pvc for the local import folders
 importPvcSpec:
+
+httpRoute:
+  # HTTPRoute enabled.
+  enabled: false
+  # HTTPRoute annotations.
+  annotations: {}
+  # Which Gateways this Route is attached to.
+  parentRefs: []
+    #- name: gateway
+      #sectionName: http
+      # namespace: default
+  # Hostnames matching HTTP header.
+  hostnames: []
+    #- chart-example.local
+  # List of rules and filters applied.
+  rules: []
+    #- matches:
+        #- path:
+            #type: PathPrefix
+            #value: /headers

charts/sophora-server/Chart.yaml

@@ -15,11 +15,11 @@ 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: 3.1.0
+version: 3.1.1
 annotations:
   artifacthub.io/changes: |
-    - kind: "added"
-      description: "Add additional service selector label config"     
+    - kind: "changed"
+      description: "The Sophora server uses -XX:+CrashOnOutOfMemoryError instead of -XX:+ExitOnOutOfMemoryError"      
 
 # 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

charts/sophora-server/values.yaml

@@ -37,7 +37,7 @@ configGenerator:
     pullPolicy: IfNotPresent
 
 # Default Java options. Additional Java options (like -XX:+UseLargePages) should be added via `extraJavaOptions`.
-javaOptions: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -XX:+UseG1GC -XX:+ExitOnOutOfMemoryError -XX:+AlwaysPreTouch -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:G1HeapRegionSize=8m -XX:MaxGCPauseMillis=250 -XX:InitiatingHeapOccupancyPercent=75"
+javaOptions: "-XX:InitialRAMPercentage=50.0 -XX:MaxRAMPercentage=80.0 -XX:+UseG1GC -XX:+CrashOnOutOfMemoryError -XX:+AlwaysPreTouch -XX:+PerfDisableSharedMem -XX:+ParallelRefProcEnabled -XX:G1HeapRegionSize=8m -XX:MaxGCPauseMillis=250 -XX:InitiatingHeapOccupancyPercent=75"
 # Extra Java options in addition to `javaOptions`. Use this if you don't want to override `javaOptions`.
 extraJavaOptions: