Merge pull request #2882 from DaoCloud/upgrade/bmc-operator/0.4.0

Robot Upgrade: bmc-operator chart upgrade from 0.3.1 to 0.4.0
DaoCloud · Jan 17, 2025 · 898c451 · 898c451
2 parents 33642bf + 746e342
commit 898c451
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 12 deletions.
diff --git a/charts/bmc-operator/bmc-operator/Chart.yaml b/charts/bmc-operator/bmc-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.3.1
+appVersion: 0.4.0
 description: A Helm chart for BMC Operator
 keywords:
   - kubernetes
@@ -11,8 +11,8 @@ maintainers:
     url: https://github.com/spidernet-io/bmc
 name: bmc-operator
 type: application
-version: 0.3.1
+version: 0.4.0
 dependencies:
   - name: bmc-operator
-    version: "0.3.1"
+    version: "0.4.0"
     repository: "https://spidernet-io.github.io/bmc"
diff --git a/charts/bmc-operator/bmc-operator/charts/bmc-operator/Chart.yaml b/charts/bmc-operator/bmc-operator/charts/bmc-operator/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.3.1
+appVersion: 0.4.0
 description: A Helm chart for BMC Operator
 keywords:
 - kubernetes
@@ -11,4 +11,4 @@ maintainers:
   url: https://github.com/spidernet-io/bmc
 name: bmc-operator
 type: application
-version: 0.3.1
+version: 0.4.0
diff --git a/charts/bmc-operator/bmc-operator/charts/bmc-operator/crds/bmc.spidernet.io_hoststatuses.yaml b/charts/bmc-operator/bmc-operator/charts/bmc-operator/crds/bmc.spidernet.io_hoststatuses.yaml
@@ -92,12 +92,35 @@ spec:
                 type: object
               lastUpdateTime:
                 type: string
+              log:
+                properties:
+                  lastestLog:
+                    properties:
+                      message:
+                        type: string
+                      time:
+                        type: string
+                    required:
+                    - message
+                    - time
+                    type: object
+                  totalLogAccount:
+                    format: int32
+                    type: integer
+                  warningLogAccount:
+                    format: int32
+                    type: integer
+                required:
+                - totalLogAccount
+                - warningLogAccount
+                type: object
             required:
             - basic
             - clusterAgent
             - healthy
             - info
             - lastUpdateTime
+            - log
             type: object
         type: object
     served: true

diff --git a/charts/bmc-operator/bmc-operator/charts/bmc-operator/templates/_helpers.tpl b/charts/bmc-operator/bmc-operator/charts/bmc-operator/templates/_helpers.tpl
@@ -75,9 +75,9 @@ return the controller image
 {{- if .Values.image.digest }}
     {{- print "@" .Values.image.digest -}}
 {{- else if .Values.global.imageTagOverride -}}
-    {{- printf ":%s" .Values.global.imageTagOverride -}}
+    {{- printf ":%s" (toString .Values.global.imageTagOverride) -}}
 {{- else if .Values.image.tag -}}
-    {{- printf ":%s" .Values.image.tag -}}
+    {{- printf ":%s" (toString .Values.image.tag) -}}
 {{- else -}}
     {{- printf ":v%s" .Chart.AppVersion -}}
 {{- end -}}
@@ -97,9 +97,9 @@ return the agent image
 {{- if .Values.clusterAgent.agentYaml.image.digest }}
     {{- print "@" .Values.clusterAgent.agentYaml.image.digest -}}
 {{- else if .Values.global.imageTagOverride -}}
-    {{- printf ":%s" .Values.global.imageTagOverride -}}
+    {{- printf ":%s" (toString .Values.global.imageTagOverride) -}}
 {{- else if .Values.clusterAgent.agentYaml.image.tag -}}
-    {{- printf ":%s" .Values.clusterAgent.agentYaml.image.tag -}}
+    {{- printf ":%s" (toString .Values.clusterAgent.agentYaml.image.tag) -}}
 {{- else -}}
     {{- printf ":v%s" .Chart.AppVersion -}}
 {{- end -}}

diff --git a/charts/bmc-operator/bmc-operator/charts/bmc-operator/templates/agent-templates.yaml b/charts/bmc-operator/bmc-operator/charts/bmc-operator/templates/agent-templates.yaml
@@ -56,6 +56,10 @@ data:
               value: {{ .Values.clusterAgent.feature.hostStatusUpdateInterval | quote }}
             - name: LOG_LEVEL
               value: {{ .Values.clusterAgent.feature.logLevel | quote }}
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
             args:
             - --metrics-bind-address=:8080
             - --health-probe-bind-address=:8081
@@ -142,6 +146,9 @@ data:
     rules:
     - apiGroups: [""]
       resources: ["pods", "services", "configmaps", "secrets"]
+      verbs: ["get", "list", "watch"]
+    - apiGroups: [""]
+      resources: ["events"]
       verbs: ["get", "list", "watch", "create", "update", "patch", "delete"]
     - apiGroups: ["apps"]
       resources: ["deployments"]

diff --git a/charts/bmc-operator/bmc-operator/values.yaml b/charts/bmc-operator/bmc-operator/values.yaml
@@ -9,7 +9,7 @@ bmc-operator:
     repository: "spidernet-io/bmc-controller"
     pullPolicy: IfNotPresent
     # tag will be overridden by version from Chart.yaml
-    tag: v0.3.1
+    tag: v0.4.0
     # Optional: image digest
     digest: ""
   resources:
@@ -28,7 +28,7 @@ bmc-operator:
         repository: "spidernet-io/bmc-agent"
         pullPolicy: IfNotPresent
         # tag will be overridden by version from Chart.yaml
-        tag: v0.3.1
+        tag: v0.4.0
         # Optional: image digest
         digest: ""
       # Optional: network interface configuration

diff --git a/charts/bmc-operator/config b/charts/bmc-operator/config
@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=false
 export REPO_URL=https://spidernet-io.github.io/bmc
 export REPO_NAME=bmc
 export CHART_NAME=bmc-operator
-export VERSION=0.3.1
+export VERSION=0.4.0
 
 # pr, issue, none
 export UPGRADE_METHOD=pr