Merge branch 'move-charts' into adamancini/release-create

Author: adamancini

.gitignore

@@ -2,10 +2,6 @@
 **/charts/*.tgz
 **/.specstory/
 
-
-# Ignore Helm dependency directories
-**/charts/*.lock
-
 # General files to ignore
 *.log
 *.gz
@@ -53,8 +49,6 @@ applications/mlflow/tests/.venv/
 # wg-easy specific
 *.kubeconfig
 applications/wg-easy/release/
-applications/wg-easy/*/charts/
-applications/wg-easy/*/Chart.lock
 .aider*
 # SpecStory explanation file
 .specstory/.what-is-this.md

applications/wg-easy/README.md

@@ -55,14 +55,15 @@ Use tools to automate repetitive tasks, reducing human error and increasing deve
 
 ```
 applications/wg-easy/
-├── charts/templates/           # Common templates shared across charts
-├── cert-manager/               # Wrapped cert-manager chart
-├── cert-manager-issuers/       # Chart for cert-manager issuers
+├── charts
+│   ├── cert-manager            # Wrapped cert-manager chart
+│   ├── cert-manager-issuers    # Chart for cert-manager issuers
+│   ├── replicated-sdk          # Replicated SDK chart
+│   ├── templates               # Common templates shared across charts
+│   ├── traefik                 # Wrapped Traefik chart
+│   └── wg-easy                 # Main application chart
 ├── replicated/                 # Root Replicated configuration
-├── replicated-sdk/             # Replicated SDK chart
 ├── taskfiles/                  # Task utility functions
-├── traefik/                    # Wrapped Traefik chart
-├── wg-easy/                    # Main application chart
 ├── helmfile.yaml               # Defines chart installation order
 └── Taskfile.yaml               # Main task definitions
 ```

applications/wg-easy/Taskfile.yaml

@@ -137,7 +137,7 @@ tasks:
       - echo "Updating Helm dependencies for all charts..."
       - |
         # Find all charts and update their dependencies
-        for chart_dir in $(find . -maxdepth 2 -name "Chart.yaml" | xargs dirname); do
+        for chart_dir in $(find charts/ -maxdepth 2 -name "Chart.yaml" | xargs dirname); do
           echo "Updating dependency $chart_dir"
           helm dependency update --skip-refresh "$chart_dir"
         done
@@ -276,10 +276,10 @@ tasks:
       - echo "Packaging Helm charts..."
       - |
         # Find top-level directories containing Chart.yaml files
-        for chart_dir in $(find . -maxdepth 2 -name "Chart.yaml" | xargs dirname); do
+        for chart_dir in $(find charts/ -maxdepth 2 -name "Chart.yaml" | xargs dirname); do
           echo "Packaging chart: $chart_dir"
           # Navigate to chart directory, package it, and move the resulting .tgz to release folder
-          (cd "$chart_dir" && helm package . && mv *.tgz ../release/)
+          (cd "$chart_dir" && helm package . && mv *.tgz ../../release/)
         done
 
       - echo "Release files prepared in ./release/ directory"
@@ -458,37 +458,21 @@ tasks:
           echo "Removing release directory..."
           rm -rf ./release
         fi
-        
-        # Find and remove tmpcharts-* directories
+
+        # Find and remove tmpcharts-* directories in charts/
         echo "Removing temporary chart directories..."
+        find charts/ -type d -name "tmpcharts-*" -print
+        find charts/ -type d -name "tmpcharts-*" -exec rm -rf {} \; 2>/dev/null || true
+
+        # Clean up chart dependencies (.tgz files) in charts/*/charts/
+        echo "Removing chart dependencies..."
+        find charts/ -path "*/charts/*.tgz" -type f -print
+        find charts/ -path "*/charts/*.tgz" -type f -delete
+
+        # Clean up any tmpcharts directories in subdirectories
+        echo "Cleaning up any remaining tmpcharts directories..."
         find . -type d -name "tmpcharts-*" -print
         find . -type d -name "tmpcharts-*" -exec rm -rf {} \; 2>/dev/null || true
-        
-        # Find charts directories that only contain .tgz files (dependencies)
-        echo "Removing chart dependency directories..."
-        for charts_dir in $(find . -type d -name "charts"); do
-          # Skip if the charts directory is in ./charts/ (which is our template charts directory)
-          if [[ "$charts_dir" == "./charts" || "$charts_dir" == "./charts/"* ]]; then
-            continue
-          fi
-          
-          # Check if the directory only contains .tgz files
-          NON_TGZ_FILES=$(find "$charts_dir" -type f -not -name "*.tgz" | wc -l | tr -d ' ')
-          TOTAL_FILES=$(find "$charts_dir" -type f | wc -l | tr -d ' ')
-          
-          if [ "$TOTAL_FILES" -gt 0 ] && [ "$NON_TGZ_FILES" -eq 0 ]; then
-            # Check if the directory contains any subdirectories
-            SUBDIRS=$(find "$charts_dir" -mindepth 1 -type d | wc -l | tr -d ' ')
-            
-            if [ "$SUBDIRS" -eq 0 ]; then
-              echo "Removing entire chart dependency directory: $charts_dir"
-              rm -rf "$charts_dir"
-            else
-              echo "Removing chart dependencies in $charts_dir (keeping subdirectories)"
-              rm -f "$charts_dir"/*.tgz
-            fi
-          fi
-        done
       - echo "Cleaning complete!"
 
   full-test-cycle:

applications/wg-easy/cert-manager-issuers/Chart.yaml renamed to applications/wg-easy/charts/cert-manager-issuers/Chart.yaml

@@ -0,0 +1,9 @@
+dependencies:
+- name: cert-manager
+  repository: https://charts.jetstack.io
+  version: v1.14.5
+- name: templates
+  repository: file://../templates
+  version: 1.0.0
+digest: sha256:ab86a335f7f473446968c607ed7920bf4ce29f625e5ff6175be17bb2e1101a32
+generated: "2025-05-06T15:35:47.871225-04:00"

applications/wg-easy/cert-manager-issuers/replicated/helmChart-cert-manager-issuers.yaml renamed to applications/wg-easy/charts/cert-manager-issuers/replicated/helmChart-cert-manager-issuers.yaml

@@ -7,4 +7,4 @@ dependencies:
     repository: https://charts.jetstack.io
   - name: templates
     version: '*'
-    repository: file://../charts/templates
+    repository: file://../templates

applications/wg-easy/cert-manager-issuers/templates/issuers.yaml renamed to applications/wg-easy/charts/cert-manager-issuers/templates/issuers.yaml

@@ -0,0 +1,9 @@
+dependencies:
+- name: templates
+  repository: file://../templates
+  version: 1.0.0
+- name: replicated
+  repository: oci://registry.replicated.com/library
+  version: 1.1.1
+digest: sha256:bb2c4743fae54061dfde5812086300bf9ed7c86f9f4d80ccb0858df407d21a2a
+generated: "2025-05-06T15:35:43.881588-04:00"

applications/wg-easy/cert-manager-issuers/values.yaml renamed to applications/wg-easy/charts/cert-manager-issuers/values.yaml

@@ -4,7 +4,7 @@ apiVersion: v2
 dependencies:
   - name: templates
     version: '*'
-    repository: file://../charts/templates
+    repository: file://../templates
   - name: replicated
     repository: oci://registry.replicated.com/library
     version: 1.1.1

applications/wg-easy/charts/cert-manager/Chart.lock

@@ -0,0 +1,9 @@
+dependencies:
+- name: traefik
+  repository: https://traefik.github.io/charts
+  version: 28.0.0
+- name: templates
+  repository: file://../templates
+  version: 1.0.0
+digest: sha256:14c6de6f10918ec6bbe2d6e99408da62b362fc7950ce8793ebaaa4693ffdeb75
+generated: "2025-05-06T15:35:53.545992-04:00"

applications/wg-easy/cert-manager/Chart.yaml renamed to applications/wg-easy/charts/cert-manager/Chart.yaml

@@ -8,4 +8,4 @@ dependencies:
     repository: https://traefik.github.io/charts
   - name: templates
     version: '*'
-    repository: file://../charts/templates
+    repository: file://../templates

applications/wg-easy/cert-manager/replicated/helmChart-cert-manager.yaml renamed to applications/wg-easy/charts/cert-manager/replicated/helmChart-cert-manager.yaml

@@ -0,0 +1,6 @@
+dependencies:
+- name: templates
+  repository: file://../templates
+  version: 1.0.0
+digest: sha256:9939fc386e44c7a8d0a274f270ec92ac70ac9858442b4f85638122044082da74
+generated: "2025-05-06T15:20:40.596254-04:00"

applications/wg-easy/cert-manager/templates/issuers.yaml renamed to applications/wg-easy/charts/cert-manager/templates/issuers.yaml

@@ -0,0 +1,7 @@
+name: wg-easy
+version: 1.0.0
+apiVersion: v2
+dependencies:
+  - name: templates
+    version: '*'
+    repository: file://../templates

applications/wg-easy/cert-manager/values.yaml renamed to applications/wg-easy/charts/cert-manager/values.yaml

@@ -0,0 +1,25 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
+manifests/
+doc/

applications/wg-easy/charts/replicated-sdk/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: replicated-library
+  repository: https://replicatedhq.github.io/helm-charts
+  version: 0.13.10
+digest: sha256:cb41956b9ecae9581fa42eeb58487c8251a6e6d4ead534c28b577931e566e37e
+generated: "2023-12-27T16:31:00.156396361-06:00"

applications/wg-easy/replicated-sdk/Chart.yaml renamed to applications/wg-easy/charts/replicated-sdk/Chart.yaml

@@ -0,0 +1,13 @@
+apiVersion: v2
+dependencies:
+- name: replicated-library
+  repository: https://replicatedhq.github.io/helm-charts
+  version: ^0.13.2
+description: Simple wireguard with web configuration management
+home: https://github.com/chris-sanders/helm-charts/charts/wg-easy
+maintainers:
+- email: sanders.chris@gmail.com
+  name: Chris Sanders
+  url: https://github.com/chris-sanders/helm-charts
+name: wg-easy
+version: 1.0.0

applications/wg-easy/replicated-sdk/replicated/helmChart-replicated-sdk.yaml renamed to applications/wg-easy/charts/replicated-sdk/replicated/helmChart-replicated-sdk.yaml

@@ -0,0 +1,17 @@
+# wg-easy
+
+## Helm chart
+
+This is a helm chart for deploying [wg-easy](https://github.com/wg-easy/wg-easy) which describes itself as "You have found the easiest way to install & manage WireGuard on any Linux host!". This chart is not affiliated with the upstream project and bugs for this chart should not be filed against the upstream project.
+
+## Installing the Chart
+
+This chart exposes all of the wg-easy environment variables for configuration under the key `wireguard`. You can see the value available in the values.yaml file with this chart. Detailed instructions have not been written although the upstream project documents each of the environment variables.
+
+## Releasing the chart
+
+To release a new version of this chart simply set the version number in `Chart.yaml` as part of a pull request and once merged the new version will be released. Note that since this chart uses a `chart.lock` file the version in the lock file should match the version of the dependency listed in `Chart.yaml`, which should also be the version you tested your development changes against. Anytime you adjust the dependency version in `Chart.yaml` you should use `helm dependencies update` to fetch the new version and update the lock file to match. If your lock file and dependency version in the `Chart.yaml` file do not match you should update your dependencies and re-test to ensure your changes work with the version in the lock file.
+
+## Contributing
+
+This chart is functional and in use but lacks practices like more user friendly install instructions, explanation of how to configure values like `loadBalancerIP` on the vpn service, and a changelog to document changes in the versions. Contributions to add any of these items, to operate in a similar fashion to what's available in the library-chart that is used as a dependency would be greatly appreciated.