@hed-hog/cli 0.0.60 → 0.0.62

package/dist/src/templates/deployment/k8s.deployment.yaml.ejs

@@ -23,6 +23,23 @@ spec:
           env:
             - name: NODE_ENV
               value: production
+<% if (app === 'admin') { %>
+            - name: INTERNAL_API_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: <%= config.appName %>-<%= app %>-config
+                  key: INTERNAL_API_URL
+            - name: NEXT_PUBLIC_API_BASE_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: <%= config.appName %>-<%= app %>-config
+                  key: NEXT_PUBLIC_API_BASE_URL
+            - name: NEXT_PUBLIC_API_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: <%= config.appName %>-<%= app %>-config
+                  key: NEXT_PUBLIC_API_URL
+<% } else { %>
 <%
 const secretEnvKeys = new Set(['DATABASE_URL', 'ENCRYPTION_SECRET', 'JWT_SECRET', 'PEPPER']);
 Object.keys(appEnv || {}).sort().filter((key) => key !== 'NODE_ENV').forEach((key) => {
@@ -37,6 +54,7 @@ Object.keys(appEnv || {}).sort().filter((key) => key !== 'NODE_ENV').forEach((ke
                   key: <%= key %>
 <% } %>
 <% }); %>
+<% } %>
           resources:
             requests:
               memory: 512Mi
@@ -46,22 +64,28 @@ Object.keys(appEnv || {}).sort().filter((key) => key !== 'NODE_ENV').forEach((ke
               cpu: 500m
           startupProbe:
             httpGet:
-              path: <%= app === 'api' ? '/health' : '/' %>
+              path: <%= app === 'api' || app === 'admin' ? '/health' : '/' %>
               port: <%= config.appPorts?.[app] ?? (app === 'api' ? 3000 : 80) %>
             initialDelaySeconds: 15
             periodSeconds: 10
             failureThreshold: 12
+<% if (app === 'admin') { %>            timeoutSeconds: 5
+<% } %>
           livenessProbe:
             httpGet:
-              path: <%= app === 'api' ? '/health' : '/' %>
+              path: <%= app === 'api' || app === 'admin' ? '/health' : '/' %>
               port: <%= config.appPorts?.[app] ?? (app === 'api' ? 3000 : 80) %>
             initialDelaySeconds: 0
             periodSeconds: 15
             failureThreshold: 3
+<% if (app === 'admin') { %>            timeoutSeconds: 5
+<% } %>
           readinessProbe:
             httpGet:
-              path: <%= app === 'api' ? '/health' : '/' %>
+              path: <%= app === 'api' || app === 'admin' ? '/health' : '/' %>
               port: <%= config.appPorts?.[app] ?? (app === 'api' ? 3000 : 80) %>
             initialDelaySeconds: 0
             periodSeconds: 10
             failureThreshold: 3
+<% if (app === 'admin') { %>            timeoutSeconds: 5
+<% } %>

package/dist/src/templates/deployment/workflow.deploy.yml.ejs

@@ -2,20 +2,24 @@ name: Deploy to Kubernetes
 on:
   push:
     branches:
-      - <%= config.deployBranch || 'production' %>
+      - <%= config.deployBranch %>
   workflow_dispatch:
 env:
   REGISTRY: <%= config.containerRegistry %>
   NAMESPACE: <%= config.namespace %>
-  K8S_CLUSTER_ID: <%= config.k8sClusterId || config.clusterName %>
+  K8S_CLUSTER_ID: <%= config.clusterName %>
+<% if ((config.apps || []).includes('api')) { %>
   # API environment
-  API_FRONTEND_URL: <%= config.frontendUrl || (config.domain ? `https://${config.domain}` : '') %>
+  API_FRONTEND_URL: <%= config.domain ? 'https://' + config.domain : '' %>
   API_JWT_EXPIRES_IN: <%= config.jwtExpiresIn || '7d' %>
+<% } %>
+<% if ((config.apps || []).includes('admin')) { %>
   # Admin environment (runtime-replaced at container startup)
-  ADMIN_API_BASE_URL: <%= config.domain ? `https://api.${config.domain}` : '' %>
-  ADMIN_API_URL: <%= config.domain ? `https://api.${config.domain}` : '' %>
-  ADMIN_INTERNAL_API_URL: http://<%= config.appName %>-api:<%= config.appPorts?.api || 3000 %>
-  FRONTEND_URLS: <%= config.frontendUrls || (config.domain ? `https://${config.domain}` : '') %>
+  ADMIN_API_BASE_URL: <%= config.apiDomain || '' %>
+  ADMIN_API_URL: <%= config.apiDomain || '' %>
+  ADMIN_INTERNAL_API_URL: http://<%= config.appName %>-api:3100
+  FRONTEND_URLS: <%= config.frontendUrls %>
+<% } %>
 jobs:
   apply-cluster-config:
     name: Apply Kubernetes and Helm configs
@@ -34,12 +38,14 @@ jobs:
           kubectl create namespace ${{ env.NAMESPACE }} --dry-run=client -o yaml | kubectl apply -f -
       - name: Apply Kubernetes manifests
         run: |
-      <% if (config.setupSSL) { %>          kubectl apply -f k8s/cert-manager-issuer.yaml
-      <% } %><% (config.apps || []).forEach((app) => { %>          kubectl apply -f k8s/<%= app %> -n ${{ env.NAMESPACE }}
-      <% }); %><% if (config.setupIngress) { %>          kubectl apply -f k8s/ingress.yaml -n ${{ env.NAMESPACE }}
-<% } %><% if ((config.infraServices || []).length > 0) { %>
+<% (config.apps || []).forEach(function(app) { %>
+          kubectl apply -f k8s/<%= app %> -n ${{ env.NAMESPACE }}
+<% }); %>
+
 
-<% if (config.apps.includes('api')) { %>  deploy-api:
+
+<% if ((config.apps || []).includes('api')) { %>
+  deploy-api:
     name: Deploy API
     runs-on: ubuntu-latest
     needs: apply-cluster-config
@@ -77,6 +83,16 @@ jobs:
         run: |
           docker build -t ${{ env.REGISTRY }}/<%= config.appName %>-api:${{ github.sha }} \
             -f apps/api/Dockerfile .
+      - name: Validate API runtime image
+        run: |
+          docker run --rm --entrypoint sh \
+            ${{ env.REGISTRY }}/<%= config.appName %>-api:${{ github.sha }} \
+            -c '
+              set -eu
+              test -f /app/apps/api/dist/apps/api/src/main.js
+              node -e "require(\"@prisma/client\")"
+              node -e "require(\"/app/apps/api/dist/packages/api-prisma/src/generated-client.js\")"
+            '
       - name: Push Docker image (sha)
         run: |
           docker push ${{ env.REGISTRY }}/<%= config.appName %>-api:${{ github.sha }}
@@ -171,13 +187,15 @@ jobs:
             kubectl logs -l app=<%= config.appName %>-api -n ${{ env.NAMESPACE }} --tail=50 --previous 2>/dev/null || true
             exit 1
           )
-
-<% } %><% if (config.apps.includes('admin')) { %>  deploy-admin:
+<% } %>
+<% if ((config.apps || []).includes('admin')) { %>
+  deploy-admin:
     name: Deploy ADMIN
     runs-on: ubuntu-latest
     needs:
       - apply-cluster-config
-<% if (config.apps.includes('api')) { %>      - deploy-api
+<% if ((config.apps || []).includes('api')) { %>
+      - deploy-api
 <% } %>
     steps:
       - name: Checkout code
@@ -211,7 +229,9 @@ jobs:
           docker push ${{ env.REGISTRY }}/ci-auth-probe-admin:${{ github.run_id }}
       - name: Build Docker image
         run: |
-          docker build -t ${{ env.REGISTRY }}/<%= config.appName %>-admin:${{ github.sha }} \
+          docker build -t ${{ env.REGISTRY }}/<%= config.appName %:${{ github.sha }} \
+            --build-arg NEXT_PUBLIC_API_BASE_URL=${{ env.ADMIN_API_BASE_URL }} \
+            --build-arg NEXT_PUBLIC_API_URL=${{ env.ADMIN_API_URL }} \
             -f apps/admin/Dockerfile .
       - name: Push Docker image (sha)
         run: |
@@ -254,66 +274,4 @@ jobs:
             kubectl logs -l app=<%= config.appName %>-admin -n ${{ env.NAMESPACE }} --tail=50 --previous 2>/dev/null || true
             exit 1
           )
-<% } %><% (config.apps || []).filter((app) => app !== 'api' && app !== 'admin').forEach((app) => { %>
-  deploy-<%= app %>:
-    name: Deploy <%= app.toUpperCase() %>
-    runs-on: ubuntu-latest
-    needs: apply-cluster-config
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Install doctl
-        uses: digitalocean/action-doctl@v2
-        with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
-      - name: Validate DigitalOcean token
-        run: |
-          doctl auth validate
-          doctl account get
-      - name: Validate Container Registry access
-        run: |
-          doctl registry get
-          doctl registry repository list >/dev/null 2>&1 && doctl registry repository list || echo "doctl registry repository list not available in this version"
-      - name: Log in to Container Registry
-        run: doctl registry login --expiry-seconds 1200
-      - name: Check Docker auth config
-        run: |
-          if [ -f "$HOME/.docker/config.json" ]; then
-            grep -q 'registry.digitalocean.com' "$HOME/.docker/config.json" && echo "Docker auth entry for registry.digitalocean.com found"
-          else
-            echo "Docker config not found at $HOME/.docker/config.json"
-            exit 1
-          fi
-      - name: Registry auth probe push
-        run: |
-          docker pull hello-world
-          docker tag hello-world ${{ env.REGISTRY }}/ci-auth-probe-<%= app %>:${{ github.run_id }}
-          docker push ${{ env.REGISTRY }}/ci-auth-probe-<%= app %>:${{ github.run_id }}
-      - name: Build Docker image
-        run: |
-          docker build -t ${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:${{ github.sha }} \
-            -f apps/<%= app %>/Dockerfile .
-      - name: Push Docker image (sha)
-        run: |
-          docker push ${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:${{ github.sha }}
-      - name: Push Docker image (latest)
-        run: |
-          docker tag ${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:${{ github.sha }} \
-            ${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:latest
-          docker push ${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:latest
-      - name: Save DigitalOcean kubeconfig
-        run: doctl kubernetes cluster kubeconfig save ${{ env.K8S_CLUSTER_ID }}
-      - name: Deploy to Kubernetes
-        run: |
-          kubectl set image deployment/<%= config.appName %>-<%= app %> \
-            <%= config.appName %>-<%= app %>=${{ env.REGISTRY }}/<%= config.appName %>-<%= app %>:${{ github.sha }} \
-            -n ${{ env.NAMESPACE }}
-          kubectl rollout status deployment/<%= config.appName %>-<%= app %> -n ${{ env.NAMESPACE }} --timeout=5m || (
-            echo "--- Rollout timed out. Pod status:"
-            kubectl get pods -l app=<%= config.appName %>-<%= app %> -n ${{ env.NAMESPACE }}
-            echo "--- Recent events:"
-            kubectl describe deployment/<%= config.appName %>-<%= app %> -n ${{ env.NAMESPACE }} | tail -20
-            kubectl logs -l app=<%= config.appName %>-<%= app %> -n ${{ env.NAMESPACE }} --tail=50 --previous 2>/dev/null || true
-            exit 1
-          )
-<% }); %>
+<% } %>