Updating to work with atomix-runtime
Change-Id: I5a6e861cf8e14c8374c3f07d3db8e85d98e27eef
diff --git a/aether-roc-gui/Chart.yaml b/aether-roc-gui/Chart.yaml
index ce18749..28977b6 100644
--- a/aether-roc-gui/Chart.yaml
+++ b/aether-roc-gui/Chart.yaml
@@ -7,7 +7,7 @@
description: Aether ROC Graphical User Interface
kubeVersion: ">=1.15.0"
type: application
-version: 2.1.17
+version: 2.1.18
appVersion: v0.9.25
keywords:
- aether
diff --git a/aether-roc-gui/values.yaml b/aether-roc-gui/values.yaml
index 4660753..a052116 100644
--- a/aether-roc-gui/values.yaml
+++ b/aether-roc-gui/values.yaml
@@ -23,7 +23,7 @@
enabled: true
## Service name is user-configurable for maximum service discovery flexibility.
name: aether-roc-gui
- type: LoadBalancer
+ type: NodePort
external:
nodePort: 31194
diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index ee0f8b1..890fcd2 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.31
+version: 2.1.32
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.3.5
+ version: 1.4.1
- name: onos-config
condition: import.onos-config.enabled
repository: https://charts.onosproject.org
- version: 1.7.8
+ version: 1.8.3
- name: onos-cli
condition: import.onos-cli.enabled
repository: https://charts.onosproject.org
- version: 1.3.2
+ version: 1.3.11
- name: aether-roc-api
condition: import.aether-roc-api.enabled
repository: "file://../aether-roc-api"
@@ -41,7 +41,7 @@
- name: aether-roc-gui
condition: import.aether-roc-gui.v2-1.enabled
repository: "file://../aether-roc-gui"
- version: 2.1.17
+ version: 2.1.18
alias: aether-roc-gui-v2-1
- name: sdcore-adapter-v2
condition: import.sdcore-adapter.v2-0.enabled
diff --git a/aether-roc-umbrella/templates/_helpers.tpl b/aether-roc-umbrella/templates/_helpers.tpl
index 83f8324..4f31a8b 100644
--- a/aether-roc-umbrella/templates/_helpers.tpl
+++ b/aether-roc-umbrella/templates/_helpers.tpl
@@ -57,13 +57,13 @@
{{/*
global consensus image name
*/}}
-{{- define "global.store.consensus.imagename" -}}
-{{- if .Values.global.store.consensus.image.tag -}}
-{{- if .Values.global.store.consensus.image.registry -}}
-{{- printf "%s/" .Values.global.store.consensus.image.registry -}}
+{{- define "global.atomix.store.consensus.imagename" -}}
+{{- if .Values.global.atomix.store.consensus.image.tag -}}
+{{- if .Values.global.atomix.store.consensus.image.registry -}}
+{{- printf "%s/" .Values.global.atomix.store.consensus.image.registry -}}
{{- end -}}
-{{- printf "%s:" .Values.global.store.consensus.image.repository -}}
-{{- .Values.global.store.consensus.image.tag -}}
+{{- printf "%s:" .Values.global.atomix.store.consensus.image.repository -}}
+{{- .Values.global.atomix.store.consensus.image.tag -}}
{{- else -}}
""
{{- end -}}
@@ -72,9 +72,9 @@
{{/*
global consensus store name
*/}}
-{{- define "global.store.consensus.name" -}}
-{{- if .Values.global.store.consensus.name -}}
-{{- printf "%s" .Values.global.store.consensus.name -}}
+{{- define "global.atomix.store.consensus.name" -}}
+{{- if .Values.global.atomix.store.consensus.name -}}
+{{- printf "%s" .Values.global.atomix.store.consensus.name -}}
{{- else -}}
{{- printf "%s-consensus-store" ( include "global.fullname" . ) -}}
{{- end -}}
diff --git a/aether-roc-umbrella/templates/consensusstore.yaml b/aether-roc-umbrella/templates/consensusstore.yaml
new file mode 100644
index 0000000..61691c1
--- /dev/null
+++ b/aether-roc-umbrella/templates/consensusstore.yaml
@@ -0,0 +1,46 @@
+# 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/store.yaml b/aether-roc-umbrella/templates/store.yaml
deleted file mode 100644
index baae4a6..0000000
--- a/aether-roc-umbrella/templates/store.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-FileCopyrightText: 2021-present Open Networking Foundation <info@opennetworking.org>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-{{- if .Values.global.store.consensus.enabled }}
-apiVersion: atomix.io/v2beta1
-kind: Store
-metadata:
- name: {{ template "global.store.consensus.name" . }}
- namespace: {{ .Release.Namespace }}
-spec:
- protocol:
- apiVersion: storage.atomix.io/v2beta2
- kind: MultiRaftProtocol
- spec:
- replicas: {{ .Values.global.store.consensus.replicas }}
- groups: {{ .Values.global.store.consensus.partitions }}
- {{- with .Values.global.store.consensus.raft }}
- raft:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- image: {{ template "global.store.consensus.imagename" . }}
- imagePullPolicy: {{ .Values.global.store.consensus.image.pullPolicy }}
- {{- with .Values.global.store.consensus.image.pullSecrets }}
- imagePullSecrets:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- with .Values.global.store.consensus.securityContext }}
- securityContext:
- {{- toYaml . | nindent 8 }}
- {{- end }}
- {{- if .Values.global.store.consensus.persistence.storageClass }}
- volumeClaimTemplate:
- spec:
- accessModes:
- - ReadWriteOnce
- storageClassName: {{ .Values.global.store.consensus.persistence.storageClass | quote }}
- resources:
- requests:
- storage: {{ .Values.global.store.consensus.persistence.storageSize }}
- {{- end }}
-{{- end }}
\ No newline at end of file
diff --git a/aether-roc-umbrella/values.yaml b/aether-roc-umbrella/values.yaml
index 6ff6fa6..a287b50 100644
--- a/aether-roc-umbrella/values.yaml
+++ b/aether-roc-umbrella/values.yaml
@@ -13,23 +13,38 @@
image:
registry: ""
tag: ""
- store:
- consensus:
- enabled: true
- name: ""
- image:
- registry: ""
- repository: atomix/atomix-raft-storage-node
- tag: ""
- pullPolicy: IfNotPresent
- pullSecrets: []
- clusters: 1
- replicas: 1
- partitions: 1
- raft: {}
- persistence:
- storageClass: ""
- storageSize: 1Gi
+ atomix:
+ store:
+ 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: {}
import:
onos-topo:
@@ -75,9 +90,10 @@
# ONOS-TOPO
onos-topo:
- store:
- consensus:
- enabled: false
+ atomix:
+ store:
+ consensus:
+ enabled: false
# ONOS-GUI
onos-gui: {}
@@ -357,9 +373,10 @@
# ONOS-CONFIG
onos-config:
- store:
- consensus:
- enabled: false
+ atomix:
+ store:
+ consensus:
+ enabled: false
modelPlugins:
- name: aether-2
image: onosproject/aether-2.0.x:2.0.12-aether-2.0.x