Make the S3 and otel profile mutually exclusive

pulp · Oct 8, 2024 · 7bd38ca · 7bd38ca
1 parent 1378090
commit 7bd38ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/profiles/opentelemetry_dev/compose.yaml b/profiles/opentelemetry_dev/compose.yaml
@@ -1,8 +1,7 @@
----
 version: "3.7"
 
 services:
-
+    
   jaeger:
     container_name: jaeger
     image: jaegertracing/all-in-one:latest
@@ -11,23 +10,23 @@ services:
       JAEGER_DISABLED: "true"
     ports:
       - "16686:16686"
-      - "14250"
-      - "14268"
-      - "4317"
+      - "14250:14250"
+      - "14268:14268"
+      - "4317:4317"
 
   otel-collector:
     container_name: otel-collector
     image: otel/opentelemetry-collector-contrib
     command: [--config=/etc/otel-collector/otel-collector-config.yaml]
     volumes:
-      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/otel-collector:/etc/otel-collector"
+      - "{OCI_ENV_DIR}/profiles/opentelemetry_dev/otel-collector:/etc/otel-collector"
     ports:
       - "1888"   # pprof extension
       - "8888:8888"   # Prometheus metrics exposed by the collector
       - "8889:8889"   # Prometheus exporter metrics
-      - "13133" # health_check extension
+      - "13133:13133" # health_check extension
       - "4318:4318"   # OTLP http receiver
-      - "55679" # zpages extension
+      - "55679:55679" # zpages extension
     depends_on:
       - prometheus
       - jaeger
@@ -36,7 +35,7 @@ services:
     container_name: prometheus
     image: prom/prometheus
     volumes:
-      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/prometheus:/etc/prometheus"
+      - "{OCI_ENV_DIR}/profiles/opentelemetry_dev/prometheus:/etc/prometheus"
     ports:
       - "9090:9090"
 
@@ -46,16 +45,13 @@ services:
       - prometheus
     restart: "always"
     volumes:
-      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/provisioning:/etc/grafana/provisioning"
-      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/dashboards:/var/lib/grafana/dashboards"
-      - "{OCI_ENV_DIR}/profiles/{COMPOSE_PROFILE}/grafana/config.ini:/etc/grafana/config.ini"
-      # - type: bind
-      #   source: ./grafana/config.ini
-      #   target: /etc/grafana/config.ini
+      - "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/provisioning:/etc/grafana/provisioning"
+      - "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/dashboards:/var/lib/grafana/dashboards"
+      - "{OCI_ENV_DIR}/profiles/opentelemetry_dev/grafana/config.ini:/etc/grafana/config.ini"
     ports:
       - "3000:3000"
 
 networks:
   default:
     name: oci_env_default
-    external: "true"
+    external: true
diff --git a/profiles/pminio/compose.yaml b/profiles/pminio/compose.yaml
@@ -8,12 +8,12 @@ services:
       - "MINIO_SECRET_KEY={S3_SECRET_KEY}"
     ports:
       - "{MINIO_PORT}:9000"
-      - "{MINIO_CONSOLE_PORT}:9090"
+      - "{MINIO_CONSOLE_PORT}:9091"
     volumes:
       - "oci_pminio:/data"
     depends_on:
       - pulp
-    command: "server /data --console-address ':9090'"
+    command: "server /data --console-address ':9091'"
 
 volumes:
   oci_pminio:

diff --git a/profiles/pminio/profile_default_config.env b/profiles/pminio/profile_default_config.env
@@ -3,4 +3,4 @@ S3_ACCESS_KEY=pulpminioaccesskey
 S3_SECRET_KEY=pulpminioinsecuresecretkey
 
 MINIO_PORT=9000
-MINIO_CONSOLE_PORT=9090
+MINIO_CONSOLE_PORT=9091