Skip to content

Commit

Permalink
config: require DeployCSIDriver field
Browse files Browse the repository at this point in the history
  • Loading branch information
3u13r committed Sep 8, 2023
1 parent 2cb2b3e commit b35487a
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ type AWSConfig struct {
IAMProfileWorkerNodes string `yaml:"iamProfileWorkerNodes" validate:"required"`
// description: |
// Deploy Persistent Disk CSI driver with on-node encryption. For details see: https://docs.edgeless.systems/constellation/architecture/encrypted-storage
DeployCSIDriver *bool `yaml:"deployCSIDriver"` // TODO (msanft): after v2.9 release re-enable "required" validation
DeployCSIDriver *bool `yaml:"deployCSIDriver" validate:"required"`
}

// AzureConfig are Azure specific configuration values used by the CLI.
Expand Down Expand Up @@ -472,16 +472,6 @@ func New(fileHandler file.Handler, name string, fetcher attestationconfigapi.Fet
c.Provider.OpenStack.Password = openstackPassword
}

// Backwards compatibility: configs without the field `deployCSIDriver` are valid in version 2.8.
// TODO (msanft): v2.9. Remove after v2.9 release.
if c.Provider.AWS != nil && c.Provider.AWS.DeployCSIDriver == nil {
fmt.Fprintln(
os.Stderr,
"WARNING: 'provider.aws.deployCSIDriver' not set. The key will be required in v2.10. Defaulting to 'false'.",
)
c.Provider.AWS.DeployCSIDriver = toPtr(false)
}

return c, c.Validate(force)
}

Expand Down

0 comments on commit b35487a

Please sign in to comment.