Skip to content

Commit 8a70713

Browse files
andrewazoresandrewazores
committed
fix(presign): remove storage baseUri configuration
1 parent c7e0fa0 commit 8a70713

File tree

6 files changed

+3
-10
lines changed

6 files changed

+3
-10
lines changed

‎charts/cryostat/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ certificate issuance and rotation.
184184
| `storage.image.tag` | Tag for the storage container image | `latest` |
185185
| `storage.storageSecretName` | Name of the secret containing the object storage secret access key. This secret must contain a STORAGE_ACCESS_KEY secret which is the object storage secret access key. It must not be updated across chart upgrades, or else the connection between Cryostat components and object storage will not be able to initialize. If using an external S3 provider requiring authentication then this **must** be provided. It is recommended that the secret should be marked as immutable to avoid accidental changes to secret's data. More details: [Kubernetes Secrets](https://kubernetes.io/docs/concepts/configuration/secret/#secret-immutable) | `""` |
186186
| `storage.provider.url` | URL to the S3 object storage provider instance. This can be an in-cluster self-hosted instance with a hostname like s3.storage.local, or it can be an external commercial service. This should include scheme, host, and port. User authenication information should be provided using a *Secret* and *storage.storageSecretName*. If this is not specified then a managed [cryostat-storage](https://github.com/cryostatio/cryostat-storage) instance will be automatically deployed and configured. If an unmanaged S3 instance is specified here then other storage configuration settings (such as at-rest encryption, Pod annotations, Service configurations) do not apply. Production installations of Cryostat should not rely on `cryostat-storage` | `""` |
187-
| `storage.provider.usePathStyleAccess` | whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility, but subdomain resolution generally offers better performance if it is available | `true` |
187+
| `storage.provider.usePathStyleAccess` | whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility for low-footprint storage container installations, but subdomain resolution generally offers better performance if it is available and may be required for use with commercial storage providers. | `true` |
188188
| `storage.provider.region` | S3 object storage provider region. This may be used by the storage provider to geolocate the physical storage in a particular region for regulatory, performance, or cost reasons | `""` |
189189
| `storage.provider.authentication.credentialsType` | configuration for how the S3 client will locate credentials for the S3 service. See: [Quarkus S3 client](https://docs.quarkiverse.io/quarkus-amazon-services/dev/amazon-s3.html#) | `default` |
190190
| `storage.provider.tls.trustAll` | enable this to disable TLS certificate verification on the S3 client | `false` |

‎charts/cryostat/templates/cryostat_deployment.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ spec:
244244
value: localhost
245245
- name: QUARKUS_HTTP_PORT
246246
value: "8800"
247-
- name: CRYOSTAT_STORAGE_BASE_URI
248-
value: http://{{ $fullName }}-storage:{{ .Values.storage.service.port }}
249247
{{- with (.Values.datasource.config).extra.envVars }}
250248
{{- toYaml . | nindent 10 }}
251249
{{- end }}

‎charts/cryostat/templates/reports_deployment.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ spec:
4747
value: "{{ .Values.reports.service.httpPort }}"
4848
- name: QUARKUS_LOG_LEVEL
4949
value: {{ .Values.reports.debug.log.level }}
50-
- name: CRYOSTAT_STORAGE_BASE_URI
51-
value: http://{{ $fullName }}-storage:{{ .Values.storage.service.port }}
5250
{{- with (.Values.reports.config).extra.envVars }}
5351
{{- toYaml . | nindent 10 }}
5452
{{- end }}

‎charts/cryostat/tests/cryostat_deployment_test.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,6 @@ tests:
452452
- equal:
453453
path: spec.template.spec.containers[?(@.name=='cryostat-jfr-datasource')].env[?(@.name=='QUARKUS_HTTP_PORT')].value
454454
value: "8800"
455-
- equal:
456-
path: spec.template.spec.containers[?(@.name=='cryostat-jfr-datasource')].env[?(@.name=='CRYOSTAT_STORAGE_BASE_URI')].value
457-
value: http://RELEASE-NAME-cryostat-storage:8333
458455
- equal:
459456
path: spec.template.spec.containers[?(@.name=='cryostat-jfr-datasource')].ports[0].containerPort
460457
value: 8800

‎charts/cryostat/values.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@
673673
},
674674
"usePathStyleAccess": {
675675
"type": "boolean",
676-
"description": "whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility, but subdomain resolution generally offers better performance if it is available",
676+
"description": "whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility for low-footprint storage container installations, but subdomain resolution generally offers better performance if it is available and may be required for use with commercial storage providers.",
677677
"default": true
678678
},
679679
"region": {

‎charts/cryostat/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ storage:
277277
provider:
278278
## @param storage.provider.url URL to the S3 object storage provider instance. This can be an in-cluster self-hosted instance with a hostname like s3.storage.local, or it can be an external commercial service. This should include scheme, host, and port. User authenication information should be provided using a *Secret* and *storage.storageSecretName*. If this is not specified then a managed [cryostat-storage](https://github.com/cryostatio/cryostat-storage) instance will be automatically deployed and configured. If an unmanaged S3 instance is specified here then other storage configuration settings (such as at-rest encryption, Pod annotations, Service configurations) do not apply. Production installations of Cryostat should not rely on `cryostat-storage`
279279
url: ""
280-
## @param storage.provider.usePathStyleAccess whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility, but subdomain resolution generally offers better performance if it is available
280+
## @param storage.provider.usePathStyleAccess whether path-style accesses are used for ex. object buckets. If path style access is not used then DNS subdomain resolution will be used. This is *true* by default for broader compatibility for low-footprint storage container installations, but subdomain resolution generally offers better performance if it is available and may be required for use with commercial storage providers.
281281
usePathStyleAccess: true
282282
## @param storage.provider.region S3 object storage provider region. This may be used by the storage provider to geolocate the physical storage in a particular region for regulatory, performance, or cost reasons
283283
region: ''

0 commit comments

Comments
 (0)