From 55f4dc94f0d5575392deed0512ab649492bf511e Mon Sep 17 00:00:00 2001
From: "kevin.qiao" <kevin.qiao@vesoft.com>
Date: Sat, 30 Sep 2023 17:38:57 +0800
Subject: [PATCH] fix webhook panic (#307)

---
 PROJECT                               | 9 +++++++++
 cmd/autoscaler/app/options/options.go | 2 +-
 pkg/webhook/nebulacluster/helper.go   | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/PROJECT b/PROJECT
index 7cd73c59..8a0d9767 100644
--- a/PROJECT
+++ b/PROJECT
@@ -22,4 +22,13 @@ resources:
   kind: NebulaRestore
   path: github.com/vesoft-inc/nebula-operator/apis/apps/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: nebula-graph.io
+  group: autoscaling
+  kind: NebulaAutoscaler
+  path: github.com/vesoft-inc/nebula-operator/apis/autoscaling/v1alpha1
+  version: v1alpha1
 version: "3"
diff --git a/cmd/autoscaler/app/options/options.go b/cmd/autoscaler/app/options/options.go
index 090eb6bc..a7ba12cf 100644
--- a/cmd/autoscaler/app/options/options.go
+++ b/cmd/autoscaler/app/options/options.go
@@ -101,7 +101,7 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) {
 	flags.DurationVar(&o.HPAOpts.HorizontalPodAutoscalerUpscaleForbiddenWindow.Duration, "autoscaler-upscale-delay", defaultAutoscalerUpscaleForbiddenWindow.Duration, "The period since last upscale, before another upscale can be performed in nebula autoscaler.")
 	flags.DurationVar(&o.HPAOpts.HorizontalPodAutoscalerDownscaleStabilizationWindow.Duration, "autoscaler-downscale-stabilization", defaultAutoscalerDownscaleStabilizationWindow.Duration, "The period for which nebula autoscaler will look backwards and not scale down below any recommendation it made during that period.")
 	flags.DurationVar(&o.HPAOpts.HorizontalPodAutoscalerDownscaleForbiddenWindow.Duration, "autoscaler-downscale-delay", defaultAutoscalerDownscaleForbiddenWindow.Duration, "The period since last downscale, before another downscale can be performed in nebula autoscaler.")
-	flags.Float64Var(&o.HPAOpts.HorizontalPodAutoscalerTolerance, "autscaler-tolerance", 0.1, "The minimum change (from 1.0) in the desired-to-actual metrics ratio for the nebula autoscaler to consider scaling.")
+	flags.Float64Var(&o.HPAOpts.HorizontalPodAutoscalerTolerance, "autoscaler-tolerance", 0.1, "The minimum change (from 1.0) in the desired-to-actual metrics ratio for the nebula autoscaler to consider scaling.")
 	flags.DurationVar(&o.HPAOpts.HorizontalPodAutoscalerCPUInitializationPeriod.Duration, "autoscaler-cpu-initialization-period", defaultAutoscalerCPUInitializationPeriod.Duration, "The period after pod start when CPU samples might be skipped.")
 	flags.DurationVar(&o.HPAOpts.HorizontalPodAutoscalerInitialReadinessDelay.Duration, "autoscaler-initial-readiness-delay", defaultAutoscalerInitialReadinessDelay.Duration, "The period after pod start during which readiness changes will be treated as initial readiness.")
 
diff --git a/pkg/webhook/nebulacluster/helper.go b/pkg/webhook/nebulacluster/helper.go
index 0f95ca1f..a86b57b4 100644
--- a/pkg/webhook/nebulacluster/helper.go
+++ b/pkg/webhook/nebulacluster/helper.go
@@ -173,8 +173,9 @@ func validateNebulaClusterUpdateStoragedDataVolume(nc, oldNC *v1alpha1.NebulaClu
 	if len(nc.Spec.Storaged.DataVolumeClaims) != len(oldNC.Spec.Storaged.DataVolumeClaims) {
 		allErrs = append(allErrs, field.Forbidden(
 			field.NewPath("spec", "storaged", "dataVolumeClaims"),
-			"storaged dataVolumeClaims len is immutable",
+			"storaged dataVolumeClaims is immutable",
 		))
+		return allErrs
 	}
 	for i, pvc := range nc.Spec.Storaged.DataVolumeClaims {
 		if pvc.Resources.Requests.Storage().Cmp(*oldNC.Spec.Storaged.DataVolumeClaims[i].Resources.Requests.Storage()) == -1 {