Skip to content

Commit 1325561

Browse files
author
Martin Jackson
committed
Have cursor fix nil poiinter error
1 parent 64aa5d8 commit 1325561

1 file changed

Lines changed: 18 additions & 4 deletions

File tree

charts/hub/opp/templates/policy-ocm-observability.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
{{- $obc := (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "openshift-storage-obc-observability") -}}
2+
{{- $secret := (lookup "v1" "Secret" "openshift-storage" "noobaa-admin") -}}
3+
{{- $bucketName := "obc-observability-bucket" -}}
4+
{{- $endpoint := "s3.openshift-storage.svc.cluster.local" -}}
5+
{{- $accessKey := "placeholder" -}}
6+
{{- $secretKey := "placeholder" -}}
7+
{{- if $obc -}}
8+
{{- $bucketName = $obc.spec.endpoint.bucketName -}}
9+
{{- $endpoint = $obc.spec.endpoint.bucketHost -}}
10+
{{- end -}}
11+
{{- if $secret -}}
12+
{{- $accessKey = $secret.data.AWS_ACCESS_KEY_ID | b64dec -}}
13+
{{- $secretKey = $secret.data.AWS_SECRET_ACCESS_KEY | b64dec -}}
14+
{{- end -}}
115
apiVersion: policy.open-cluster-management.io/v1
216
kind: Policy
317
metadata:
@@ -35,11 +49,11 @@ spec:
3549
thanos.yaml: |
3650
type: s3
3751
config:
38-
bucket: "{{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketName | default "obc-observability-bucket" }}"
39-
endpoint: "{{ (lookup "objectbucket.io/v1alpha1" "ObjectBucket" "" "obc-openshift-storage-obc-observability").spec.endpoint.bucketHost | default "s3.openshift-storage.svc.cluster.local" }}"
52+
bucket: "{{ $bucketName }}"
53+
endpoint: "{{ $endpoint }}"
4054
insecure: false
41-
access_key: "{{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_ACCESS_KEY_ID | b64dec | default "placeholder" }}"
42-
secret_key: "{{ (lookup "v1" "Secret" "openshift-storage" "noobaa-admin").data.AWS_SECRET_ACCESS_KEY | b64dec | default "placeholder" }}"
55+
access_key: "{{ $accessKey }}"
56+
secret_key: "{{ $secretKey }}"
4357
http_config:
4458
insecure_skip_verify: true
4559
tls_config:

0 commit comments

Comments
 (0)