Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Support a list of maps in tilt-settings #3346

Merged

Conversation

h0tbird
Copy link
Contributor

@h0tbird h0tbird commented Jul 15, 2020

What this PR does / why we need it:
As a developer I want to be able to define multiple Tilt providers per repository.
This is useful for developing CAPI providers that include multiple operators.

Anything else you would like to add:
My CAPI tilt-settings.json looks like this:

{
  "default_registry": "localhost:5000",
  "provider_repos": ["../cluster-api-provider-aws"],
  "enable_providers": ["aws", "eks-bootstrap"],
  "kustomize_substitutions": {
    "AWS_B64ENCODED_CREDENTIALS": "<REDACTED>",
    "EXP_MACHINE_POOL:=false": "false",
    "EXP_CLUSTER_RESOURCE_SET:=false": "false"
  }
}

And I tested two different CAPA tilt-settings.json:

{
  "name": "aws",
  "config": {
    "image": "gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller",
    "live_reload_deps": [
      "main.go", "go.mod", "go.sum", "api", "cmd", "controllers", "pkg"
    ]
  }
}

and this:

[
  {
    "name": "aws",
    "config": {
      "image": "gcr.io/k8s-staging-cluster-api-aws/cluster-api-aws-controller",
      "live_reload_deps": [
        "main.go", "go.mod", "go.sum", "api", "cmd", "controllers", "pkg"
      ]
    }
  },
  {
    "name": "eks-bootstrap",
    "config": {
      "context": "bootstrap/eks",
      "image": "gcr.io/k8s-staging-cluster-api-aws/eks-bootstrap-controller",
      "live_reload_deps": [
        "main.go", "api", "controllers"
      ]
    }
  }
]

Which issue(s) this PR fixes:
Fixes #3299

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 15, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @h0tbird. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 15, 2020
@h0tbird h0tbird marked this pull request as ready for review July 15, 2020 10:49
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 15, 2020
@fabriziopandini
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 15, 2020
Tiltfile Outdated Show resolved Hide resolved
@fabriziopandini
Copy link
Member

/lgtm
please squash commits

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 15, 2020
chore: be more explicit about the intent
@h0tbird h0tbird force-pushed the tilt-settings-list-of-dics branch from 27834d5 to 58ae30d Compare July 16, 2020 09:07
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 16, 2020
@fabriziopandini
Copy link
Member

/lgtm
over to @ncdc or @detiber for the final approval

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 16, 2020
@ncdc
Copy link
Contributor

ncdc commented Jul 16, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ncdc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 16, 2020
@k8s-ci-robot k8s-ci-robot merged commit 19afe6c into kubernetes-sigs:master Jul 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add support for multiple Tilt providers in tilt-provider.json
4 participants