diff --git a/automation/schulportal-client/Chart.yaml b/automation/schulportal-client/Chart.yaml index 913f8ec5c..f05b9b2b2 100644 --- a/automation/schulportal-client/Chart.yaml +++ b/automation/schulportal-client/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: spsh-1654 +appVersion: SPSH-1377 description: Helm-Chart for schulportal-client name: schulportal-client type: application -version: 0.0.0-spsh-1654-20250113-1344 +version: 0.0.0-spsh-1377-20250113-1443 diff --git a/automation/schulportal-client/templates/deployment.yaml b/automation/schulportal-client/templates/deployment.yaml index 0e49f3ff9..e6d0b0c80 100644 --- a/automation/schulportal-client/templates/deployment.yaml +++ b/automation/schulportal-client/templates/deployment.yaml @@ -33,3 +33,4 @@ spec: - name: {{ .Values.containerPorts.name }} containerPort: {{ .Values.containerPorts.http }} protocol: TCP + diff --git a/automation/schulportal-client/templates/ingress.yaml b/automation/schulportal-client/templates/ingress.yaml index a1f3bb471..6c021465f 100644 --- a/automation/schulportal-client/templates/ingress.yaml +++ b/automation/schulportal-client/templates/ingress.yaml @@ -11,12 +11,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - tls: - - hosts: - - {{ .Values.frontendHostname }} ingressClassName: {{ .Values.ingress.ingressClassName }} rules: - - host: {{ .Values.frontendHostname }} + - host: {{.Values.frontendHostname}} http: paths: - path: {{ .Values.ingress.path }} diff --git a/automation/schulportal-client/templates/ingress2nd.yaml b/automation/schulportal-client/templates/ingress2nd.yaml deleted file mode 100644 index b40207529..000000000 --- a/automation/schulportal-client/templates/ingress2nd.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if .Values.ingress.enabled2nd -}} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: {{ template "common.names.name" . }}-2nd - namespace: {{ template "common.names.namespace" . }} - labels: - {{- include "common.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - ingressClassName: {{ .Values.ingress.ingressClassName }} - rules: - - host: {{.Values.frontend2ndHostname}} - http: - paths: - - path: {{ .Values.ingress.path }} - pathType: {{ .Values.ingress.pathType }} - backend: - service: - name: {{ template "common.names.name" . }} - port: - number: {{ .Values.service.ports.http }} -{{- end }} \ No newline at end of file diff --git a/automation/schulportal-client/templates/pdb.yaml b/automation/schulportal-client/templates/pdb.yaml deleted file mode 100644 index 8803c7776..000000000 --- a/automation/schulportal-client/templates/pdb.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if .Values.podDisruptionBudget.enabled }} -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: {{ template "common.names.name" . }}-pdb - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: {{ include "common.names.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/managed-by: {{ .Release.Service }} -spec: - minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} - selector: - matchLabels: - app.kubernetes.io/name: schulportal-client -{{- end }} \ No newline at end of file diff --git a/automation/schulportal-client/values.yaml b/automation/schulportal-client/values.yaml index ed1fb10bb..45ad51aca 100644 --- a/automation/schulportal-client/values.yaml +++ b/automation/schulportal-client/values.yaml @@ -11,7 +11,6 @@ image: restartPolicy: Always frontendHostname: "" -frontend2ndHostname: "" containerSecurityContext: enabled: true @@ -34,8 +33,6 @@ resources: memory: 200Mi ingress: - # Only enable if 2nd host name is defined - enabled2nd: false enabled: true ingressClassName: nginx path: / @@ -57,8 +54,4 @@ autoscaling: enabled: false minReplicas: 1 maxReplicas: 5 - targetCPUUtilizationPercentage: 60 - -podDisruptionBudget: - enabled: true - minAvailable: "60%" \ No newline at end of file + targetCPUUtilizationPercentage: 60 \ No newline at end of file