Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ install/kubernetes/istio-remote.yaml
install/kubernetes/istio-mcp.yaml
install/kubernetes/istio-auth-mcp.yaml
install/kubernetes/helm/istio/requirements.lock
install/kubernetes/helm/istio-remote/requirements.lock
samples/bookinfo/platform/consul/bookinfo.sidecars.yaml
*.orig
# Avoid accidental istio.VERSION changes
Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -635,13 +635,14 @@ helm-repo-add:
istio-remote.yaml: $(HELM) $(HOME)/.helm helm-repo-add
cat install/kubernetes/namespace.yaml > install/kubernetes/$@
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
$(HELM) dep update --skip-refresh install/kubernetes/helm/istio-remote
$(HELM) dep update --skip-refresh install/kubernetes/helm/istio
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a separate PR we should move back the charts so dep update is not needed ( was added to allow sharing of charts with istio-remote)

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes @costinm, that's the plan

$(HELM) template --name=istio --namespace=istio-system \
--values install/kubernetes/helm/istio/values-istio-remote.yaml \
--set istio_cni.enabled=${ENABLE_ISTIO_CNI} \
${EXTRA_HELM_SETTINGS} \
install/kubernetes/helm/istio-remote >> install/kubernetes/$@
install/kubernetes/helm/istio >> install/kubernetes/$@

# create istio-remote.yaml
# create istio-init.yaml
istio-init.yaml: $(HELM) $(HOME)/.helm helm-repo-add
cat install/kubernetes/namespace.yaml > install/kubernetes/$@
cat install/kubernetes/helm/istio-init/files/crd-* >> install/kubernetes/$@
Expand Down
6 changes: 3 additions & 3 deletions bin/linters.sh
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ function run_golangcilint() {
}

function run_helm_lint() {
echo 'Running helm lint on istio & istio-remote ....'
helm lint ./install/kubernetes/helm/{istio,istio-remote}
echo 'helm lint on istio & istio-remote OK'
echo 'Running helm lint on istio ....'
helm lint ./install/kubernetes/helm/istio
echo 'helm lint on istio OK'
}

function check_grafana_dashboards() {
Expand Down
21 changes: 0 additions & 21 deletions install/kubernetes/helm/istio-remote/.helmignore

This file was deleted.

12 changes: 0 additions & 12 deletions install/kubernetes/helm/istio-remote/Chart.yaml

This file was deleted.

202 changes: 0 additions & 202 deletions install/kubernetes/helm/istio-remote/LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions install/kubernetes/helm/istio-remote/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions install/kubernetes/helm/istio-remote/requirements.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions install/kubernetes/helm/istio-remote/templates/NOTES.txt

This file was deleted.

43 changes: 0 additions & 43 deletions install/kubernetes/helm/istio-remote/templates/_affinity.tpl

This file was deleted.

30 changes: 0 additions & 30 deletions install/kubernetes/helm/istio-remote/templates/_helpers.tpl

This file was deleted.

This file was deleted.

Loading