Merge pull request #5460 from WillardHu/automated-cherry-pick-of-#5424-upstream-release-1.16

Automated cherry pick of #5424: fix some character error

6 files changed, 18 insertions, 18 deletions

diff --git a/build/crds/apps/apps_v1alpha1_edgeapplication.yaml b/build/crds/apps/apps_v1alpha1_edgeapplication.yaml
index ce3e48f5f..c550043b0 100644
--- a/build/crds/apps/apps_v1alpha1_edgeapplication.yaml
+++ b/build/crds/apps/apps_v1alpha1_edgeapplication.yaml
@@ -121,8 +121,8 @@ spec:
                                 - operator
                                 type: object
                               type: array
-                            envOverrides:
-                              description: EnvOverrides will override the env field
+                            envOverriders:
+                              description: EnvOverriders will override the env field
                                 of the container
                               items:
                                 description: EnvOverrider represents the rules dedicated
@@ -338,8 +338,8 @@ spec:
                               description: Replicas will override the replicas field
                                 of deployment
                               type: integer
-                            resourcesOverrides:
-                              description: ResourcesOverrides will override the resources
+                            resourcesOverriders:
+                              description: ResourcesOverriders will override the resources
                                 field of the container
                               items:
                                 description: ResourcesOverrider represents the rules
diff --git a/cloud/pkg/controllermanager/edgeapplication/overridemanager/envoverrider.go b/cloud/pkg/controllermanager/edgeapplication/overridemanager/envoverrider.go
index 855316e83..60e1f321d 100644
--- a/cloud/pkg/controllermanager/edgeapplication/overridemanager/envoverrider.go
+++ b/cloud/pkg/controllermanager/edgeapplication/overridemanager/envoverrider.go
@@ -32,7 +32,7 @@ import (
 type EnvOverrider struct{}
 
 func (o *EnvOverrider) ApplyOverrides(rawObj *unstructured.Unstructured, overriders OverriderInfo) error {
-	envOverriders := overriders.Overriders.EnvOverrides
+	envOverriders := overriders.Overriders.EnvOverriders
 	for index := range envOverriders {
 		patches, err := buildEnvPatches(rawObj, &envOverriders[index])
 		if err != nil {
diff --git a/cloud/pkg/controllermanager/edgeapplication/overridemanager/resourcesoverrider.go b/cloud/pkg/controllermanager/edgeapplication/overridemanager/resourcesoverrider.go
index 05c1562cf..f49c671b3 100644
--- a/cloud/pkg/controllermanager/edgeapplication/overridemanager/resourcesoverrider.go
+++ b/cloud/pkg/controllermanager/edgeapplication/overridemanager/resourcesoverrider.go
@@ -30,7 +30,7 @@ import (
 type ResourcesOverrider struct{}
 
 func (o *ResourcesOverrider) ApplyOverrides(rawObj *unstructured.Unstructured, overriders OverriderInfo) error {
-	resourcesOverriders := overriders.Overriders.ResourcesOverrides
+	resourcesOverriders := overriders.Overriders.ResourcesOverriders
 	for index := range resourcesOverriders {
 		patches, err := buildResourcesPatches(rawObj, &resourcesOverriders[index])
 		if err != nil {
diff --git a/manifests/charts/cloudcore/crds/apps_v1alpha1_edgeapplication.yaml b/manifests/charts/cloudcore/crds/apps_v1alpha1_edgeapplication.yaml
index ce3e48f5f..c550043b0 100644
--- a/manifests/charts/cloudcore/crds/apps_v1alpha1_edgeapplication.yaml
+++ b/manifests/charts/cloudcore/crds/apps_v1alpha1_edgeapplication.yaml
@@ -121,8 +121,8 @@ spec:
                                 - operator
                                 type: object
                               type: array
-                            envOverrides:
-                              description: EnvOverrides will override the env field
+                            envOverriders:
+                              description: EnvOverriders will override the env field
                                 of the container
                               items:
                                 description: EnvOverrider represents the rules dedicated
@@ -338,8 +338,8 @@ spec:
                               description: Replicas will override the replicas field
                                 of deployment
                               type: integer
-                            resourcesOverrides:
-                              description: ResourcesOverrides will override the resources
+                            resourcesOverriders:
+                              description: ResourcesOverriders will override the resources
                                 field of the container
                               items:
                                 description: ResourcesOverrider represents the rules
diff --git a/pkg/apis/apps/v1alpha1/edgeapplication_types.go b/pkg/apis/apps/v1alpha1/edgeapplication_types.go
index 639e17193..7edc8e1c0 100644
--- a/pkg/apis/apps/v1alpha1/edgeapplication_types.go
+++ b/pkg/apis/apps/v1alpha1/edgeapplication_types.go
@@ -63,18 +63,18 @@ type Overriders struct {
 	// ImageOverriders represents the rules dedicated to handling image overrides.
 	// +optional
 	ImageOverriders []ImageOverrider `json:"imageOverriders,omitempty"`
-	// EnvOverrides will override the env field of the container
+	// EnvOverriders will override the env field of the container
 	// +optional
-	EnvOverrides []EnvOverrider `json:"envOverrides,omitempty"`
+	EnvOverriders []EnvOverrider `json:"envOverriders,omitempty"`
 	// CommandOverriders represents the rules dedicated to handling container command
 	// +optional
 	CommandOverriders []CommandArgsOverrider `json:"commandOverriders,omitempty"`
 	// ArgsOverriders represents the rules dedicated to handling container args
 	// +optional
 	ArgsOverriders []CommandArgsOverrider `json:"argsOverriders,omitempty"`
-	// ResourcesOverrides will override the resources field of the container
+	// ResourcesOverriders will override the resources field of the container
 	// +optional
-	ResourcesOverrides []ResourcesOverrider `json:"resourcesOverrides,omitempty"`
+	ResourcesOverriders []ResourcesOverrider `json:"resourcesOverriders,omitempty"`
 }
 
 // CommandArgsOverrider represents the rules dedicated to handling command/args overrides.
diff --git a/pkg/apis/apps/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/apps/v1alpha1/zz_generated.deepcopy.go
index 6a227ce24..bedad63d2 100644
--- a/pkg/apis/apps/v1alpha1/zz_generated.deepcopy.go
+++ b/pkg/apis/apps/v1alpha1/zz_generated.deepcopy.go
@@ -382,8 +382,8 @@ func (in *Overriders) DeepCopyInto(out *Overriders) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.EnvOverrides != nil {
-		in, out := &in.EnvOverrides, &out.EnvOverrides
+	if in.EnvOverriders != nil {
+		in, out := &in.EnvOverriders, &out.EnvOverriders
 		*out = make([]EnvOverrider, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
@@ -403,8 +403,8 @@ func (in *Overriders) DeepCopyInto(out *Overriders) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	if in.ResourcesOverrides != nil {
-		in, out := &in.ResourcesOverrides, &out.ResourcesOverrides
+	if in.ResourcesOverriders != nil {
+		in, out := &in.ResourcesOverriders, &out.ResourcesOverriders
 		*out = make([]ResourcesOverrider, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])