Releasing aether-roc-umbrella 2.1.36
Change-Id: I701f2d8f31a0ab18139f460f5b6c96a93de92a69
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 9d7f172..2e25c98 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -8,7 +8,7 @@
description: Aether ROC Umbrella chart to deploy all Aether ROC
kubeVersion: ">=1.18.0"
type: application
-version: 2.1.35
+version: 2.1.36
appVersion: v0.0.0
keywords:
- aether
@@ -21,15 +21,15 @@
- name: onos-topo
condition: import.onos-topo.enabled
repository: https://charts.onosproject.org
- version: 1.4.5
+ version: 1.5.0
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
- version: 1.8.5
+ version: 1.8.12
- name: onos-cli
condition: import.onos-cli.enabled
repository: https://charts.onosproject.org
- version: 1.3.13
+ version: 1.3.15
- name: aether-roc-api
condition: import.aether-roc-api.enabled
repository: "file://../aether-roc-api"
diff --git a/aether-roc-umbrella/templates/_helpers.tpl b/aether-roc-umbrella/templates/_helpers.tpl
index 2e936e8..f688a9d 100644
--- a/aether-roc-umbrella/templates/_helpers.tpl
+++ b/aether-roc-umbrella/templates/_helpers.tpl
@@ -69,14 +69,11 @@
{{- end -}}
{{- end -}}
-{{/*
-global consensus store name
-*/}}
-{{- define "global.atomix.store.consensus.name" -}}
-{{- if .Values.global.atomix.store.consensus.name -}}
-{{- printf "%s" .Values.global.atomix.store.consensus.name -}}
+{{- define "global.atomix.consensus.cluster.name" -}}
+{{- with .Values.global.atomix.store.consensus.name -}}
+{{- . -}}
{{- else -}}
-{{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
+{{- printf "%s-consensus" .Release.Name -}}
{{- end -}}
{{- end -}}
diff --git a/aether-roc-umbrella/templates/consensusstore.yaml b/aether-roc-umbrella/templates/consensusstore.yaml
deleted file mode 100644
index 61691c1..0000000
--- a/aether-roc-umbrella/templates/consensusstore.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-# SPDX-FileCopyrightText: 2022 2020-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.global.atomix.store.consensus.enabled }}
-apiVersion: consensus.atomix.io/v1beta1
-kind: ConsensusStore
-metadata:
- name: {{ template "global.atomix.store.consensus.name" . }}
- namespace: {{ .Release.Namespace }}
- labels:
- name: {{ template "global.fullname" . }}
- chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
- release: "{{ .Release.Name }}"
- heritage: "{{ .Release.Service }}"
-spec:
- replicas: {{ .Values.global.atomix.store.consensus.replicas }}
- groups: {{ .Values.global.atomix.store.consensus.partitions }}
- {{- if .Values.global.atomix.store.consensus.image.tag }}
- image: "{{ .Values.global.atomix.store.consensus.image.repository }}:{{ .Values.global.atomix.store.consensus.image.tag }}"
- {{- end }}
- {{- with .Values.global.atomix.store.consensus.image.pullPolicy }}
- imagePullPolicy: {{ . }}
- {{- end }}
- {{- with .Values.global.atomix.store.consensus.image.pullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 4 }}
- {{- end }}
- {{- with .Values.global.atomix.store.consensus.securityContext }}
- securityContext:
- {{- toYaml . | nindent 4 }}
- {{- end }}
- {{- if .Values.global.atomix.store.consensus.log.storageClass }}
- volumeClaimTemplate:
- spec:
- accessModes:
- - ReadWriteOnce
- storageClassName: {{ .Values.global.atomix.store.consensus.log.storageClass | quote }}
- {{- with .Values.global.atomix.store.consensus.log.resources }}
- resources:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- end }}
- config:
- {{- toYaml .Values.global.atomix.store.consensus.config | nindent 4 }}
-{{- end }}
diff --git a/aether-roc-umbrella/templates/raftcluster.yaml b/aether-roc-umbrella/templates/raftcluster.yaml
new file mode 100644
index 0000000..b404e4a
--- /dev/null
+++ b/aether-roc-umbrella/templates/raftcluster.yaml
@@ -0,0 +1,42 @@
+# SPDX-FileCopyrightText: 2022-present Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+
+
+apiVersion: raft.atomix.io/v1beta3
+kind: RaftCluster
+metadata:
+ name: {{ template "global.atomix.consensus.cluster.name" . }}
+ namespace: {{ .Release.Namespace }}
+ labels:
+ name: {{ template "global.atomix.consensus.cluster.name" . }}
+ chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+ release: "{{ .Release.Name }}"
+ heritage: "{{ .Release.Service }}"
+spec:
+ replicas: {{ .Values.atomix.store.consensus.replicas }}
+ {{- if .Values.atomix.store.consensus.image.tag }}
+ image: "{{ .Values.atomix.store.consensus.image.repository }}:{{ .Values.atomix.store.consensus.image.tag }}"
+ {{- end }}
+ {{- with .Values.atomix.store.consensus.image.pullPolicy }}
+ imagePullPolicy: {{ . }}
+ {{- end }}
+ {{- with .Values.atomix.store.consensus.image.pullSecrets }}
+ imagePullSecrets:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+ {{- with .Values.atomix.store.consensus.securityContext }}
+ securityContext:
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
+ persistence: {{- .Values.atomix.store.consensus.persistence | toYaml | nindent 4 }}
+ logging:
+ encoding: {{ .Values.atomix.store.consensus.logging.encoding }}
+ rootLevel: {{ .Values.atomix.store.consensus.logging.level }}
+ {{- if .Values.atomix.store.consensus.logging.loggers }}
+ loggers:
+ {{- range $key, $value := .Values.atomix.store.consensus.logging.loggers }}
+ - name: {{ $key }}
+ level: {{ $value }}
+ {{- end }}
+ {{- end }}
\ No newline at end of file
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 276ce33..e55f2d0 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -18,33 +18,44 @@
consensus:
enabled: true
name: ""
- image:
- registry: ""
- repository: atomix/consensus-node
- tag: ""
- pullPolicy: ""
- pullSecrets: []
- replicas: 3
- partitions: 30
- config:
- server: {}
- raft: {}
- logging:
- loggers:
- root:
- level: info
- output:
- stdout:
- sink: stdout
- sinks:
- stdout:
- stdout: {}
- log:
- storageClass: ""
- resources:
- requests:
- storage: 1Gi
- securityContext: {}
+
+# Atomix store configurations
+atomix:
+ store:
+ consensus:
+ enabled: true
+ name: ""
+ image:
+ registry: ""
+ repository: atomix/raft-node
+ tag: ""
+ pullPolicy: ""
+ pullSecrets: []
+ replicas: 3
+ server: {}
+ logging:
+ # The encoding is the format of the logging output:
+ # console: standard formatted text logging
+ # json: JSON encoded structured logging
+ encoding: console
+ # The default log level for all loggers. Only messages logged at this level or higher severity will be
+ # output to the logger sinks. Log levels in order of severity (least to greatest):
+ # - debug
+ # - info
+ # - warn
+ # - error
+ # - fatal
+ level: info
+ loggers:
+ github.com/atomix/atomix/runtime/pkg/utils/grpc/interceptors: error
+ persistence:
+ # enabled: false
+ # storageClass: ""
+ accessModes:
+ - ReadWriteOnce
+ size: 8Gi
+ securityContext:
+ runAsUser: 0
import:
onos-topo:
@@ -367,11 +378,11 @@
enabled: false
modelPlugins:
- name: aether-2
- image: onosproject/aether-2.0.x:2.0.15-aether-2.0.x
+ image: onosproject/aether-2.0.x:2.0.16-aether-2.0.x
endpoint: localhost
port: 5152
- name: aether-2-1
- image: onosproject/aether-2.1.x:2.1.15-aether-2.1.x
+ image: onosproject/aether-2.1.x:2.1.16-aether-2.1.x
endpoint: localhost
port: 5153