From cec4c79c7caa340d95fd90b458aa7b7006ba48d9 Mon Sep 17 00:00:00 2001 From: mr Date: Tue, 14 Apr 2026 10:54:31 +0200 Subject: [PATCH] installing argo workflow missing --- docker/demo/demo.sh | 15 ++++++++----- docker/demo/docker-compose.dev.yml | 34 +++++++++++++---------------- docker/demo/docker-compose.dev2.yml | 15 +++++++++++++ 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/docker/demo/demo.sh b/docker/demo/demo.sh index 37b8aad..6277c72 100755 --- a/docker/demo/demo.sh +++ b/docker/demo/demo.sh @@ -49,9 +49,14 @@ helm repo add argo https://argoproj.github.io/argo-helm || true helm repo add admiralty https://charts.admiralty.io || true helm repo update -echo "🧩 Installing Argo CD..." -kubectl create namespace argocd || true -helm upgrade --install argocd argo/argo-cd -n argocd +echo "🧩 Installing Argo..." +kubectl create namespace argo || true + +echo "🧩 Installing Argo Workflows..." +helm upgrade --install argo-workflows argo/argo-workflows \ + -n argo \ + --set server.authMode=server \ + --wait echo "🧩 Installing Admiralty..." @@ -123,7 +128,7 @@ do docker rm $i || true done -OC_KUBE_CA=$ca OC_KUBE_CERT=$cert OC_KUBE_DATA=$key docker compose -f ./docker-compose.dev.yml up -d || true +KUBE_CA=$ca KUBE_CERT=$cert KUBE_DATA=$key docker compose -f ./docker-compose.dev.yml up -d || true cd ./db-1 && ./add.sh && cd .. # MISSING ADD DATAS @@ -159,7 +164,7 @@ do docker rm "$i" || true done -OC_KUBE_CA=$ca OC_KUBE_CERT=$cert OC_KUBE_DATA=$key docker compose -f ./docker-compose.dev2.yml up -d || true +KUBE_CA=$ca KUBE_CERT=$cert KUBE_DATA=$key docker compose -f ./docker-compose.dev2.yml up -d || true # MISSING ADD DATAS cd ./db-2 && ./add.sh && cd .. diff --git a/docker/demo/docker-compose.dev.yml b/docker/demo/docker-compose.dev.yml index 179e5fe..4056477 100644 --- a/docker/demo/docker-compose.dev.yml +++ b/docker/demo/docker-compose.dev.yml @@ -148,10 +148,10 @@ services: - path: ./env.env required: false environment: - - MONGO_DATABASE=DC_myDC - - KUBE_CA=${KUBE_CA:-} - - KUBE_CERT=${KUBE_CERT:-} - - KUBE_DATA=${KUBE_DATA:-} + - OC_MONGO_DATABASE=DC_myDC + - OC_KUBE_CA=${KUBE_CA:-} + - OC_KUBE_CERT=${KUBE_CERT:-} + - OC_KUBE_DATA=${KUBE_DATA:-} image: '${REGISTRY:-opencloudregistry/}oc-datacenter:latest' ports: - 8092:8080 @@ -173,10 +173,10 @@ services: - oc oc-scheduler: environment: - - MONGO_DATABASE=DC_myDC - - KUBE_CA=${KUBE_CA:-} - - KUBE_CERT=${KUBE_CERT:-} - - KUBE_DATA=${KUBE_DATA:-} + - OC_MONGO_DATABASE=DC_myDC + - OC_KUBE_CA=${KUBE_CA:-} + - OC_KUBE_CERT=${KUBE_CERT:-} + - OC_KUBE_DATA=${KUBE_DATA:-} image: '${REGISTRY:-opencloudregistry/}oc-scheduler:latest' labels: - "traefik.stack=peer1" @@ -199,7 +199,7 @@ services: oc-catalog: environment: - - MONGO_DATABASE=DC_myDC + - OC_MONGO_DATABASE=DC_myDC image: '${REGISTRY:-opencloudregistry/}oc-catalog:latest' ports: - 8087:8080 @@ -221,7 +221,7 @@ services: - "traefik.http.middlewares.auth-catalog.forwardauth.authResponseHeaders=X-Auth-Request-User,X-Auth-Request-Email" oc-workspace: environment: - - MONGO_DATABASE=DC_myDC + - OC_MONGO_DATABASE=DC_myDC image: '${REGISTRY:-opencloudregistry/}oc-workspace:latest' ports: - 8089:8080 @@ -243,7 +243,7 @@ services: - oc oc-peer: environment: - - MONGO_DATABASE=DC_myDC + - OC_MONGO_DATABASE=DC_myDC image: '${REGISTRY:-opencloudregistry/}oc-peer:latest' labels: - "traefik.stack=peer1" @@ -312,10 +312,6 @@ services: networks: - oc oc-workflow: - environment: - - _OCWORKFLOW_MONGO_DATABASE=DC_myDC - - _OCWORKFLOW_MONGO_URL=mongodb://mongo:27017 - - _OCWORKFLOW_NATS_URL=nats://nats:4222 image: '${REGISTRY:-opencloudregistry/}oc-workflow:latest' ports: - 8088:8080 @@ -367,10 +363,10 @@ services: ports: - 9006:8080 environment: - - MONGO_DATABASE=DC_myDC - - KUBE_CA=${KUBE_CA:-} - - KUBE_CERT=${KUBE_CERT:-} - - KUBE_DATA=${KUBE_DATA:-} + - OC_MONGO_DATABASE=DC_myDC + - OC_KUBE_CA=${KUBE_CA:-} + - OC_KUBE_CERT=${KUBE_CERT:-} + - OC_KUBE_DATA=${KUBE_DATA:-} container_name: oc-schedulerd networks: - oc diff --git a/docker/demo/docker-compose.dev2.yml b/docker/demo/docker-compose.dev2.yml index 9f2cd98..18bd7e2 100644 --- a/docker/demo/docker-compose.dev2.yml +++ b/docker/demo/docker-compose.dev2.yml @@ -385,6 +385,21 @@ services: container_name: oc-static2 networks: - oc2 + oc-front2: + image: '${REGISTRY:-opencloudregistry/}oc-front:latest' + container_name: oc-front2 + ports: + - 8011:80 + networks: + - oc2 + labels: + - "traefik.stack=peer2" + - "traefik.enable=true" + - "traefik.http.routers.front.entrypoints=web" + - "traefik.http.routers.front.rule=PathPrefix(`/`)" + - "traefik.http.services.front.loadbalancer.server.port=80" + - "traefik.http.middlewares.front-stripprefix.stripprefix.prefixes=/" + - "traefik.http.routers.front.middlewares=front-stripprefix" volumes: oc-data2: