merge from main

spotinst · Jun 23, 2024 · ac6495e · ac6495e
2 parents 2ec0a10 + 256e77e
commit ac6495e
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 26 deletions.
diff --git a/charts/ocean-kubernetes-controller/Chart.yaml b/charts/ocean-kubernetes-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ocean-kubernetes-controller
 description: A Helm chart for Ocean Kubernetes Controller
 type: application
-version: 0.1.45
+version: 0.1.47
 appVersion: 2.0.59
 kubeVersion: ">=1.20.0-0"
 maintainers:

diff --git a/charts/ocean-kubernetes-controller/README.md b/charts/ocean-kubernetes-controller/README.md
@@ -1,6 +1,6 @@
 # ocean-kubernetes-controller
 
-![Version: 0.1.45](https://img.shields.io/badge/Version-0.1.45-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.59](https://img.shields.io/badge/AppVersion-2.0.59-informational?style=flat-square)
+![Version: 0.1.47](https://img.shields.io/badge/Version-0.1.47-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.59](https://img.shields.io/badge/AppVersion-2.0.59-informational?style=flat-square)
 
 A Helm chart for Ocean Kubernetes Controller.
 
@@ -101,10 +101,10 @@ Kubernetes: `>=1.20.0-0`
 | livenessProbe.httpGet.port | string | `"readiness"` |  |
 | livenessProbe.initialDelaySeconds | int | `15` |  |
 | livenessProbe.periodSeconds | int | `20` |  |
-| logShipping | object | `{"destination":{"host":"api.spotinst.io","port":443,"tls":true},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"cr.fluentbit.io/fluent/fluent-bit","tag":"3.0.1"}}` | Log Shipping configuration. |
+| logShipping | object | `{"destination":{"host":"api.spotinst.io","port":443,"tls":true},"enabled":true,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/fluent/fluent-bit","tag":"3.0.7"}}` | Log Shipping configuration. |
 | logShipping.destination | object | `{"host":"api.spotinst.io","port":443,"tls":true}` | Log shipping destination configuration. |
 | logShipping.enabled | bool | `true` | Specifies whether to send the controller logs to Spot for analysis. (Optional) |
-| logShipping.image | object | `{"pullPolicy":"IfNotPresent","repository":"cr.fluentbit.io/fluent/fluent-bit","tag":"3.0.1"}` | Specifies the log shipping container image. (Optional) |
+| logShipping.image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/fluent/fluent-bit","tag":"3.0.7"}` | Specifies the log shipping container image. (Optional) |
 | metrics-server.args | list | `["--logtostderr"]` | Arguments to pass to metrics-server on start up. (Optional) |
 | metrics-server.deployChart | bool | `true` | Specifies whether the metrics-server chart should be deployed. (Optional) |
 | metrics-server.image.pullPolicy | string | `"IfNotPresent"` |  |

diff --git a/charts/ocean-kubernetes-controller/templates/configmap.yaml b/charts/ocean-kubernetes-controller/templates/configmap.yaml
@@ -32,6 +32,11 @@ data:
         Skip_Empty_Lines On
         Refresh_Interval 10
 
+    [FILTER]
+        Name       modify
+        Match      *
+        Add        ctrlPod ${POD_NAMESPACE}/${POD_NAME}
+
     # rename msg -> message , level -> l
     [FILTER]
         Name       modify
@@ -47,13 +52,13 @@ data:
         Condition Key_Value_Equals l info
         SET l INFO
 
-    # debug -> DEBUG
+    # debug -> INFO
     [FILTER]
         Name       modify
         Match      *
 
         Condition Key_Value_Equals l debug
-        SET l DEBUG
+        SET l INFO
 
     # trace -> TRACE
     [FILTER]

diff --git a/charts/ocean-kubernetes-controller/templates/deployment.yaml b/charts/ocean-kubernetes-controller/templates/deployment.yaml
@@ -66,31 +66,17 @@ spec:
               secretKeyRef:
                 name: {{ include "ocean-kubernetes-controller.secretName" . }}
                 key: token
-                optional: true
           - name: SPOTINST_ACCOUNT
             valueFrom:
               secretKeyRef:
                 name: {{ include "ocean-kubernetes-controller.secretName" . }}
                 key: account
-                optional: true
-          - name: SPOTINST_TOKEN_LEGACY
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "ocean-kubernetes-controller.configMapName" . }}
-                key: spotinst.token
-                optional: true
           - name: SPOTINST_LEADER_ELECTION_ENABLED
             valueFrom:
               configMapKeyRef:
                 name: {{ include "ocean-kubernetes-controller.configMapName" . }}
                 key: leader-election
                 optional: true
-          - name: SPOTINST_ACCOUNT_LEGACY
-            valueFrom:
-              configMapKeyRef:
-                name: {{ include "ocean-kubernetes-controller.configMapName" . }}
-                key: spotinst.account
-                optional: true
           - name: CLUSTER_IDENTIFIER
             valueFrom:
               configMapKeyRef:
@@ -202,6 +188,14 @@ spec:
               configMapKeyRef:
                 name: {{ include "ocean-kubernetes-controller.configMapName" . }}
                 key: spotinst.cluster-identifier
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           volumeMounts:
           - name: logs
             mountPath: /var/log

diff --git a/charts/ocean-kubernetes-controller/values.yaml b/charts/ocean-kubernetes-controller/values.yaml
@@ -202,8 +202,8 @@ logShipping:
 
   # -- Specifies the log shipping container image. (Optional)
   image:
-    repository: cr.fluentbit.io/fluent/fluent-bit
-    tag: "3.0.1"
+    repository: ghcr.io/fluent/fluent-bit
+    tag: "3.0.7"
     pullPolicy: IfNotPresent
 
   # -- Log shipping destination configuration.

diff --git a/charts/ocean-network-client/templates/NOTES.txt b/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 {{ include "ocean-network-client.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.
diff --git a/charts/ocean-network-client/templates/daemon_set.yaml b/charts/ocean-network-client/templates/daemon_set.yaml
@@ -89,6 +89,7 @@ spec:
                 configMapKeyRef:
                   name: {{ include "ocean-network-client.configMapName" . }}
                   key: spotinst.cluster-identifier
+                  optional: true
             - name: MY_POD_IP
               valueFrom:
                 fieldRef:

diff --git a/charts/ocean-network-client/values.yaml b/charts/ocean-network-client/values.yaml
@@ -1,6 +1,4 @@
-nameOverride: ""
-fullnameOverride: ""
-# -- (Optional) namespace override.
+# -- (Optional) Namespace where components should be installed.
 namespace: kube-system
 
 # -- Reference secret and configMap for the Ocean Controller.