Merge pull request #2591 from lusu007/fix/optional-disabledepupdate

lizardruss · web-flow · commit cc4b819e1598 · 2023-03-09T10:13:37.000-05:00
fix: Make disableDependencyUpdate optional in devspace-schema.json
diff --git a/devspace-schema.json b/devspace-schema.json
@@ -751,9 +751,6 @@
         }
       },
       "type": "object",
-      "required": [
-        "disableDependencyUpdate"
-      ],
       "description": "HelmConfig defines the specific helm options used during deployment"
     },
     "Image": {
diff --git a/docs/schemas/config-openapi.json b/docs/schemas/config-openapi.json
@@ -759,9 +759,6 @@
               }
             },
             "type": "object",
-            "required": [
-              "disableDependencyUpdate"
-            ],
             "description": "HelmConfig defines the specific helm options used during deployment"
           },
           "Image": {
diff --git a/pkg/devspace/config/versions/latest/schema.go b/pkg/devspace/config/versions/latest/schema.go
@@ -845,7 +845,7 @@ type HelmConfig struct {
 	TemplateArgs []string `yaml:"templateArgs,omitempty" json:"templateArgs,omitempty"`
 
 	// DisableDependencyUpdate disables helm dependencies update, default to false
-	DisableDependencyUpdate *bool `yaml:"disableDependencyUpdate" json:"disableDependencyUpdate"`
+	DisableDependencyUpdate *bool `yaml:"disableDependencyUpdate,omitempty" json:"disableDependencyUpdate,omitempty"`
 }
 
 // ChartConfig defines the helm chart options
diff --git a/pkg/devspace/deploy/deployer/helm/deploy_test.go b/pkg/devspace/deploy/deployer/helm/deploy_test.go
@@ -71,7 +71,7 @@ func TestDeploy(t *testing.T) {
 				Deployments: []remotecache.DeploymentCache{
 					{
 						Name:                 "deploy2",
-						DeploymentConfigHash: "a5047fb615f1b300af8aebdcb2d806c51ff5c00d68653727c5386c40760cbc42",
+						DeploymentConfigHash: "038007a9e5018dcf8ffbabad39c1fdc08251e583d7b19e74b765b815d5302444",
 						Helm: &remotecache.HelmCache{
 							Release:          "deploy2",
 							ReleaseNamespace: "testNamespace",

Original file line number	Diff line number	Diff line change
`@@ -845,7 +845,7 @@ type HelmConfig struct {`
`845`	`845`	TemplateArgs []string `yaml:"templateArgs,omitempty" json:"templateArgs,omitempty"`
`846`	`846`
`847`	`847`	`// DisableDependencyUpdate disables helm dependencies update, default to false`
`848`		- DisableDependencyUpdate *bool `yaml:"disableDependencyUpdate" json:"disableDependencyUpdate"`
	`848`	+ DisableDependencyUpdate *bool `yaml:"disableDependencyUpdate,omitempty" json:"disableDependencyUpdate,omitempty"`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`// ChartConfig defines the helm chart options`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func TestDeploy(t *testing.T) {`
`71`	`71`	`Deployments: []remotecache.DeploymentCache{`
`72`	`72`	`{`
`73`	`73`	`Name: "deploy2",`
`74`		`- DeploymentConfigHash: "a5047fb615f1b300af8aebdcb2d806c51ff5c00d68653727c5386c40760cbc42",`
	`74`	`+ DeploymentConfigHash: "038007a9e5018dcf8ffbabad39c1fdc08251e583d7b19e74b765b815d5302444",`
`75`	`75`	`Helm: &remotecache.HelmCache{`
`76`	`76`	`Release: "deploy2",`
`77`	`77`	`ReleaseNamespace: "testNamespace",`