diff --git a/charts/bpdm/Chart.yaml b/charts/bpdm/Chart.yaml index b185bb750..b859b0123 100644 --- a/charts/bpdm/Chart.yaml +++ b/charts/bpdm/Chart.yaml @@ -22,7 +22,7 @@ apiVersion: v2 name: bpdm type: application description: A Helm chart for Kubernetes that deploys the gate and pool applications -version: 3.1.0-alpha.4 +version: 3.1.0-alpha.5 appVersion: "4.1.0-alpha.3" home: https://github.com/eclipse-tractusx/bpdm sources: @@ -45,11 +45,11 @@ dependencies: alias: bpdm-bridge-dummy condition: bpdm-bridge-dummy.enabled - name: bpdm-cleaning-service-dummy - version: 1.0.0-alpha.2 + version: 1.0.0-alpha.3 alias: bpdm-cleaning-service-dummy condition: bpdm-cleaning-service-dummy.enabled - name: bpdm-orchestrator - version: 1.0.0-alpha.0 + version: 1.0.0-alpha.1 alias: bpdm-orchestrator condition: bpdm-orchestrator.enabled - name: opensearch diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml index bcbdb27ae..83ead2990 100644 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml +++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/Chart.yaml @@ -22,7 +22,7 @@ apiVersion: v2 type: application name: bpdm-cleaning-service-dummy appVersion: "4.1.0-alpha.3" -version: 1.0.0-alpha.2 +version: 1.0.0-alpha.3 description: A Helm chart for deploying the BPDM bridge dummy service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/ingress.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/ingress.yaml deleted file mode 100644 index c01d31000..000000000 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/templates/ingress.yaml +++ /dev/null @@ -1,82 +0,0 @@ -################################################################################ -# Copyright (c) 2021,2023 Contributors to the Eclipse Foundation - # - # See the NOTICE file(s) distributed with this work for additional - # information regarding copyright ownership. - # - # This program and the accompanying materials are made available under the - # terms of the Apache License, Version 2.0 which is available at - # https://www.apache.org/licenses/LICENSE-2.0. - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - # License for the specific language governing permissions and limitations - # under the License. - # - # SPDX-License-Identifier: Apache-2.0 - ################################################################################ - - {{if .Values.ingress.enabled}} - - - {{- $fullName := include "bpdm.fullname" . -}} - {{- $svcPort := .Values.service.port -}} - {{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion))}} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class")}} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end}} - {{- end}} - {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 - {{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 - {{- else -}} -apiVersion: extensions/v1beta1 - {{- end}} -kind: Ingress -metadata: - name: {{$fullName}} - labels: - {{- include "bpdm.labels" . | nindent 4}} - {{- with .Values.ingress.annotations}} - annotations: - {{- toYaml . | nindent 4}} - {{- end}} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)}} - ingressClassName: {{.Values.ingress.className}} - {{- end}} - {{- if .Values.ingress.tls}} - tls: - {{- range .Values.ingress.tls}} - - hosts: - {{- range .hosts}} - - {{. | quote}} - {{- end}} - secretName: {{.secretName}} - {{- end}} - {{- end}} - rules: - {{- range .Values.ingress.hosts}} - - host: {{.host | quote}} - http: - paths: - {{- range .paths}} - - path: {{.path}} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion)}} - pathType: {{.pathType}} - {{- end}} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion}} - service: - name: {{$fullName}} - port: - number: {{$svcPort}} - {{- else}} - serviceName: {{$fullName}} - servicePort: {{$svcPort}} - {{- end}} - {{- end}} - {{- end}} - {{- end}} \ No newline at end of file diff --git a/charts/bpdm/charts/bpdm-cleaning-service-dummy/values.yaml b/charts/bpdm/charts/bpdm-cleaning-service-dummy/values.yaml index db5c99ab7..e40fcbe95 100644 --- a/charts/bpdm/charts/bpdm-cleaning-service-dummy/values.yaml +++ b/charts/bpdm/charts/bpdm-cleaning-service-dummy/values.yaml @@ -54,12 +54,6 @@ service: autoscaling: enabled: false -ingress: - enabled: false - annotations: {} - hosts: [] - tls: [] - resources: limits: cpu: 500m diff --git a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml index fcc72a9cc..57e0f93b7 100644 --- a/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml +++ b/charts/bpdm/charts/bpdm-orchestrator/Chart.yaml @@ -22,7 +22,7 @@ apiVersion: v2 type: application name: bpdm-orchestrator appVersion: "4.1.0-alpha.3" -version: 1.0.0-alpha.0 +version: 1.0.0-alpha.1 description: A Helm chart for deploying the BPDM Orchestrator service home: https://eclipse-tractusx.github.io/docs/kits/Business%20Partner%20Kit/Adoption%20View sources: