Skip to content

Commit fa9b2e3

Browse files
committed
Tiltfile: rename deploy_kustomizations to additional_kustomizations
1 parent 034c8dd commit fa9b2e3

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

Tiltfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,8 @@ def deploy_observability():
482482
objects = ["capi-visualizer:serviceaccount"],
483483
)
484484

485-
def deploy_kustomizations():
486-
for name in settings.get("deploy_kustomizations", []):
485+
def deploy_additional_kustomizations():
486+
for name in settings.get("additional_kustomizations", []):
487487
yaml = read_file("./.tiltbuild/yaml/{}.kustomization.yaml".format(name))
488488
k8s_yaml(yaml)
489489
objs = decode_yaml_stream(yaml)
@@ -653,7 +653,7 @@ deploy_provider_crds()
653653

654654
deploy_observability()
655655

656-
deploy_kustomizations()
656+
deploy_additional_kustomizations()
657657

658658
enable_providers()
659659

docs/book/src/developer/tilt.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,10 @@ Supported values are:
214214

215215
\*: Note: the UI will be accessible via a link in the tilt console
216216

217-
**deploy_kustomizations** (map[string]string, default={}): If set, installs the additional kustomizations to the cluster.
218-
217+
**additional_kustomizations** (map[string]string, default={}): If set, install the additional resources built using kustomize to the cluster.
219218
Example:
220219
```yaml
221-
deploy_kustomizations:
220+
additional_kustomizations:
222221
capv-metrics: ../cluster-api-provider-vsphere/config/metrics
223222
```
224223

hack/tools/internal/tilt-prepare/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ var (
104104
// Types used to de-serialize the tilt-settings.yaml/json file from the Cluster API repository.
105105

106106
type tiltSettings struct {
107-
Debug map[string]tiltSettingsDebugConfig `json:"debug,omitempty"`
108-
ExtraArgs map[string]tiltSettingsExtraArgs `json:"extra_args,omitempty"`
109-
DeployCertManager *bool `json:"deploy_cert_manager,omitempty"`
110-
DeployObservability []string `json:"deploy_observability,omitempty"`
111-
DeployKustomizations map[string]string `json:"deploy_kustomizations,omitempty"`
112-
EnableProviders []string `json:"enable_providers,omitempty"`
113-
AllowedContexts []string `json:"allowed_contexts,omitempty"`
114-
ProviderRepos []string `json:"provider_repos,omitempty"`
107+
Debug map[string]tiltSettingsDebugConfig `json:"debug,omitempty"`
108+
ExtraArgs map[string]tiltSettingsExtraArgs `json:"extra_args,omitempty"`
109+
DeployCertManager *bool `json:"deploy_cert_manager,omitempty"`
110+
DeployObservability []string `json:"deploy_observability,omitempty"`
111+
EnableProviders []string `json:"enable_providers,omitempty"`
112+
AllowedContexts []string `json:"allowed_contexts,omitempty"`
113+
ProviderRepos []string `json:"provider_repos,omitempty"`
114+
AdditionalKustomizations map[string]string `json:"additional_kustomizations,omitempty"`
115115
}
116116

117117
type tiltSettingsDebugConfig struct {
@@ -309,7 +309,7 @@ func tiltResources(ctx context.Context, ts *tiltSettings) error {
309309
)
310310
}
311311

312-
for name, path := range ts.DeployKustomizations {
312+
for name, path := range ts.AdditionalKustomizations {
313313
name := fmt.Sprintf("%s.kustomization", name)
314314
tasks[name] = sequential(
315315
kustomizeTask(path, fmt.Sprintf("%s.yaml", name)),

0 commit comments

Comments
 (0)