Merge pull request spidernet-io#4322 from cyclinder/charts/fix_daemonset

charts: Fix error nident in daemonset.yaml
cyclinder · Nov 27, 2024 · b6d671a · b6d671a
2 parents 96f87d0 + 3137929
commit b6d671a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/charts/spiderpool/templates/daemonset.yaml b/charts/spiderpool/templates/daemonset.yaml
@@ -201,9 +201,9 @@ spec:
         {{- if .Values.multus.multusCNI.defaultCniCRName }}
             - name: MULTUS_CLUSTER_NETWORK
               value: {{ .Release.Namespace }}/{{ .Values.multus.multusCNI.defaultCniCRName }}
-        {{ end }}
+        {{- end }}
         {{- with .Values.spiderpoolAgent.extraEnv }}
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 12 }}
         {{- end }}
         {{- if or .Values.spiderpoolAgent.tuneSysctlConfig .Values.spiderpoolAgent.securityContext }}
           securityContext:

diff --git a/cmd/spiderpool-controller/cmd/daemon.go b/cmd/spiderpool-controller/cmd/daemon.go
@@ -266,15 +266,15 @@ func initControllerServiceManagers(ctx context.Context) {
 	controllerContext.PodManager = podManager
 
 	if controllerContext.Cfg.PodResourceInjectConfig.Enabled {
-		logger.Debug("Begin to init Pod MutatingWebhook")
+		logger.Info("Begin to init Pod MutatingWebhook")
 		if err := podmanager.InitPodWebhook(controllerContext.ClientSet.AdmissionregistrationV1(),
 			controllerContext.CRDManager, controllerContext.Cfg.ControllerDeploymentName,
 			controllerContext.Cfg.PodResourceInjectConfig.NamespacesExclude,
 			controllerContext.Cfg.PodResourceInjectConfig.NamespacesInclude); err != nil {
 			logger.Fatal(err.Error())
 		}
 	} else {
-		logger.Debug("InjectPodNetworkResource is disabled, try to remove the pod part in the MutatingWebhook")
+		logger.Info("InjectPodNetworkResource is disabled, try to remove the pod part in the MutatingWebhook")
 		if err := podmanager.RemovePodMutatingWebhook(controllerContext.ClientSet.AdmissionregistrationV1(),
 			controllerContext.Cfg.ControllerDeploymentName); err != nil {
 			logger.Error(err.Error())

diff --git a/pkg/podmanager/utils.go b/pkg/podmanager/utils.go
@@ -104,7 +104,7 @@ func podNetworkMutatingWebhook(spiderClient crdclientset.Interface, pod *corev1.
 	}
 
 	if len(multusConfigs.Items) == 0 {
-		return fmt.Errorf("No spidermultusconfig with label %v:%v found", constant.AnnoPodResourceInject, multusLabelValue)
+		return fmt.Errorf("No spidermultusconfigs with annotation: %v:%v found", constant.AnnoPodResourceInject, multusLabelValue)
 	}
 
 	return InjectPodNetwork(pod, *multusConfigs)