Skip to content

Commit

Permalink
fix: resolve all env vars
Browse files Browse the repository at this point in the history
  • Loading branch information
tinyzimmer committed Oct 2, 2023
1 parent a678da0 commit 1f3350f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ bundle: manifests ## Bundle creates a distribution bundle manifest.
@echo "+ Loading storage provider assets from $(STORAGE_PROVIDER_BUNDLE)"
@echo "# Source: $(STORAGE_PROVIDER_BUNDLE)" > $(BUNDLE)
curl -JL $(STORAGE_PROVIDER_BUNDLE) >> $(BUNDLE)
@echo "---" >> $(BUNDLE)
@echo "# END: $(STORAGE_PROVIDER_BUNDLE)" >> $(BUNDLE)
@echo "+ Appending WebMesh CNI assets to $(BUNDLE)"
@echo "---" >> $(BUNDLE)
Expand Down
1 change: 1 addition & 0 deletions deploy/bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -764,6 +764,7 @@ rules:
- get
- patch
- update
---
# END: https://github.com/webmeshproj/storage-provider-k8s/raw/main/deploy/bundle.yaml
---
# Source: /home/aizimmerman/devel/webmesh/cni/deploy/bundle.yaml
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ func Main(version string) {
shutdownTimeout time.Duration
zapopts = zap.Options{Development: true}
)
flag.StringVar(&namespace, "namespace", install.PodNamespaceEnvVar, "The namespace to use for the webmesh resources.")
flag.StringVar(&nodeID, "node-id", install.NodeNameEnvVar, "The node ID to use for the webmesh cluster.")
flag.StringVar(&namespace, "namespace", os.Getenv(install.PodNamespaceEnvVar), "The namespace to use for the webmesh resources.")
flag.StringVar(&nodeID, "node-id", os.Getenv(install.NodeNameEnvVar), "The node ID to use for the webmesh cluster.")
flag.StringVar(&podCIDR, "pod-cidr", "172.16.0.0/12", "The pod CIDR to use for the webmesh cluster.")
flag.StringVar(&clusterDomain, "cluster-domain", "cluster.local", "The cluster domain to use for the webmesh cluster.")
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
Expand Down

0 comments on commit 1f3350f

Please sign in to comment.