Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ docker_build(

######## Feature Branch ########
# We are leveraging master branch or the feature branch to install both the agent-control and the agent-control-deployment charts.
feature_branch = 'feat/flux-install-update'
feature_branch = 'master'

#### Set-up charts

Expand Down
2 changes: 1 addition & 1 deletion agent-control/tests/k8s/Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ helm_resource(
#### build data/charts and upload it to chart museum
### Feature Branch Workaround ###
# Use the branch source to get the chart form a feature branch in the NR helm-charts repo.
feature_branch = "feat/flux-install-update"
feature_branch = "master"

# We're modifying the default image in the charts for different versions because we don't expose the values to be
# modified by the remote_config but we do tests upgrading charts that require image modification
Expand Down
Loading