diff --git a/cli/internal/helm/BUILD.bazel b/cli/internal/helm/BUILD.bazel index 87cf36783..f1d11519b 100644 --- a/cli/internal/helm/BUILD.bazel +++ b/cli/internal/helm/BUILD.bazel @@ -393,6 +393,7 @@ go_library( "charts/edgeless/constellation-services/charts/aws-load-balancer-controller/templates/webhook.yaml", "charts/edgeless/constellation-services/charts/aws-load-balancer-controller/test.yaml", "charts/edgeless/constellation-services/charts/aws-load-balancer-controller/values.yaml", + "charts/edgeless/constellation-services/charts/aws-load-balancer-controller/.helmignore", ], importpath = "github.com/edgelesssys/constellation/v2/cli/internal/helm", visibility = ["//cli:__subpackages__"], diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-load-balancer-controller/.helmignore b/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-load-balancer-controller/.helmignore new file mode 100644 index 000000000..67263be0a --- /dev/null +++ b/cli/internal/helm/charts/edgeless/constellation-services/charts/aws-load-balancer-controller/.helmignore @@ -0,0 +1,25 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ +crds/kustomization.yaml +test.yaml diff --git a/cli/internal/helm/loader_test.go b/cli/internal/helm/loader_test.go index 0fe1266b3..86d795c42 100644 --- a/cli/internal/helm/loader_test.go +++ b/cli/internal/helm/loader_test.go @@ -143,6 +143,7 @@ func TestConstellationServices(t *testing.T) { verificationServiceImage: "verificationImage", konnectivityImage: "konnectivityImage", gcpGuestAgentImage: "gcpGuestAgentImage", + clusterName: "testCluster", } chart, err := loadChartsDir(helmFS, constellationServicesInfo.path) require.NoError(err) diff --git a/cli/internal/helm/update-aws-load-balancer-chart.sh b/cli/internal/helm/update-aws-load-balancer-chart.sh index 482b2d464..b53fad574 100755 --- a/cli/internal/helm/update-aws-load-balancer-chart.sh +++ b/cli/internal/helm/update-aws-load-balancer-chart.sh @@ -41,4 +41,5 @@ rm -r "${chart_base_path:?}/${chart_name}" # move new chart mkdir -p "${chart_base_path}/${chart_name}" -cp -r "${repo_tmp_dir}/${chart_dir}"/* "${chart_base_path}/${chart_name}" +# do not use /* because it will not copy hidden files +cp -r "${repo_tmp_dir}/${chart_dir}" "${chart_base_path}/"