adapt to main branch

Author: maltesander

demos/argo-cd-git-ops/manifests/airflow/airflow.yaml

@@ -20,10 +20,10 @@ spec:
     # In terms of forking the repository, this should not be a problem since the DAGs are the same.
     # You can still change this locally and point to the fork in case of any changes to DAGs.
     #
-    # TODO(@maltesander): Adapt branch to main / 25.7.0
+    # TODO(@maltesander): In a Stackable release, this branch should point to the release-YY.MM branch!
     dagsGitSync:
       - repo: https://github.com/stackabletech/demos/
-        branch: spike/argocd-demo
+        branch: main
         gitFolder: "demos/argo-cd-git-ops/dags"
         depth: 2
     volumes:

demos/demos-v2.yaml

@@ -7,38 +7,38 @@ demos:
       - argocd
       - git ops
       - airflow
-      - job-scheduling
+      - job scheduling
       - git sync
       - kubernetes executor
       - sealed secrets
     manifests:
       ################################
       # projects
       ################################
-      - plainYaml: demos/argo-cd-git-ops/projects/airflow.yaml
-      - plainYaml: demos/argo-cd-git-ops/projects/minio.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/projects/airflow.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/projects/minio.yaml
       ################################
       # prerequisites
       ################################
-      - plainYaml: demos/argo-cd-git-ops/applications/airflow-postgres.yaml
-      - plainYaml: demos/argo-cd-git-ops/applications/minio.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/airflow-postgres.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/minio.yaml
       ################################
       # products
       ################################
-      - plainYaml: demos/argo-cd-git-ops/applications/airflow.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/demos/argo-cd-git-ops/applications/airflow.yaml
     supportedNamespaces:
       - argo-cd
     resourceRequests:
-      cpu: 2401m
-      memory: 9010Mi
-      pvc: 24Gi
+      cpu: 15000m
+      memory: 15Gi
+      pvc: 15Gi
     parameters:
       - name: customGitUrl
         description: The URL to the Git repository (this can be adapted in case of forking the repository) to demonstrate syncing via Argo and Git.
         default: https://github.com/stackabletech/demos/
       - name: customGitBranch
         description: The Branch in the Git repository (this can be adapted in case of forking the repository) to demonstrate syncing via Argo and Git.
-        default: spike/argocd-demo
+        default: main
   airflow-scheduled-job:
     description: Activate a simple Airflow DAG to run continuously at a set interval
     stackableStack: airflow

stacks/argo-cd-git-ops/applications/sealed-secrets.yaml

@@ -14,12 +14,12 @@ spec:
         releaseName: sealed-secrets-controller
         valuesObject:
           secretName: sealed-secrets-key
-    # TODO: This should be parameterized with customGitUrl and customGitBranch parameters.
+    # TODO(@maltesander): This should be parameterized with customGitUrl and customGitBranch parameters.
     # Currently these parameters are defined in the demo-v2.yaml and are
     # not picked up in the stack - What to do?
-    # TODO: adapt to main / 25.7
+    # TODO(@maltesander): Must be adapted in case of release!
     - repoURL: https://github.com/stackabletech/demos/
-      targetRevision: spike/argocd-demo
+      targetRevision: main
       path: stacks/argo-cd-git-ops/secrets/
   destination:
     server: https://kubernetes.default.svc

stacks/stacks-v2.yaml

@@ -13,28 +13,29 @@ stacks:
       ################################
       # bootstrap argo
       ################################
-      - helmChart: stacks/_templates/argo-cd.yaml
+      - helmChart: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/_templates/argo-cd.yaml
       ################################
       # prerequisites
       ################################
-      - plainYaml: stacks/argo-cd-git-ops/applications/sealed-secrets.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/argo-cd-git-ops/applications/sealed-secrets.yaml
       ################################
       # project - operators
       ################################
-      - plainYaml: stacks/argo-cd-git-ops/projects/stackable-operators.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/argo-cd-git-ops/projects/stackable-operators.yaml
       ################################
       # applicationset - operators
       ################################
-      - plainYaml: stacks/argo-cd-git-ops/applicationsets/stackable-operators.yaml
+      - plainYaml: https://raw.githubusercontent.com/stackabletech/demos/main/stacks/argo-cd-git-ops/applicationsets/stackable-operators.yaml
     supportedNamespaces:
       - argo-cd
     resourceRequests:
-      memory: 10000Mi
-      cpu: 8000m
-      pvc: 20Gi
+      memory: 5000Mi
+      cpu: 5000m
+      pvc: 5Gi
     parameters:
       - name: stackableReleaseVersion
         description: The Stackable release to be installed via Argo. This replaces the demo `stackableRelease` parameter.
+        # TODO(@maltesander): Must be adapted in case of release !
         default: 0.0.0-dev
       - name: argocdAdminPassword
         description: Password of the ArgoCD admin user.