Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

🌱 Remove unnecessary env variables in make target env-vars-for-wl-cluster #102

Merged
matofeder merged 2 commits into from
Feb 26, 2024
Merged

🌱 Remove unnecessary env variables in make target env-vars-for-wl-cluster #102

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
bdf00f8
Remove unnecessary env variables in make target env-vars-for-wl-cluster
michal-gubricky Feb 20, 2024
dc7f129
Ensure that we check env variables for local_mode enabled and disabled
michal-gubricky Feb 23, 2024
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
13 changes: 5 additions & 8 deletions .envrc.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
export KUBECONFIG=$PWD/.mgt-cluster-kubeconfig.yaml
export GIT_PROVIDER_B64=Z2l0aHVi
export GIT_ACCESS_TOKEN_B64=mybase64encodedtoken
export GIT_ORG_NAME_B64=U292ZXJlaWduQ2xvdWRTdGFjaw==
export GIT_REPOSITORY_NAME_B64=Y2x1c3Rlci1zdGFja3M=
export EXP_CLUSTER_RESOURCE_SET=true
export EXP_MACHINE_POOL=true
export CLUSTER_TOPOLOGY=true
export EXP_RUNTIME_SDK=true
export EXP_MACHINE_SET_PREFLIGHT_CHECKS=true
export CLUSTER_NAME=test-dfkhje
export SECRET_NAME=supersecret
export CLOUD_NAME=test
export ENCODED_CLOUDS_YAML=mybase64encodedcloudsyamlfile
## These env variables are not needed when local_mode is enabled
# export GIT_PROVIDER_B64=Z2l0aHVi
# export GIT_ACCESS_TOKEN_B64=mybase64encodedtoken
# export GIT_ORG_NAME_B64=U292ZXJlaWduQ2xvdWRTdGFjaw==
# export GIT_REPOSITORY_NAME_B64=Y2x1c3Rlci1zdGFja3M=
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,13 @@ all-tools: $(GOTESTSUM) $(go-cover-treemap) $(go-binsize-treemap) $(KIND) $(PACK
##@ Development

env-vars-for-wl-cluster:
@./hack/ensure-env-variables.sh GIT_PROVIDER_B64 GIT_ACCESS_TOKEN_B64 GIT_ORG_NAME_B64 GIT_REPOSITORY_NAME_B64 EXP_CLUSTER_RESOURCE_SET CLUSTER_TOPOLOGY CLUSTER_NAME SECRET_NAME CLOUD_NAME ENCODED_CLOUDS_YAML
ifeq ($(wildcard tilt-settings.yaml),)
@./hack/ensure-env-variables.sh GIT_PROVIDER_B64 GIT_ACCESS_TOKEN_B64 GIT_ORG_NAME_B64 GIT_REPOSITORY_NAME_B64 CLUSTER_TOPOLOGY CLUSTER_NAME SECRET_NAME CLOUD_NAME ENCODED_CLOUDS_YAML
else ifeq ($(shell awk '/local_mode:/ {print tolower($$2)}' tilt-settings.yaml),true)
@./hack/ensure-env-variables.sh CLUSTER_TOPOLOGY CLUSTER_NAME SECRET_NAME CLOUD_NAME ENCODED_CLOUDS_YAML
Comment thread
matofeder marked this conversation as resolved.
else
@./hack/ensure-env-variables.sh GIT_PROVIDER_B64 GIT_ACCESS_TOKEN_B64 GIT_ORG_NAME_B64 GIT_REPOSITORY_NAME_B64 CLUSTER_TOPOLOGY CLUSTER_NAME SECRET_NAME CLOUD_NAME ENCODED_CLOUDS_YAML
endif

.PHONY: cluster
cluster: $(CTLPTL) $(KUBECTL) ## Creates kind-dev Cluster
Expand Down Expand Up @@ -589,4 +595,4 @@ get-kubeconfig-workload-cluster:

.PHONY: tilt-up
tilt-up: env-vars-for-wl-cluster $(ENVSUBST) $(KUBECTL) $(KUSTOMIZE) $(TILT) cluster ## Start a mgt-cluster & Tilt. Installs the CRDs and deploys the controllers
EXP_CLUSTER_RESOURCE_SET=true $(TILT) up --port=10351
$(TILT) up --port=10351