Merge pull request #185 from ethosengine/staging

Decoupling components with versioning in the deployment pipeline

Author: Mbd06b

.gitignore

@@ -53,3 +53,7 @@ research/matrix/pinecone
 genesis/.blob-cache/
 /elohim/research/A2A/
 /elohim/research/a2a-go/
+
+# Ephemeral SonarQube data (regenerated by sonar-issues-summary.sh)
+.claude/sonar-issues-raw.json
+.claude/sonar-issues-summary.json

Jenkinsfile

@@ -84,18 +84,25 @@ def deployAppToEnvironment(String environment, String namespace, String deployme
     // Validate ConfigMap exists
     sh "kubectl get configmap elohim-config-${environment} -n ${namespace} || { echo 'ConfigMap missing'; exit 1; }"
 
-    // Update deployment manifest with image tag
-    sh "sed 's/BUILD_NUMBER_PLACEHOLDER/${imageTag}/g' ${manifestPath} > ${manifestPath.replace('.yaml', '')}-${imageTag}.yaml"
+    // Update deployment manifest with image tag (SITE_TAG_PLACEHOLDER)
+    def outputFile = manifestPath.replace('.yaml', "-${environment}.rendered.yaml")
+    sh "sed 's/SITE_TAG_PLACEHOLDER/${imageTag}/g' ${manifestPath} > ${outputFile}"
+
+    // Fail fast if any placeholders remain
+    def remaining = sh(script: "grep -c '_PLACEHOLDER' ${outputFile} || true", returnStdout: true).trim()
+    if (remaining != '0') {
+        error "Unresolved placeholders in ${outputFile}!"
+    }
 
     // Preview manifest
     sh """
         echo '==== Deployment manifest preview ===='
-        grep 'image:' ${manifestPath.replace('.yaml', '')}-${imageTag}.yaml
+        grep 'image:' ${outputFile}
         echo '===================================='
     """
 
     // Deploy and rollout
-    sh "kubectl apply -f ${manifestPath.replace('.yaml', '')}-${imageTag}.yaml"
+    sh "kubectl apply -f ${outputFile}"
     sh "kubectl rollout restart deployment/${deploymentName} -n ${namespace}"
     sh "kubectl rollout status deployment/${deploymentName} -n ${namespace} --timeout=300s"
 

VERSION

@@ -1,2 +1,12 @@
-APP_VERSION=1.0.0
-HAPP_VERSION=1.0.0
+# Component versions - bump independently
+SITE_VERSION=1.0.0
+DOORWAY_VERSION=1.0.0
+EDGENODE_VERSION=1.0.0
+STORAGE_VERSION=1.0.0
+HAPP_INSTALLER_VERSION=1.0.0
+DOORWAY_APP_VERSION=1.0.0
+HAPP_VERSION=1.0.0
+WASM_CACHE_VERSION=1.0.0
+
+# Backward compat (remove after full migration)
+APP_VERSION=1.0.0

elohim-app/manifests/alpha-deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: elohim-site-alpha
-        image: harbor.ethosengine.com/ethosengine/elohim-site:BUILD_NUMBER_PLACEHOLDER
+        image: harbor.ethosengine.com/ethosengine/elohim-site:SITE_TAG_PLACEHOLDER
         imagePullPolicy: Always
         ports:
         - containerPort: 80

elohim-app/manifests/prod-deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: elohim-site
-        image: harbor.ethosengine.com/ethosengine/elohim-site:BUILD_NUMBER_PLACEHOLDER
+        image: harbor.ethosengine.com/ethosengine/elohim-site:SITE_TAG_PLACEHOLDER
         imagePullPolicy: Always
         ports:
         - containerPort: 80

elohim-app/manifests/ingress.yaml elohim-app/manifests/prod/ingress.yamlelohim-app/manifests/ingress.yaml renamed to elohim-app/manifests/prod/ingress.yaml

@@ -1,9 +1,8 @@
-#TODO migrate to elohim-prod namespace when production cutover is complete.
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: elohim-site-ingress
-  namespace: ethosengine
+  namespace: elohim-prod
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
 spec:
@@ -22,4 +21,4 @@ spec:
   tls:
   - hosts:
     - elohim.host
-    secretName: elohim-site-tls-cert
+    secretName: elohim-site-tls-cert

elohim-app/manifests/staging-deployment.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: elohim-site-staging
-        image: harbor.ethosengine.com/ethosengine/elohim-site:BUILD_NUMBER_PLACEHOLDER
+        image: harbor.ethosengine.com/ethosengine/elohim-site:SITE_TAG_PLACEHOLDER
         imagePullPolicy: Always
         ports:
         - containerPort: 80

environments/alpha.env

@@ -0,0 +1,9 @@
+# Alpha Environment - auto-updated by pipeline after each deploy
+# Format: COMPONENT_TAG=harbor-image-tag
+SITE_TAG=dev-latest
+EDGENODE_TAG=dev-latest
+DOORWAY_TAG=dev-latest
+STORAGE_TAG=dev-latest
+HAPP_INSTALLER_TAG=dev-latest
+DOORWAY_APP_TAG=dev-latest
+HAPP_TAG=dev-latest

environments/prod.env

@@ -0,0 +1,9 @@
+# Production Environment - auto-updated by pipeline after each deploy
+# Format: COMPONENT_TAG=harbor-image-tag
+SITE_TAG=latest
+EDGENODE_TAG=latest
+DOORWAY_TAG=latest
+STORAGE_TAG=latest
+HAPP_INSTALLER_TAG=latest
+DOORWAY_APP_TAG=latest
+HAPP_TAG=latest

environments/staging.env

@@ -0,0 +1,9 @@
+# Staging Environment - auto-updated by pipeline after each deploy
+# Format: COMPONENT_TAG=harbor-image-tag
+SITE_TAG=dev-latest
+EDGENODE_TAG=dev-latest
+DOORWAY_TAG=dev-latest
+STORAGE_TAG=dev-latest
+HAPP_INSTALLER_TAG=dev-latest
+DOORWAY_APP_TAG=dev-latest
+HAPP_TAG=dev-latest