environment variables in the configuration with default value

Signed-off-by: Weifeng Wang <[email protected]>
qclaogui · Feb 28, 2024 · 2fa8fe9 · 2fa8fe9
1 parent 24e85f5
commit 2fa8fe9
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 49 deletions.
diff --git a/docker-compose/common/config/pyroscope/microservices-mode-profiles.yaml b/docker-compose/common/config/pyroscope/microservices-mode-profiles.yaml
@@ -6,13 +6,9 @@ storage:
   backend: s3
   s3:
     bucket_name: pyroscope-data
-    # endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio:9000}
-    # access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-    # secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
-    # insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:true}
-    endpoint: minio:9000
-    access_key_id: lgtmp
-    secret_access_key: supersecret
-    insecure: true
+    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio:9000}
+    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
+    insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:-true}
     http:
       insecure_skip_verify: true
diff --git a/docker-compose/common/config/pyroscope/monolithic-mode-profiles.yaml b/docker-compose/common/config/pyroscope/monolithic-mode-profiles.yaml
@@ -5,10 +5,10 @@ storage:
   backend: s3
   s3:
     bucket_name: pyroscope-data
-    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio:9000}
-    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
-    insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:true}
+    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio:9000}
+    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
+    insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:-true}
     http:
       insecure_skip_verify: true
 
diff --git a/docker-compose/monolithic-mode/profiles/docker-compose.yaml b/docker-compose/monolithic-mode/profiles/docker-compose.yaml
@@ -38,11 +38,6 @@ services:
     image: grafana/pyroscope:1.4.0
     volumes:
       - ../../common/config/pyroscope/monolithic-mode-profiles.yaml:/etc/config.yaml
-    environment:
-      - PYROSCOPE_STORAGE_S3_ENDPOINT=minio:9000
-      - PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID=lgtmp
-      - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=supersecret
-      - PYROSCOPE_STORAGE_S3_INSECURE=true
     command:
       - -config.file=/etc/config.yaml
       - -target=all

diff --git a/kubernetes/microservices-mode/profiles/configs/pyroscope.yaml b/kubernetes/microservices-mode/profiles/configs/pyroscope.yaml
@@ -5,9 +5,9 @@ storage:
   backend: s3
   s3:
     bucket_name: pyroscope-data
-    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio.minio-system.svc.cluster.local:443}
-    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
+    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio.minio-system.svc.cluster.local:443}
+    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
     insecure: false
     http:
       insecure_skip_verify: true
diff --git a/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml b/kubernetes/microservices-mode/profiles/k8s-all-in-one.yaml
@@ -136,9 +136,9 @@ data:
       backend: s3
       s3:
         bucket_name: pyroscope-data
-        endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio.minio-system.svc.cluster.local:443}
-        access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-        secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
+        endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio.minio-system.svc.cluster.local:443}
+        access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+        secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
         insecure: false
         http:
           insecure_skip_verify: true
@@ -173,12 +173,10 @@ metadata:
 ---
 apiVersion: v1
 data:
-  PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID: bGd0bXA=
-  PYROSCOPE_STORAGE_S3_ENDPOINT: bWluaW8ubWluaW8tc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsOjQ0Mw==
   PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: pyroscope-env-tgk2kdt8mh
+  name: pyroscope-env-h982fgc652
   namespace: profiles-system
 type: Opaque
 ---
@@ -598,7 +596,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: distributor
@@ -689,7 +687,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: querier
@@ -780,7 +778,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: query-frontend
@@ -871,7 +869,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: query-scheduler
@@ -964,7 +962,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: compactor
@@ -1061,7 +1059,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: ingester
@@ -1155,7 +1153,7 @@ spec:
         - -store-gateway.sharding-ring.replication-factor=3
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: store-gateway

diff --git a/kubernetes/microservices-mode/profiles/kustomization.yaml b/kubernetes/microservices-mode/profiles/kustomization.yaml
@@ -15,8 +15,6 @@ secretGenerator:
 - name: pyroscope-env
   namespace: profiles-system
   literals:
-  - PYROSCOPE_STORAGE_S3_ENDPOINT=minio.minio-system.svc.cluster.local:443
-  - PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID=lgtmp
   - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 

diff --git a/kubernetes/monolithic-mode/profiles/configs/pyroscope.yaml b/kubernetes/monolithic-mode/profiles/configs/pyroscope.yaml
@@ -6,9 +6,9 @@ storage:
   backend: s3
   s3:
     bucket_name: pyroscope-data
-    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio.minio-system.svc:443}
-    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
-    insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:false}
+    endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio.minio-system.svc:443}
+    access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+    secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
+    insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:-false}
     http:
       insecure_skip_verify: true
diff --git a/kubernetes/monolithic-mode/profiles/k8s-all-in-one.yaml b/kubernetes/monolithic-mode/profiles/k8s-all-in-one.yaml
@@ -124,10 +124,10 @@ data:
       backend: s3
       s3:
         bucket_name: pyroscope-data
-        endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:minio.minio-system.svc:443}
-        access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:lgtmp}
-        secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:supersecret}
-        insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:false}
+        endpoint: ${PYROSCOPE_STORAGE_S3_ENDPOINT:-minio.minio-system.svc:443}
+        access_key_id: ${PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID:-lgtmp}
+        secret_access_key: ${PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY:-supersecret}
+        insecure: ${PYROSCOPE_STORAGE_S3_INSECURE:-false}
         http:
           insecure_skip_verify: true
 kind: ConfigMap
@@ -159,12 +159,10 @@ metadata:
 ---
 apiVersion: v1
 data:
-  PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID: bGd0bXA=
-  PYROSCOPE_STORAGE_S3_ENDPOINT: bWluaW8ubWluaW8tc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsOjQ0Mw==
   PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY: VkQ1MzhPWXhTRWlHRDRJOW1tRmZxRk1DR3ExdklpR20=
 kind: Secret
 metadata:
-  name: pyroscope-env-tgk2kdt8mh
+  name: pyroscope-env-h982fgc652
   namespace: profiles-system
 type: Opaque
 ---
@@ -291,7 +289,7 @@ spec:
         - -log.level=debug
         envFrom:
         - secretRef:
-            name: pyroscope-env-tgk2kdt8mh
+            name: pyroscope-env-h982fgc652
         image: grafana/pyroscope:1.3.0
         imagePullPolicy: IfNotPresent
         name: pyroscope

diff --git a/kubernetes/monolithic-mode/profiles/kustomization.yaml b/kubernetes/monolithic-mode/profiles/kustomization.yaml
@@ -15,8 +15,6 @@ secretGenerator:
 - name: pyroscope-env
   namespace: profiles-system
   literals:
-  - PYROSCOPE_STORAGE_S3_ENDPOINT=minio.minio-system.svc.cluster.local:443
-  - PYROSCOPE_STORAGE_S3_ACCESS_KEY_ID=lgtmp
   - PYROSCOPE_STORAGE_S3_SECRET_ACCESS_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm
 
 configMapGenerator: