Revert network client (#139)

charts/ocean-network-client/Chart.yaml

@@ -17,7 +17,7 @@ maintainers:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.23
+version: 1.0.24
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/ocean-network-client/README.md

@@ -1,6 +1,6 @@
 # ocean-network-client
 
-![Version: 1.0.23](https://img.shields.io/badge/Version-1.0.23-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.8](https://img.shields.io/badge/AppVersion-1.0.8-informational?style=flat-square)
+![Version: 1.0.24](https://img.shields.io/badge/Version-1.0.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.8](https://img.shields.io/badge/AppVersion-1.0.8-informational?style=flat-square)
 
 A Helm chart for Ocean Network Client.
 
@@ -30,18 +30,14 @@ helm install my-release spot/ocean-network-client
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| configMapName | Optional | `"spotinst-kubernetes-cluster-controller-config"` | ConfigMap name. |
 | image.pullPolicy | Optional | `"IfNotPresent"` | Image pull policy. |
 | image.pullSecrets | Optional | `[]` | Image pull secrets. |
 | image.repository | Optional | `"public.ecr.aws/spotinst/spot-network-client"` | Image repository. |
 | image.tag | Optional | `""` | Image tag. Defaults to `.Chart.AppVersion`. |
 | namespace | Optional | `"kube-system"` | Namespace where components should be installed. |
-| oceanInfoData | Optional | `"spotinst-ocean-cluster"` | ConfigMap name. |
+| oceanController.configMapName | Optional | `"spotinst-kubernetes-cluster-controller-config"` | ConfigMap name. |
+| oceanController.secretName | Optional | `"spotinst-kubernetes-cluster-controller"` | Secret name. |
 | resources | Optional | `{"requests":{"cpu":"30m","memory":"150Mi"}}` | Resource requests and limits. Ref: http://kubernetes.io/docs/user-guide/compute-resources/ |
-| secretName | Optional | `"spotinst-kubernetes-cluster-controller"` | Secret name. |
-| spotinst.account | Optional | `""` | Spot Account. Ref: https://docs.spot.io/administration/organizations?id=account |
-| spotinst.clusterIdentifier | Optional | `""` | Unique identifier used by the Ocean Controller to connect between the Ocean backend and the Kubernetes cluster. Ref: https://docs.spot.io/ocean/tutorials/spot-kubernetes-controller/ |
-| spotinst.token | Optional | `""` | Spot Token. Ref: https://docs.spot.io/administration/api/create-api-token |
 | tolerations | Optional | `[{"operator":"Exists"}]` | Tolerations - Enable pods to run an all nodes in cluster Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/ |
 
 ----------------------------------------------

charts/ocean-network-client/templates/NOTES.txt

@@ -4,4 +4,4 @@ Please make sure that each node in your cluster has the Network-Client DaemonSet
 
   $ kubectl get daemonset {{ .Release.Name }} -n {{ .Values.namespace }}
 
-The collection of the data has already begun, you can see the data in our UI console or via API in 2-3 hours.
+The collection of the data has already begun, you can see the data in our UI console or via API in 2-3 hours.

charts/ocean-network-client/templates/_helpers.tpl

@@ -16,23 +16,15 @@ Namespace.
 ConfigMap name.
 */}}
 {{- define "ocean-network-client.configMapName" -}}
-{{- if ne .Values.spotinst.clusterIdentifier "" -}}
-{{- .Values.oceanInfoData  -}}
-{{- else -}}
-{{- default (include "ocean-network-client.name" .) .Values.configMapName -}}
-{{- end -}}
-{{- end -}}
+{{ default (include "ocean-network-client.name" .) .Values.oceanController.configMapName }}
+{{- end }}
 
 {{/*
 Secret name.
 */}}
 {{- define "ocean-network-client.secretName" -}}
-{{- if ne .Values.spotinst.account "" -}}
-{{- .Values.oceanInfoData  -}}
-{{- else -}}
-{{ default (include "ocean-network-client.name" .) .Values.secretName }}
-{{- end -}}
-{{- end -}}
+{{ default (include "ocean-network-client.name" .) .Values.oceanController.secretName }}
+{{- end }}
 
 {{/*
 DaemonSet labels.

charts/ocean-network-client/templates/daemon_set.yaml

@@ -91,6 +91,7 @@ spec:
                 configMapKeyRef:
                   name: {{ include "ocean-network-client.configMapName" . }}
                   key: spotinst.cluster-identifier
+                  optional: true
             - name: MY_POD_IP
               valueFrom:
                 fieldRef:

charts/ocean-network-client/values.yaml

@@ -1,27 +1,11 @@
 # -- (Optional) Namespace where components should be installed.
 namespace: kube-system
 
-# -- (Optional) Secret name.
-secretName: spotinst-kubernetes-cluster-controller
-# -- (Optional) ConfigMap name.
-configMapName: spotinst-kubernetes-cluster-controller-config
-
-# -- (Optional) ConfigMap name.
-oceanInfoData: spotinst-ocean-cluster
-
-# Spot Configuration.
-spotinst:
-  # -- (Optional) Spot Token.
-  # Ref: https://docs.spot.io/administration/api/create-api-token
-  token: ""
-  # -- (Optional) Spot Account.
-  # Ref: https://docs.spot.io/administration/organizations?id=account
-  account: ""
-  # -- (Optional) Unique identifier used by the Ocean Controller to connect
-  # between the Ocean backend and the Kubernetes cluster.
-  # Ref: https://docs.spot.io/ocean/tutorials/spot-kubernetes-controller/
-  clusterIdentifier: ""
-
+oceanController:
+  # -- (Optional) Secret name.
+  secretName: spotinst-kubernetes-cluster-controller
+  # -- (Optional) ConfigMap name.
+  configMapName: spotinst-kubernetes-cluster-controller-config
 
 image:
   # -- (Optional) Image repository.