@vaharoni/devops 1.1.1 → 1.1.3

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/config/constants.yaml

@@ -1,5 +1,5 @@
 # These will be used when generating kubernetes entities
-project-name: changeme
+project-name: $PROJECT_NAME
 
 # Supported: hetzner, digitalocean, or gcloud
 infra: hetzner
@@ -7,9 +7,9 @@ infra: hetzner
 # Only relevant for Digital Ocean. Determines the number of versions to keep for each docker image.
 image-versions-to-keep: 5
 
-registry-base-url: registry.staging.com
+registry-base-url: $REGISTRY_BASE_URL
 # What comes before <image-name>:<tag>. Can be empty.
-registry-image-path-prefix: changeme
+registry-image-path-prefix: $PROJECT_NAME
 
 # production and staging are supported by default
 extra-remote-environments: []

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/infra/hetzner/abandoned/harbor-values.yaml

@@ -3,7 +3,7 @@ expose:
   type: ingress
   ingress:
     hosts:
-      core: $REGISTRY_DOMAIN
+      core: $REGISTRY_BASE_URL
     className: "nginx"
     annotations:
       nginx.ingress.kubernetes.io/ssl-redirect: "false"
@@ -12,7 +12,7 @@ expose:
       ingress.kubernetes.io/proxy-body-size: "0"
   tls:
     enabled: false
-externalURL: https://$REGISTRY_DOMAIN
+externalURL: https://$REGISTRY_BASE_URL
 persistence:
   enabled: true
   persistentVolumeClaim:

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/infra/hetzner/abandoned/hcloud-config.yaml

@@ -1,5 +1,5 @@
 ---
-cluster_name: changeme
+cluster_name: $PROJECT_NAME
 kubeconfig_path: "./kubeconfig"
 k3s_version: v1.32.2+k3s1
 

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/infra/hetzner/harbor-cert.yaml

@@ -8,6 +8,6 @@ spec:
   issuerRef:
     name: letsencrypt-dns01
     kind: ClusterIssuer
-  commonName: $REGISTRY_DOMAIN
+  commonName: $REGISTRY_BASE_URL
   dnsNames:
-  - $REGISTRY_DOMAIN
+  - $REGISTRY_BASE_URL

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/infra/hetzner/harbor-values.yaml

@@ -2,12 +2,12 @@ expose:
   type: ingress
   ingress:
     hosts:
-      core: $REGISTRY_DOMAIN
+      core: $REGISTRY_BASE_URL
   tls:
     certSource: secret
     secret:
       secretName: tls-secret
-externalURL: https://$REGISTRY_DOMAIN
+externalURL: https://$REGISTRY_BASE_URL
 persistence:
   enabled: true
   persistentVolumeClaim:

package/src/target-templates/{.devops → infra-variants/hetzner/.devops}/infra/hetzner/hcloud-config.yaml

@@ -1,5 +1,5 @@
 ---
-cluster_name: changeme
+cluster_name: $PROJECT_NAME
 kubeconfig_path: "./config/kubeconfig"
 k3s_version: v1.32.2+k3s1
 

package/src/target-templates/infra-variants/hetzner/.github/workflows/k8s-build.yaml

@@ -0,0 +1,75 @@
+name: "Monorepo Build and Deploy"
+
+on:
+  push:
+    branches:
+      - staging
+      - production
+
+permissions:
+  contents: read
+  packages: read
+
+jobs:
+  build_images:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - image_name: main-node
+          - image_name: main-python
+            cache_path: /root/.cache/uv
+    steps:
+      # Fetch the last 50 commits so that devops affected works
+      - name: Checkout repo and history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+
+      - name: Setup prerequesites
+        uses: ./.github/actions/setup-prereq@v1
+
+      - name: Connect to infrastructure
+        uses: ./.github/actions/connect-to-infra@v1
+        with:
+          hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
+          harbor_user: ${{ secrets.HARBOR_USER }}
+          harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+
+      - name: Build image
+        uses: ./.github/actions/build-image@v1
+        with:
+          image_name: ${{ matrix.image_name }}
+          cache_path: ${{ matrix.cache_path || '/root/.bun/install/cache' }}
+
+  db_migrate_and_deploy:
+    needs: [build_images]
+    runs-on: ubuntu-latest
+    steps:
+      # Fetch the last 50 commits so that devops affected works
+      - name: Checkout repo and history
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 50
+
+      - name: Setup prerequesites
+        uses: ./.github/actions/setup-prereq@v1
+
+      - name: Connect to infrastructure
+        uses: ./.github/actions/connect-to-infra@v1
+        with:
+          hetzner_kubeconfig: ${{ secrets.HCLOUD_KUBECONFIG }}
+          harbor_user: ${{ secrets.HARBOR_USER }}
+          harbor_password: ${{ secrets.HARBOR_PASSWORD }}
+
+      - name: Run DB Migrate
+        uses: ./.github/actions/db-migrate@v1
+
+      # Repeat per image (it checks if the image is affected and deploys it if it is)
+      - name: Deploy main node
+        uses: ./.github/actions/deploy-image@v1
+        with: { "image_name": "main-node" }
+
+      - name: Deploy main python
+        uses: ./.github/actions/deploy-image@v1
+        with: { "image_name": "main-python" }

package/src/target-templates/lang-variants-common/README.md

@@ -0,0 +1,4 @@
+All files under `typescript` are copied under the root project folder.
+
+During `./devops init`, the user is asked whether python-related files should be added to the repository.
+If the user answers positively, the files under the `python` folder are also copied, overriding files with the same path.

package/src/target-templates/{.devops → lang-variants-common/python/.devops}/config/images.yaml

@@ -68,8 +68,8 @@ images:
     debug-template: debug-console
     can-db-migrate: true
     domains:
-      production: production.com
-      staging: staging.com
+      production: $PRODUCTION_DOMAIN
+      staging: $STAGING_DOMAIN
     applications:
     - example-node
     - jobs
@@ -80,8 +80,8 @@ images:
     debug-template: debug-console
     can-db-migrate: false
     domains:
-      production: production.com
-      staging: staging.com
+      production: $PRODUCTION_DOMAIN
+      staging: $STAGING_DOMAIN
     applications:
     - example-python
     - example-data-pipeline

package/src/target-templates/{pyproject.toml → lang-variants-common/python/pyproject.toml}

@@ -1,5 +1,5 @@
 [project]
-name = "changeme"
+name = "$PROJECT_NAME"
 version = "0.1.0"
 description = ""
 authors = []

package/src/target-templates/lang-variants-common/typescript/.devops/config/images.yaml

@@ -0,0 +1,69 @@
+# The file structure is as follows:
+#
+# Under `templates` key:
+#   <template-key>:
+#     copy-common: <boolean>
+#     extra-content:
+#       - <file-name>
+#       - <file-name>
+#
+# Where:
+# <template-key>       The identifier of the template. 
+#                      This is used to refer to the template in the images section.
+# copy-common          Whether to copy the common Docker files from .devops/docker-images/common to the image.
+# extra-content        Any files to include in the image that are not part of the build context. By default, all applications and their dependencies are copied, as well as the 
+#                      content of .devops/docker-images/<image-name>. If you need to include additional files, list them here. These are typically from the root of the project.
+#                      Files and full folders are supported. Globs (wildcards) are currently not supported.
+#
+#
+# Under `images` key:
+#   <image-key>:
+#     image-template: <image-template>
+#     language: <language>
+#     debug-template: <debug-template>
+#     can-db-migrate: <boolean>
+#     domains:
+#       production: <production-domain>
+#       staging: <staging-domain>
+#     image-extra-content:
+#       - <file-name>
+#       - <file-name>
+#     applications:
+#     - <application-name>
+#     - <application-name>
+#
+# Where:
+# <image-name>          The identifier of the image. Github action should refer to this name in a hard-coded manner when invoking devops scripts.
+#                       This is also the basis for the name of the image in the registry.
+# image-template        The build process copies .devops/docker-images/<image-template>.Dockerfile and .devops/docker-images/<image-template>/ to the image. 
+# language              The language of the image. Currently only "node" and "python" are supported.
+# debug-template        Each image comes with a debug pod that can be acccessed as a console. This is the name of the template to use. Only "debug-console" is currently supported.
+# can-db-migrate        Whether this image can be used to run DB migrations. If set to true, the image could be used to run DB migrations if any project that uses this image depends 
+#                       on the db project and if the db project changed.
+# domains               The domains for the image. This is used to generate the ingress rules. 
+#                       This can be left out if the image does not have ingress rules, such as a worker image.
+# applications          List of applications that use this image. There is no need to specify dependencies - they will be derived as long as they are declared in package.json.
+#
+
+templates: 
+  node-services:
+    copy-common: true
+    extra-content:
+      - devops
+      - package.json
+      - bun.lock
+      - tsconfig.json
+
+images:
+  main-node:
+    image-template: node-services
+    language: node
+    debug-template: debug-console
+    can-db-migrate: true
+    domains:
+      production: $PRODUCTION_DOMAIN
+      staging: $STAGING_DOMAIN
+    applications:
+    - example-node
+    - jobs
+

package/src/target-templates/lang-variants-common/typescript/.devops/manifests/_index.yaml

@@ -0,0 +1,19 @@
+# db-migrate is a required entry that is hard-coded in the devops-cli
+# The debug template used per image is dynamic and can be configured in images.yaml
+# The deployment template used per application is dynamic and can be configured in its package.json
+
+db-migrate: 
+  - db-migrate-job.yaml.hb
+debug-console:
+  - deployment-debug.yaml.hb
+cron-jobs:
+  - cron-jobs.yaml.hb
+backend-process:
+  - deployment-process.yaml.hb
+internal-service:
+  - deployment-web.yaml.hb
+  - service.yaml.hb
+external-service:
+  - deployment-web.yaml.hb
+  - service.yaml.hb
+  - ingress.yaml.hb

package/src/target-templates/lang-variants-common/typescript/.envrc

@@ -0,0 +1,5 @@
+if [ -f "$PWD/config/kubeconfig" ]; then
+  export KUBECONFIG="$PWD/config/kubeconfig"
+else
+  export KUBECONFIG="${HOME}/.kube/config"
+fi

package/src/target-templates/{.github → lang-variants-common/typescript/.github}/actions/connect-to-infra@v1/action.yaml

@@ -25,7 +25,7 @@ inputs:
   gcloud_cluster_name:
     description: "Google Cloud GKE cluster name"
     required: false
-  service_account_key:
+  gcloud_service_account_key:
     description: "Google Cloud service account key in JSON format"
     required: false
 outputs:
@@ -64,4 +64,4 @@ runs:
         project_id: ${{ inputs.gcloud_project_id }}
         zone: ${{ inputs.gcloud_zone }}
         cluster_name: ${{ inputs.gcloud_cluster_name }}
-        service_account_key: ${{ inputs.service_account_key }}
+        service_account_key: ${{ inputs.gcloud_service_account_key }}

package/src/target-templates/lang-variants-prisma/README.md

@@ -0,0 +1,3 @@
+During `./devops init`, the user is asked whether prisma should be used.
+If it is, the files under `typescript` are copied under the root project folder. 
+The files under `python` are copied if the user requested python support.

package/src/target-templates/config/.env.development

@@ -1 +0,0 @@
-# Add here env variables that are for local development environment

package/src/target-templates/config/.env.global

@@ -1,4 +0,0 @@
-# Add here env variables that are global to all environments
-
-# This should remain locally on your machine. There is no need to set this in the remote environment.
-MONOREPO_BASE_SECRET=123456789abcdef

package/src/target-templates/config/.env.test

@@ -1 +0,0 @@
-# Add here env variables that are for local test environment

package/src/target-templates/libs/example-node-lib/bun.lock

@@ -1,27 +0,0 @@
-{
-  "lockfileVersion": 1,
-  "workspaces": {
-    "": {
-      "name": "example-node-lib",
-      "devDependencies": {
-        "@types/bun": "latest",
-      },
-      "peerDependencies": {
-        "typescript": "^5",
-      },
-    },
-  },
-  "packages": {
-    "@types/bun": ["@types/bun@1.2.5", "", { "dependencies": { "bun-types": "1.2.5" } }, "sha512-w2OZTzrZTVtbnJew1pdFmgV99H0/L+Pvw+z1P67HaR18MHOzYnTYOi6qzErhK8HyT+DB782ADVPPE92Xu2/Opg=="],
-
-    "@types/node": ["@types/node@22.13.11", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-iEUCUJoU0i3VnrCmgoWCXttklWcvoCIx4jzcP22fioIVSdTmjgoEvmAO/QPw6TcS9k5FrNgn4w7q5lGOd1CT5g=="],
-
-    "@types/ws": ["@types/ws@8.5.14", "", { "dependencies": { "@types/node": "*" } }, "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw=="],
-
-    "bun-types": ["bun-types@1.2.5", "", { "dependencies": { "@types/node": "*", "@types/ws": "~8.5.10" } }, "sha512-3oO6LVGGRRKI4kHINx5PIdIgnLRb7l/SprhzqXapmoYkFl5m4j6EvALvbDVuuBFaamB46Ap6HCUxIXNLCGy+tg=="],
-
-    "typescript": ["typescript@5.8.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-aJn6wq13/afZp/jT9QZmwEjDqqvSGp1VT5GVg+f/t6/oVyrgXM6BY1h9BRh/O5p3PlUPAe+WuiEZOmb/49RqoQ=="],
-
-    "undici-types": ["undici-types@6.20.0", "", {}, "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="],
-  }
-}