Commit 7b56ea0c authored by George Papathanail's avatar George Papathanail
Browse files

chore(kind): drop MongoDB mounts, artefact-manager port and the cluster-admin token

parent 6147f28a

environments/kind/cluster.yaml

+1 −13
Changes for environments/kind/cluster.yaml: 1 added line, 13 removed lines.
Original line number Diff line number Diff line
@@ -8,12 +8,9 @@ nodes: 
  extraPortMappings:

  

  # Core Platform Services (oop namespace)

  - containerPort: 32415    # SRM Dashboard

  - containerPort: 32415    # SRM API

    hostPort: 32415

    protocol: TCP

  - containerPort: 30080    # Artifact Manager

    hostPort: 30080

    protocol: TCP

  - containerPort: 32263    # OEG API

    hostPort: 32263

    protocol: TCP
@@ -43,12 +40,3 @@ nodes: 
  - containerPort: 30083    # Data Lab UI

    hostPort: 30083

    protocol: TCP
 


  # Storage volumes for MongoDB persistence

  extraMounts:

  - hostPath: /tmp/kind-oop/mongodb_srm

    containerPath: /mnt/data/mongodb_srm

  - hostPath: /tmp/kind-oop/mongodb_oeg

    containerPath: /mnt/data/mongodb_oeg

  - hostPath: /tmp/kind-oop/mongodb_fm

    containerPath: /mnt/data/mongodb_fm
 
 No newline at end of file

environments/kind/values.yaml

+1 −1
Changes for environments/kind/values.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
# ====================================================================

# Kind-specific overrides for the OOP umbrella chart (SRM + OEG)

# Kind-specific overrides for the OOP umbrella chart

# ====================================================================

# Used by deploy-on-kind.sh:

#   helm install oop-platform ./oop-platform-chart -f environments/kind/values.yaml

scripts/helm-deploy.sh

+3 −12
Changes for scripts/helm-deploy.sh: 3 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -44,12 +44,6 @@ else 
fi

echo ""



# ── Generate token from existing service account ─────────────────────

echo "Generating token..."

TOKEN=$(kubectl -n $OOP_NS create token oop-user --duration=720h)

echo "  Token generated"

echo ""



echo "Updating Helm chart dependencies..."



helm repo add nats https://nats-io.github.io/k8s/helm/charts/ >/dev/null 2>&1 || true
@@ -68,9 +62,7 @@ helm upgrade --install $OOP_RELEASE "$CHART_DIR" \ 
    -n $OOP_NS \

    --create-namespace \

    -f "$REPO_ROOT/environments/kind/values.yaml" \

    ${SECRETS_FLAGS} \

    --set srm.srmcontroller.env.kubernetesMasterToken="$TOKEN" \

    --set federation-manager.enabled=true

    ${SECRETS_FLAGS}



echo ""

echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
@@ -78,9 +70,8 @@ echo "Deployment complete!" 
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

echo ""

echo "Access URLs (via localhost):"

echo "   SRM Dashboard:       http://localhost:32415"

echo "   Artifact Manager:    http://localhost:30080"

echo "   OEG API:             http://localhost:32263/oeg/1.0.0/docs/"

echo "   SRM API:             http://localhost:32415"

echo "   OEG API:             http://localhost:32263/docs"

echo "   Keycloak:            http://localhost:30081"

echo "   Keycloak Admin:      http://localhost:30081/admin  (Username: admin)"

echo "      password: kubectl -n $OOP_NS get secret keycloak-credentials -o jsonpath='{.data.admin-password}' | base64 -d"

scripts/kind-bootstrap.sh

+5 −19
Changes for scripts/kind-bootstrap.sh: 5 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -12,14 +12,13 @@ REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" 
KIND_CONFIG="$REPO_ROOT/environments/kind/cluster.yaml"



OOP_NS="oop"

FM_NS="federation-manager"



echo "OOP Platform — kind Bootstrap"

echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

echo ""



# ── Step 1: Check prerequisites ──────────────────────────────────────

echo "Step 1/4: Checking prerequisites..."

echo "Step 1/3: Checking prerequisites..."



if ! command -v kind &> /dev/null; then

    echo " kind is not installed"
@@ -35,15 +34,8 @@ fi 
echo " Prerequisites met (kind, kubectl)"

echo ""



# ── Step 2: Create storage directories ───────────────────────────────

echo "Step 2/4: Creating storage directories..."

sudo mkdir -p /tmp/kind-oop/mongodb_srm /tmp/kind-oop/mongodb_oeg /tmp/kind-oop/mongodb_fm 2>/dev/null || true

sudo chmod -R 777 /tmp/kind-oop/ 2>/dev/null || true

echo "  Storage directories ready at /tmp/kind-oop/"

echo ""



# ── Step 3: Create kind cluster ───────────────────────────────────────

echo "Step 3/4: Creating kind cluster..."

# ── Step 2: Create kind cluster ───────────────────────────────────────

echo "Step 2/3: Creating kind cluster..."



if kind get clusters 2>/dev/null | grep -q "oop-cluster"; then

    echo "  Cluster 'oop-cluster' already exists"
@@ -64,18 +56,12 @@ fi 
kubectl config use-context kind-oop-cluster

echo ""



# ── Step 4: Wait for cluster, create namespaces and service account ───

echo "Step 4/4: Waiting for cluster and setting up namespaces + RBAC..."

# ── Step 3: Wait for cluster and create the namespace ────────────────

echo "Step 3/3: Waiting for cluster and creating the namespace..."

kubectl wait --for=condition=Ready nodes --all --timeout=120s



kubectl create namespace $OOP_NS 2>/dev/null || echo "  Namespace $OOP_NS already exists"



kubectl create serviceaccount oop-user -n $OOP_NS 2>/dev/null || echo "  Service account already exists"

kubectl create clusterrolebinding oop-user-binding \

    --clusterrole=cluster-admin \

    --serviceaccount=$OOP_NS:oop-user \

    2>/dev/null || echo "  ClusterRoleBinding already exists"



echo "  Cluster ready"

echo ""

echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"