Skip to content

Commit

Permalink
Merge pull request #3832 from lsst-sqre/tickets/DM-47214
Browse files Browse the repository at this point in the history
DM-47214: Remove default_instrument from sia values
  • Loading branch information
stvoutsin authored Oct 30, 2024
2 parents 29c928a + b7db9b1 commit ad58726
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion applications/sia/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 0.1.2
appVersion: 0.1.3
description: Simple Image Access (SIA) IVOA Service using Butler
name: sia
sources:
Expand Down
2 changes: 1 addition & 1 deletion applications/sia/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Simple Image Access (SIA) IVOA Service using Butler
| Key | Type | Default | Description |
|-----|------|---------|-------------|
| affinity | object | `{}` | Affinity rules for the sia deployment pod |
| config.butlerDataCollections | list | `[]` | List of data (Butler) Collections Expected attributes: `config`, `label`, `name`, `butler_type`, `repository`, `datalink_url` & `default_instrument` |
| config.butlerDataCollections | list | `[]` | List of data (Butler) Collections Expected attributes: `config`, `label`, `name`, `butler_type`, `repository` & `datalink_url` |
| config.directButlerEnabled | bool | `false` | Whether direct butler access is enabled |
| config.logLevel | string | `"INFO"` | Logging level |
| config.logProfile | string | `"production"` | Logging profile (`production` for JSON, `development` for human-friendly) |
Expand Down
1 change: 0 additions & 1 deletion applications/sia/values-idfdev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ config:
butler_type: "REMOTE"
repository: "https://data-dev.lsst.cloud/api/butler/repo/dp02/butler.yaml"
datalink_url: "https://data-dev.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}"
default_instrument: "LSSTCam-imSim"
1 change: 0 additions & 1 deletion applications/sia/values-idfint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ config:
butler_type: "REMOTE"
repository: "https://data-int.lsst.cloud/api/butler/repo/dp02/butler.yaml"
datalink_url: "https://data-int.lsst.cloud/api/datalink/links?ID=butler%3A//dp02/{id}"
default_instrument: "LSSTCam-imSim"
2 changes: 1 addition & 1 deletion applications/sia/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ config:
directButlerEnabled: false

# -- List of data (Butler) Collections
# Expected attributes: `config`, `label`, `name`, `butler_type`, `repository`, `datalink_url` & `default_instrument`
# Expected attributes: `config`, `label`, `name`, `butler_type`, `repository` & `datalink_url`
butlerDataCollections: []

# -- User to use from the PGPASSFILE if sia is using a direct Butler
Expand Down

0 comments on commit ad58726

Please sign in to comment.