Skip to content
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

Jump to bottom

Remove calls to helm repo add #11805

Merged
merged 2 commits into from
Feb 18, 2019
Merged

Remove calls to helm repo add #11805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d70ee1d
Remove calls to helm repo add
ymesika Feb 17, 2019
6918628
One more place
ymesika Feb 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 5 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ export ENABLE_ISTIO_CNI ?= false
# NOTE: env var EXTRA_HELM_SETTINGS can contain helm chart override settings, example:
# EXTRA_HELM_SETTINGS="--set istio-cni.excludeNamespaces={} --set istio-cni.tag=v0.1-dev-foo"


#ISTIO_HELM_REPO := https://gcsweb.istio.io/gcs/istio-prerelease/daily-build/master-latest-daily/charts
ISTIO_HELM_REPO := https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts

#-----------------------------------------------------------------------------
# Output control
#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -634,13 +630,8 @@ $(HELM):
$(HOME)/.helm:
$(HELM) init --client-only

.PHONY: helm-repo-add

helm-repo-add:
$(HELM) repo add istio.io ${ISTIO_HELM_REPO}

# create istio-remote.yaml
istio-remote.yaml: $(HELM) $(HOME)/.helm helm-repo-add
istio-remote.yaml: $(HELM) $(HOME)/.helm
cat install/kubernetes/namespace.yaml > install/kubernetes/$@
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
$(HELM) template --name=istio --namespace=istio-system \
Expand All @@ -650,7 +641,7 @@ istio-remote.yaml: $(HELM) $(HOME)/.helm helm-repo-add
install/kubernetes/helm/istio >> install/kubernetes/$@

# create istio-init.yaml
istio-init.yaml: $(HELM) $(HOME)/.helm helm-repo-add
istio-init.yaml: $(HELM) $(HOME)/.helm
cat install/kubernetes/namespace.yaml > install/kubernetes/$@
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
$(HELM) template --name=istio --namespace=istio-system \
Expand All @@ -660,7 +651,7 @@ istio-init.yaml: $(HELM) $(HOME)/.helm helm-repo-add

# creates istio.yaml istio-auth.yaml istio-one-namespace.yaml istio-one-namespace-auth.yaml istio-one-namespace-trust-domain.yaml
# Ensure that values-$filename is present in install/kubernetes/helm/istio
isti%.yaml: $(HELM) $(HOME)/.helm helm-repo-add
isti%.yaml: $(HELM) $(HOME)/.helm
cat install/kubernetes/namespace.yaml > install/kubernetes/$@
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
$(HELM) template \
Expand All @@ -675,7 +666,7 @@ isti%.yaml: $(HELM) $(HOME)/.helm helm-repo-add
--values install/kubernetes/helm/istio/values-$@ \
install/kubernetes/helm/istio >> install/kubernetes/$@

generate_yaml: $(HELM) $(HOME)/.helm helm-repo-add istio-init.yaml
generate_yaml: $(HELM) $(HOME)/.helm istio-init.yaml
./install/updateVersion.sh -a ${HUB},${TAG} >/dev/null 2>&1
cat install/kubernetes/namespace.yaml > install/kubernetes/istio.yaml
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio.yaml
Expand Down Expand Up @@ -716,7 +707,7 @@ generate_yaml_coredump:
# TODO(sdake) All this copy and paste needs to go. This is easy to wrap up in
# isti%.yaml macro with value files per test scenario. Will handle
# as a followup PR.
generate_e2e_test_yaml: $(HELM) $(HOME)/.helm helm-repo-add istio-init.yaml
generate_e2e_test_yaml: $(HELM) $(HOME)/.helm istio-init.yaml
#./install/updateVersion.sh -a ${HUB},${TAG} >/dev/null 2>&1
cat install/kubernetes/namespace.yaml > install/kubernetes/istio.yaml
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/istio.yaml
Expand Down
8 changes: 4 additions & 4 deletions pkg/test/deployment/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ func HelmTemplate(deploymentName, namespace, chartDir, workDir, valuesFile strin
}

// Adding cni dependency as a workaround for now.
if _, err := exec(fmt.Sprintf("helm --home %s repo add istio.io %s",
helmRepoDir, "https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts")); err != nil {
return "", err
}
// if _, err := exec(fmt.Sprintf("helm --home %s repo add istio.io %s",
// helmRepoDir, "https://storage.googleapis.com/istio-prerelease/daily-build/master-latest-daily/charts")); err != nil {
// return "", err
// }

// Package the chart dir.
if _, err := exec(fmt.Sprintf("helm --home %s package %s -d %s", helmRepoDir, chartDir, chartBuildDir)); err != nil {
Expand Down