Skip to content
Snippets Groups Projects
Commit 64990e47 authored by Vojdan Kjorveziroski's avatar Vojdan Kjorveziroski
Browse files

Bump alpha version to 2.0.2-alpha.2

parent 6d4649ac
No related branches found
No related tags found
1 merge request!14Draft: Resolve "Alfa version of the Helm chart for version 1.8.0"
Pipeline #93680 passed
apiVersion: v2 apiVersion: v2
name: nmaas name: nmaas
description: GÉANT Network Management as a Service Helm chart for Kubernetes description: GÉANT Network Management as a Service Helm chart for Kubernetes
version: 2.0.2-alpha.1 version: 2.0.2-alpha.2
appVersion: 1.7.1 appVersion: 1.8.0
keywords: keywords:
- Network Management - Network Management
- Cloud Deployment - Cloud Deployment
......
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ .Values.helm.clusterRoleBindingName }}
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: {{ .Values.helm.clusterRoleName }}
subjects:
- kind: ServiceAccount
name: {{ .Values.helm.serviceAccountName }}
namespace: {{ .Release.Namespace }}
\ No newline at end of file
{{- if .Values.helm.enabled -}}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ .Values.helm.name }}
labels:
app: {{ .Values.helm.name }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
selector:
matchLabels:
app: {{ .Values.helm.name }}
strategy:
type: Recreate
replicas: {{ .Values.replicaCount }}
template:
metadata:
labels:
app: {{ .Values.helm.name }}
spec:
volumes:
- name: {{ .Values.helm.persistence.existingClaim | default (printf "%s-helm" (include "fullname" .)) | quote }}
{{- if .Values.helm.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ .Values.helm.persistence.existingClaim | default (printf "%s-helm" (include "fullname" .)) | quote }}
{{- else }}
emptyDir: {}
{{- end }}
- name: helm-access-key
secret:
secretName: {{ .Values.global.helmAccessKeyPublic }}
{{- if .Values.helm.serviceAccountName }}
serviceAccountName: {{ .Values.helm.serviceAccountName }}
{{- end }}
containers:
- name: {{ .Chart.Name }}
securityContext:
capabilities:
add:
- SYS_CHROOT
image: "{{ .Values.helm.image.repository }}:{{ .Values.helm.image.tag }}"
imagePullPolicy: {{ .Values.helm.image.pullPolicy }}
ports:
- containerPort: {{ .Values.helm.port }}
protocol: TCP
env:
- name: SSH_USERS
value: {{ .Values.helm.properties.users }}
volumeMounts:
- name: helm-access-key
mountPath: /keys
- mountPath: /home/helm/.config/helm
name: {{ .Values.helm.persistence.existingClaim | default (printf "%s-helm" (include "fullname" .)) | quote }}
subPath: helm-config
imagePullSecrets:
- name: {{ .Values.global.registrysecret }}
{{- end -}}
{{- if and (.Values.helm.persistence.enabled) (not .Values.helm.persistence.existingClaim) }}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: "{{ template "fullname" . }}-helm"
labels:
app: nmaas-helm
spec:
accessModes:
- "{{ .Values.helm.persistence.accessMode }}"
{{- if .Values.helm.persistence.storageClass }}
storageClassName: "{{ .Values.helm.persistence.storageClass }}"
{{- end}}
resources:
requests:
storage: "{{ .Values.helm.persistence.size }}"
{{- end }}
\ No newline at end of file
{{- if .Values.helm.enabled -}}
apiVersion: v1
kind: Service
metadata:
name: {{ .Values.helm.name }}
labels:
app: {{ .Values.helm.name }}
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
spec:
type: {{ .Values.helm.type }}
ports:
- port: {{ .Values.helm.port }}
targetPort: {{ .Values.helm.targetPort }}
protocol: TCP
selector:
app: {{ .Values.helm.name }}
{{- end -}}
apiVersion: v1
kind: ServiceAccount
automountServiceAccountToken: true
metadata:
name: {{ .Values.helm.serviceAccountName }}
namespace: {{ .Release.Namespace }}
\ No newline at end of file
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: {{ .Values.platform.clusterRoleName }}
rules:
- apiGroups: [""]
resources: ["pods"]
verbs: ["get", "list", "watch"]
- apiGroups: [""]
resources: ["pods/exec"]
verbs: ["create", "get", "watch"]
...@@ -53,8 +53,9 @@ spec: ...@@ -53,8 +53,9 @@ spec:
- name: platform-data - name: platform-data
mountPath: /nmaas/files mountPath: /nmaas/files
subPath: platform-logs subPath: platform-logs
- name: helm-access-key - name: platform-data
mountPath: /nmaas/.ssh mountPath: /home/nmaas/.config/helm
subPath: helm
env: env:
- name: ENVIRONMENT - name: ENVIRONMENT
value: "{{ .Values.platform.properties.environment }}" value: "{{ .Values.platform.properties.environment }}"
...@@ -138,22 +139,10 @@ spec: ...@@ -138,22 +139,10 @@ spec:
value: {{ and .Values.platform.properties.smtp.login .Values.platform.properties.smtp.password }} value: {{ and .Values.platform.properties.smtp.login .Values.platform.properties.smtp.password }}
- name: USE_STARTTLS - name: USE_STARTTLS
value: {{ .Values.platform.properties.smtp.useStartTLS | default "false" | quote }} value: {{ .Values.platform.properties.smtp.useStartTLS | default "false" | quote }}
- name: HELM_ADDRESS
value: "{{ .Values.platform.properties.helm.address }}"
- name: HELM_USERNAME
value: "{{ .Values.platform.properties.helm.username }}"
- name: HELM_USELOCALCHARTS
value: "{{ .Values.platform.properties.helm.useLocalCharts }}"
- name: HELM_REPOSITORY - name: HELM_REPOSITORY
value: "{{ .Values.platform.properties.helm.repositoryName }}" value: "{{ .Values.platform.properties.helm.repositoryName }}"
- name: HELM_REPOSITORY_URL - name: HELM_REPOSITORY_URL
value: "{{ .Values.platform.properties.helm.repositoryUrl }}" value: "{{ .Values.platform.properties.helm.repositoryUrl }}"
- name: HELM_LOCALCHARTSDIR
value: "{{ .Values.platform.properties.helm.chartsDirectory }}"
- name: HELM_ENABLETLS
value: "{{ .Values.platform.properties.helm.enableTls }}"
- name: HELM_VERSION
value: "{{ .Values.platform.properties.helm.version }}"
- name: HELM_UPDATE_ASYNC_ENABLED - name: HELM_UPDATE_ASYNC_ENABLED
value: "{{ .Values.platform.properties.helm.asyncUpdateEnabled }}" value: "{{ .Values.platform.properties.helm.asyncUpdateEnabled }}"
- name: HELM_UPDATE_ASYNC_CRON - name: HELM_UPDATE_ASYNC_CRON
......
...@@ -26,7 +26,8 @@ platform: ...@@ -26,7 +26,8 @@ platform:
enabled: true enabled: true
name: nmaas-platform name: nmaas-platform
serviceAccountName: nmaas-platform serviceAccountName: nmaas-platform
clusterRoleName: nmaas-shell-role # -- name of ClusterRole to associate to nmaas-platform. Must exist beforehand
clusterRoleName: cluster-admin
clusterRoleBindingName: nmaas-platform clusterRoleBindingName: nmaas-platform
ingress: ingress:
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
...@@ -61,7 +62,7 @@ platform: ...@@ -61,7 +62,7 @@ platform:
timeoutSeconds: 10 timeoutSeconds: 10
image: image:
repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-platform
tag: "1.7.1" tag: "latest"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
port: 9001 port: 9001
targetPort: 9001 targetPort: 9001
...@@ -121,14 +122,8 @@ platform: ...@@ -121,14 +122,8 @@ platform:
name: nmaas-postgresql-secret name: nmaas-postgresql-secret
key: secret key: secret
helm: helm:
address: nmaas-helm
username: helm
useLocalCharts: false
repositoryName: nmaas repositoryName: nmaas
repositoryUrl: https://artifactory.software.geant.org/artifactory/nmaas-helm repositoryUrl: https://artifactory.software.geant.org/artifactory/nmaas-helm
chartsDirectory: /home/nmaas/charts
enableTls: true
version: v3
asyncUpdateEnabled: true asyncUpdateEnabled: true
asyncUpdateCron: "0 0 * * * ?" asyncUpdateCron: "0 0 * * * ?"
smtp: smtp:
...@@ -201,7 +196,7 @@ portal: ...@@ -201,7 +196,7 @@ portal:
name: nmaas-portal name: nmaas-portal
image: image:
repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-portal repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-portal
tag: "1.7.1" tag: "latest"
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
ingress: ingress:
# -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set # -- defaults to .Values.platform.properties.k8s.ingress.controller.ingressClass if not set
...@@ -255,29 +250,6 @@ postfix: ...@@ -255,29 +250,6 @@ postfix:
secret: secret:
key: smtpPassword key: smtpPassword
helm:
enabled: true
name: nmaas-helm
serviceAccountName: nmaas-helm
clusterRoleBindingName: nmaas-helm-admin
clusterRoleName: cluster-admin
image:
repository: artifactory.software.geant.org/nmaas-docker-local/nmaas-helm-3
tag: "3.9.3"
pullPolicy: Always
port: 22
targetPort: 22
type: ClusterIP
properties:
users: helm:1000:1000
persistence:
enabled: true
# -- name of an existing claim to be used. If empty, a new one is provisioned.
existingClaim: ""
accessMode: ReadWriteOnce
size: 1Gi
storageClass: ""
janitor: janitor:
enabled: true enabled: true
name: nmaas-janitor name: nmaas-janitor
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment