Skip to content

Commit

Permalink
helm: Generate experimental-install.yaml
Browse files Browse the repository at this point in the history
Generate experimental-install.yaml in which we can enable experimental
features without changing default values in the Helm chart. This makes
it easier for users to play around with bleeding edge features with a
simple `kubectl apply`.

Ref #11902

Signed-off-by: Michi Mutsuzaki <michi@isovalent.com>
  • Loading branch information
michi-covalent authored and aanm committed Jun 9, 2020
1 parent a67554d commit ed65830
Show file tree
Hide file tree
Showing 3 changed files with 918 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/helm-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Check quick-install.yaml
- name: Check quick-install.yaml and experimental-install.yaml
run: |
cd install/kubernetes
make all
Expand Down
14 changes: 12 additions & 2 deletions install/kubernetes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ include ../../Makefile.defs
MANAGED_ETCD_VERSION := "v2.0.7"

QUICK_INSTALL := "$(ROOT_DIR)/$(RELATIVE_DIR)/quick-install.yaml"
EXPERIMENTAL_INSTALL := "$(ROOT_DIR)/$(RELATIVE_DIR)/experimental-install.yaml"
MANAGED_ETCD_PATH := "$(ROOT_DIR)/$(RELATIVE_DIR)/cilium/charts/managed-etcd/values.yaml"
CILIUM_CHARTS := "$(ROOT_DIR)/$(RELATIVE_DIR)/cilium/"
CILIUM_VALUES := "$(CILIUM_CHARTS)/values.yaml"
Expand All @@ -16,12 +17,21 @@ DEV_VERSION_REGEX := '[0-9]\+\.[0-9]\+\.[0-9]\+-dev'
CILIUM_CHART_REGEX := '\([vV]ersion:\) '$(VERSION_REGEX)
CILIUM_TAG_REGEX := '\(tag:\) \(v'$(VERSION_REGEX)'\|latest\)'
CILIUM_PULLPOLICY_REGEX := '\(pullPolicy:\) .*'
EXPERIMENTAL_OPTIONS := \
--set global.hubble.enabled=true \
--set global.hubble.listenAddress=":4244" \
--set global.hubble.metrics.enabled="{dns,drop,tcp,flow,port-distribution,icmp,http}" \
--set global.hubble.relay.enabled=true \
--set global.hubble.ui.enabled=true

all: update-versions $(QUICK_INSTALL)
all: update-versions $(QUICK_INSTALL) $(EXPERIMENTAL_INSTALL)

$(QUICK_INSTALL): $(shell find cilium/ -type f)
$(QUIET)helm template cilium --namespace=kube-system $(OPTS) > $(QUICK_INSTALL)

$(EXPERIMENTAL_INSTALL): $(shell find cilium/ -type f)
$(QUIET)helm template cilium --namespace=kube-system $(EXPERIMENTAL_OPTIONS) > $(EXPERIMENTAL_INSTALL)

update-versions:
$(ECHO_GEN) " -> Updating version to $(VERSION)"
@# Update chart versions to point to the current version.
Expand All @@ -43,6 +53,6 @@ update-versions:
$(QUIET)sed -i 's/'$(VERSION)'/'$(MANAGED_ETCD_VERSION)'/' $(MANAGED_ETCD_PATH)

clean:
$(RM) $(QUICK_INSTALL)
$(RM) $(QUICK_INSTALL) $(EXPERIMENTAL_INSTALL)

.phony: all clean update-versions

0 comments on commit ed65830

Please sign in to comment.