Skip to content

Customizing Vault Version for WanFed Test #2043

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
20sr20 merged 8 commits into from
May 10, 2023
Merged

Customizing Vault Version for WanFed Test #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c2cc179
Customizing Vault Version for WanFed Test
20sr20 Apr 5, 2023
915c2a7
Modified
20sr20 Apr 6, 2023
43e9410
Changed according to the review comments
20sr20 Apr 19, 2023
63ea60d
Removed the commented line
20sr20 Apr 28, 2023
add531d
Vault server version type changed to String
20sr20 Apr 28, 2023
1418c64
changed back to VaultServerVersion type
20sr20 Apr 28, 2023
d428053
Changing "VaultServerVersion" to type "String"
20sr20 May 2, 2023
8a3fec0
Merge branch 'main' of https://github.com/hashicorp/consul-k8s into c…
20sr20 May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions acceptance/framework/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ type TestConfig struct {
ConsulVersion *version.Version
EnvoyImage string

VaultHelmChartVersion string
VaultServerVersion string
Comment thread
20sr20 marked this conversation as resolved.

NoCleanupOnFailure bool
DebugDirectory string

Expand Down
27 changes: 17 additions & 10 deletions acceptance/framework/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,13 @@ type TestFlags struct {

flagEnableTransparentProxy bool

flagHelmChartVersion string
flagConsulImage string
flagConsulK8sImage string
flagConsulVersion string
flagEnvoyImage string
flagHelmChartVersion string
flagConsulImage string
flagConsulK8sImage string
flagConsulVersion string
flagEnvoyImage string
flagVaultHelmChartVersion string
flagVaultServerVersion string

flagNoCleanupOnFailure bool

Expand Down Expand Up @@ -72,6 +74,8 @@ func (t *TestFlags) init() {
flag.StringVar(&t.flagConsulVersion, "consul-version", "", "The consul version used for all tests.")
flag.StringVar(&t.flagHelmChartVersion, "helm-chart-version", config.HelmChartPath, "The helm chart used for all tests.")
flag.StringVar(&t.flagEnvoyImage, "envoy-image", "", "The Envoy image to use for all tests.")
flag.StringVar(&t.flagVaultServerVersion, "vault-server-version", "", "The vault serverversion used for all tests.")
flag.StringVar(&t.flagVaultHelmChartVersion, "vault-helm-chart-version", "", "The Vault helm chart used for all tests.")

flag.BoolVar(&t.flagEnableMultiCluster, "enable-multi-cluster", false,
"If true, the tests that require multiple Kubernetes clusters will be run. "+
Expand Down Expand Up @@ -142,6 +146,7 @@ func (t *TestFlags) TestConfigFromFlags() *config.TestConfig {

// if the Version is empty consulVersion will be nil
consulVersion, _ := version.NewVersion(t.flagConsulVersion)
//vaultserverVersion, _ := version.NewVersion(t.flagVaultServerVersion)

return &config.TestConfig{
Kubeconfig: t.flagKubeconfig,
Expand All @@ -166,11 +171,13 @@ func (t *TestFlags) TestConfigFromFlags() *config.TestConfig {

DisablePeering: t.flagDisablePeering,

HelmChartVersion: t.flagHelmChartVersion,
ConsulImage: t.flagConsulImage,
ConsulK8SImage: t.flagConsulK8sImage,
ConsulVersion: consulVersion,
EnvoyImage: t.flagEnvoyImage,
HelmChartVersion: t.flagHelmChartVersion,
ConsulImage: t.flagConsulImage,
ConsulK8SImage: t.flagConsulK8sImage,
ConsulVersion: consulVersion,
EnvoyImage: t.flagEnvoyImage,
VaultHelmChartVersion: t.flagVaultHelmChartVersion,
VaultServerVersion: t.flagVaultServerVersion,

NoCleanupOnFailure: t.flagNoCleanupOnFailure,
DebugDirectory: tempDir,
Expand Down
9 changes: 8 additions & 1 deletion acceptance/framework/vault/vault_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,20 @@ func NewVaultCluster(t *testing.T, ctx environment.TestContext, cfg *config.Test
if cfg.EnablePodSecurityPolicies {
values["global.psp.enable"] = "true"
}
if cfg.VaultServerVersion != "" {
values["server.image.tag"] = cfg.VaultServerVersion
}
vaultHelmChartVersion := defaultVaultHelmChartVersion

if cfg.VaultHelmChartVersion != "" {
vaultHelmChartVersion = cfg.VaultHelmChartVersion
}
helpers.MergeMaps(values, helmValues)
vaultHelmOpts := &helm.Options{
SetValues: values,
KubectlOptions: kopts,
Logger: logger,
Version: defaultVaultHelmChartVersion,
Version: vaultHelmChartVersion,
}

helm.AddRepo(t, vaultHelmOpts, "hashicorp", "https://helm.releases.hashicorp.com")
Expand Down