You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/12/03 17:41:17 UTC
[airavata-custos] branch develop updated: upgrade helm maven version to 3.5.2
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
The following commit(s) were added to refs/heads/develop by this push:
new ab4cce1 upgrade helm maven version to 3.5.2
new f02ad62 Merge pull request #249 from isururanawaka/develop
ab4cce1 is described below
commit ab4cce15a46bcdb3a703f2a92a81fd748e0a2f6d
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Fri Dec 3 12:40:16 2021 -0500
upgrade helm maven version to 3.5.2
---
.../agent-profile-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../cluster-management-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../credential-store-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
custos-core-services/custos-logging/src/main/helm/Chart.yaml | 2 +-
.../custos-logging/src/main/helm/templates/ingress.yaml | 2 +-
.../custos-logging/src/main/helm/templates/serviceaccount.yaml | 2 +-
.../custos-messaging-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../iam-admin-core-service/src/main/helm/Chart.yaml | 2 +-
.../iam-admin-core-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../identity-core-service/src/main/helm/Chart.yaml | 2 +-
.../identity-core-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../resource-secret-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../sharing-core-service/src/main/helm/Chart.yaml | 2 +-
.../sharing-core-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../tenant-profile-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../user-profile-core-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../custos-configuration-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../custos-grpc-web-proxy/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../agent-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../agent-management-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../custos-integration-services-swagger/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../group-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../group-management-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../identity-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../log-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../log-management-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../resource-secret-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
custos-integration-services/scim-service/src/main/helm/Chart.yaml | 2 +-
.../scim-service/src/main/helm/templates/ingress.yaml | 2 +-
.../scim-service/src/main/helm/templates/serviceaccount.yaml | 2 +-
.../sharing-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../tenant-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
.../user-management-service/src/main/helm/Chart.yaml | 2 +-
.../src/main/helm/templates/ingress-grpc.yaml | 2 +-
.../user-management-service/src/main/helm/templates/ingress.yaml | 2 +-
.../src/main/helm/templates/serviceaccount.yaml | 2 +-
pom.xml | 8 ++++----
80 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/custos-core-services/agent-profile-core-service/src/main/helm/Chart.yaml b/custos-core-services/agent-profile-core-service/src/main/helm/Chart.yaml
index 2c33a48..9ff57d6 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos agent profile service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/agent-profile-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/agent-profile-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/agent-profile-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/agent-profile-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/agent-profile-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/agent-profile-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/cluster-management-core-service/src/main/helm/Chart.yaml b/custos-core-services/cluster-management-core-service/src/main/helm/Chart.yaml
index 644a099..fb78151 100644
--- a/custos-core-services/cluster-management-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/cluster-management-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of kube cluster controller
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/cluster-management-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/cluster-management-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/cluster-management-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/cluster-management-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/cluster-management-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/cluster-management-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/cluster-management-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/cluster-management-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/credential-store-core-service/src/main/helm/Chart.yaml b/custos-core-services/credential-store-core-service/src/main/helm/Chart.yaml
index da72250..37c8b34 100644
--- a/custos-core-services/credential-store-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/credential-store-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos credential store service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/credential-store-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/credential-store-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/credential-store-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/credential-store-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/credential-store-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/credential-store-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/credential-store-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/credential-store-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/custos-logging/src/main/helm/Chart.yaml b/custos-core-services/custos-logging/src/main/helm/Chart.yaml
index 2005e82..bb9dc7a 100644
--- a/custos-core-services/custos-logging/src/main/helm/Chart.yaml
+++ b/custos-core-services/custos-logging/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos Logging service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/custos-logging/src/main/helm/templates/ingress.yaml b/custos-core-services/custos-logging/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/custos-logging/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/custos-logging/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/custos-logging/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/custos-logging/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/custos-logging/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/custos-logging/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/custos-messaging-core-service/src/main/helm/Chart.yaml b/custos-core-services/custos-messaging-core-service/src/main/helm/Chart.yaml
index 7bb8dd8..3aaa73b 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/custos-messaging-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos messaging service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/custos-messaging-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/custos-messaging-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/federated-authentication-core-service/src/main/helm/Chart.yaml b/custos-core-services/federated-authentication-core-service/src/main/helm/Chart.yaml
index edc47eb..68d4a24 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/federated-authentication-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos Federarted Authentication service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/federated-authentication-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/federated-authentication-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/iam-admin-core-service/src/main/helm/Chart.yaml b/custos-core-services/iam-admin-core-service/src/main/helm/Chart.yaml
index 5f4930b..e369b74 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos IAM service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/iam-admin-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/iam-admin-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/iam-admin-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/iam-admin-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/iam-admin-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/iam-admin-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/identity-core-service/src/main/helm/Chart.yaml b/custos-core-services/identity-core-service/src/main/helm/Chart.yaml
index f9cac55..ce16a80 100644
--- a/custos-core-services/identity-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos identity service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/identity-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/identity-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/identity-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/identity-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/identity-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/identity-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/identity-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/resource-secret-core-service/src/main/helm/Chart.yaml b/custos-core-services/resource-secret-core-service/src/main/helm/Chart.yaml
index a5ed0ec..282d3e1 100644
--- a/custos-core-services/resource-secret-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/resource-secret-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of resource secret core service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/resource-secret-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/resource-secret-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/resource-secret-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/resource-secret-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/resource-secret-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/resource-secret-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/resource-secret-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/resource-secret-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/sharing-core-service/src/main/helm/Chart.yaml b/custos-core-services/sharing-core-service/src/main/helm/Chart.yaml
index ab51a2a..6451306 100644
--- a/custos-core-services/sharing-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/sharing-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of sharing core service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/sharing-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/sharing-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/sharing-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/sharing-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/sharing-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/sharing-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/sharing-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/sharing-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/tenant-profile-core-service/src/main/helm/Chart.yaml b/custos-core-services/tenant-profile-core-service/src/main/helm/Chart.yaml
index 94d542e..c913cf7 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos core profile service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/tenant-profile-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/tenant-profile-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/user-profile-core-service/src/main/helm/Chart.yaml b/custos-core-services/user-profile-core-service/src/main/helm/Chart.yaml
index 9683274..f64e4d2 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm chart of custos user profile service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/user-profile-core-service/src/main/helm/templates/ingress.yaml b/custos-core-services/user-profile-core-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/user-profile-core-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/user-profile-core-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/user-profile-core-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/user-profile-core-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/Chart.yaml b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/Chart.yaml
index fec15cf..391e03a 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/Chart.yaml
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A helm of custos configuration service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/ingress.yaml b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/ingress.yaml
index 0c7cb5d..24e250b 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/ingress.yaml
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/ingress.yaml
@@ -2,7 +2,7 @@
{{- $fullName := include "helm.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
diff --git a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/serviceaccount.yaml b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-core-services/utility-services/custos-configuration-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/Chart.yaml b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/Chart.yaml
index f2e32f5..0e9f15e 100644
--- a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/Chart.yaml
+++ b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos grpc web proxy
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/templates/serviceaccount.yaml b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-external-services-distributions/custos-grpc-web-proxy/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/Chart.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/Chart.yaml
index 9cfffae..3b5c9f2 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos agent registration service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
index 2549ca2..d55dcd8 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
index 6401714..6a0effb 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/agent-management-service-parent/agent-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/custos-integration-services-swagger/src/main/helm/Chart.yaml b/custos-integration-services/custos-integration-services-swagger/src/main/helm/Chart.yaml
index f3c727f..c40222b 100644
--- a/custos-integration-services/custos-integration-services-swagger/src/main/helm/Chart.yaml
+++ b/custos-integration-services/custos-integration-services-swagger/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos log management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/ingress.yaml b/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/ingress.yaml
index 8120c05..aeb06a7 100644
--- a/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/custos-integration-services-swagger/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/Chart.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/Chart.yaml
index f5043f8..144df4d 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos group management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
index 8fc3810..8cfecc0 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
index 558bc3e..24d7191 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/group-management-service-parent/group-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/Chart.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/Chart.yaml
index fe2b92b..7d365fc 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos identity management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
index 86677ae..d146c01 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
index ad765da..866f234 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/identity-management-service-parent/identity-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/Chart.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/Chart.yaml
index f3c727f..c40222b 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos log management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
index 0bd071a..278cb9b 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
index 388f28d..d35c371 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/log-management-service-parent/log-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/Chart.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/Chart.yaml
index ad8c206..1d93639 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos resource secret management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
index 3e1ed85..94f136c 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
index 5f7b015..1412fd2 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/resource-secret-management-service-parent/resource-secret-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/scim-service/src/main/helm/Chart.yaml b/custos-integration-services/scim-service/src/main/helm/Chart.yaml
index f52f23d..bfb74db 100644
--- a/custos-integration-services/scim-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos scim service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
index dd268d5..3666ec6 100644
--- a/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/scim-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/scim-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/scim-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/scim-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/Chart.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/Chart.yaml
index c79c3bf..71b5789 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos sharing management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
index fc2e964..5f40447 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
index 4974680..ff3cb04 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/sharing-management-service-parent/sharing-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/Chart.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/Chart.yaml
index f898c3b..c3bdbd7 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos tenant registration service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
index 5a9200c..99e3f99 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
index bbbe358..e01b26f 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/tenant-management-service-parent/tenant-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/Chart.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/Chart.yaml
index 1cd4b75..f28ca16 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/Chart.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm of custos user management service
name: ${artifactId}
-version: ${project.version}
+version: "${project.version}"
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
index c40690b..9143cc3 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress-grpc.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations:
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
index 2c00cc9..ce66dbb 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/ingress.yaml
@@ -1,4 +1,4 @@
-apiVersion: networking.k8s.io/v1beta1 # for versions before 1.14 use extensions/v1beta1
+apiVersion: networking.k8s.io/v1 # for versions before 1.14 use extensions/v1beta1
kind: Ingress
metadata:
name: ${artifactId}-ingress
diff --git a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/serviceaccount.yaml b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/serviceaccount.yaml
index 87c82d5..ebb4fbd 100644
--- a/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/serviceaccount.yaml
+++ b/custos-integration-services/user-management-service-parent/user-management-service/src/main/helm/templates/serviceaccount.yaml
@@ -2,7 +2,7 @@
apiVersion: v1
kind: ServiceAccount
metadata:
- name: {{ template "helm.serviceAccountName" . }}
+ name: {{ .Chart.Name }}
labels:
{{ include "helm.labels" . | indent 4 }}
{{- end -}}
diff --git a/pom.xml b/pom.xml
index 883e42e..f4a7a91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,10 +478,10 @@
<chartFolder>src/main/helm</chartFolder>
<chartRepoUrl>https://charts.helm.sh/stable</chartRepoUrl>
<!-- <chartRepoUrl>https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts</chartRepoUrl>-->
- <helmVersion>3.4.2</helmVersion>
+ <helmVersion>3.5.2</helmVersion>
<!-- <chartRepoUrl>null</chartRepoUrl>-->
- <chartRepoUrl>https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts</chartRepoUrl>
- <helmVersion>2.16.0</helmVersion>
+<!-- <chartRepoUrl>https://kubernetes.oss-cn-hangzhou.aliyuncs.com/charts</chartRepoUrl>-->
+<!-- <helmVersion>2.16.0</helmVersion>-->
<strictLint>true</strictLint>
<valuesFile>src/main/helm/values.yaml</valuesFile>
<skip>true</skip>
@@ -650,7 +650,7 @@
<docker.image.repo>custos</docker.image.repo>
<docker.plugin.version>1.4.13</docker.plugin.version>
- <helm.maven.plugin.version>2.8.0</helm.maven.plugin.version>
+ <helm.maven.plugin.version>2.10.0</helm.maven.plugin.version>
<maven.assembly.plugin.version>3.2.0</maven.assembly.plugin.version>
<mysql.connector.java>8.0.18</mysql.connector.java>