Update versions of Argo CD, Appset Secrets Plugin, and cert-manager (#86

)

* updating argo_cd_appset_secrets_plugin to use the new small-hack repo just called appset_secrets_plugin

* bump cert manager version while we're at this

* bump argo cd version to latest patch

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name          = "smol_k8s_lab"
-version       = "1.0.0"
+version       = "1.0.1"
 description   = "bootstrap simple projects on kubernetes with kind and k3s"
 authors       = ["Jesse Hitch <[email protected]>",
                  "Max Roby <[email protected]>"]
@@ -34,8 +34,8 @@ kubernetes    = "^27.2"
 requests      = "^2.28"
 pyyaml        = "^6.0"
 xdg-base-dirs = "^6.0"
-pyjwt = "^2.8.0"
-cryptography = "^41.0.3"
+pyjwt         = "^2.8.0"
+cryptography  = "^41.0.3"
 
 [tool.poetry.plugins."smol-k8s-lab.application.plugin"]
 "smol-k8s-lab" = "smol_k8s_lab:main"

smol_k8s_lab/__init__.py

@@ -154,15 +154,15 @@ def main(config: str = "",
                         apps['cilium'],
                         apps['cert_manager'],
                         argo_enabled,
-                        apps['argo_cd_appset_secret_plugin']['enabled'])
+                        apps['appset_secret_plugin']['enabled'])
 
         # 🦑 Install Argo CD: continuous deployment app for k8s
         if argo_enabled:
             # user can configure a special domain for argocd
             argocd_fqdn = SECRETS['argo_cd_hostname']
             from .k8s_apps.argocd import configure_argocd
             configure_argocd(k8s_obj, argocd_fqdn, bw,
-                             apps['argo_cd_appset_secret_plugin']['enabled'],
+                             apps['appset_secret_plugin']['enabled'],
                              SECRETS)
 
             setup_k8s_secrets_management(k8s_obj,

smol_k8s_lab/config/default_config.yaml

@@ -201,9 +201,9 @@ apps:
       # source repos for Argo CD argo-cd Project (in addition to argo_cd.argo.repo)
       project_source_repos:
         - https://argoproj.github.io/argo-helm
-        - https://jessebot.github.io/argocd-appset-secret-plugin
+        - https://small-hack.github.io/appset-secret-plugin
 
-  argo_cd_appset_secret_plugin:
+  appset_secret_plugin:
     # Required if you want to use the default small-hack/argocd-apps argo.repo and
     # default enabled if ArgoCD is enabled, so we can create a k8s Secret with
     # your more private info such as hostnames, IP addresses, and emails in a
@@ -222,13 +222,13 @@ apps:
       # git repo to install the Argo CD app from
       repo: "https://github.com/small-hack/argocd-apps"
       # path in the argo repo to point to. Trailing slash very important!
-      path: "argocd/argocd_appset/"
+      path: "argocd/"
       # either the branch or tag to point at in the argo repo above
       ref: "main"
       # namespace to install the k8s app in
       namespace: "argocd"
       project_source_repos:
-        - https://jessebot.github.io/argocd-appset-secret-plugin
+        - https://small-hack.github.io/appset-secret-plugin
 
   external_secrets_operator:
     # enable the external secrets operator to pull remote secrets

smol_k8s_lab/k8s_apps/argocd.py

@@ -85,7 +85,7 @@ def configure_argocd(k8s_obj: K8s,
 
         release_dict['values_file'] = values_file_name
         release_dict['chart_name'] = 'argo-cd/argo-cd'
-        release_dict['chart_version'] = '5.46.0'
+        release_dict['chart_version'] = '5.46.5'
 
         release = Helm.chart(**release_dict)
         release.install(True)
@@ -121,10 +121,10 @@ def configure_secret_plugin_generator(k8s_obj: K8s, secret_dict: dict):
                 'token.existingSecret': 'appset-secret-token'}
 
     # install the helm chart :)
-    chart_name = 'appset-secret-plugin/argocd-appset-secret-plugin'
-    release = Helm.chart(release_name='argocd-appset-secret-plugin',
+    chart_name = 'appset-secret-plugin/appset-secret-plugin'
+    release = Helm.chart(release_name='appset-secret-plugin',
                          chart_name=chart_name,
-                         chart_version='0.4.0',
+                         chart_version='0.5.0',
                          namespace='argocd',
                          set_options=set_opts)
     release.install(True)

smol_k8s_lab/k8s_apps/ingress/cert_manager.py

@@ -20,7 +20,7 @@ def configure_cert_manager(k8s_obj: K8s, email_addr: str = "") -> True:
     # install chart and wait
     release = Helm.chart(release_name='cert-manager',
                          chart_name='jetstack/cert-manager',
-                         chart_version="1.12.4",
+                         chart_version="1.13.0",
                          namespace='ingress',
                          set_options={'installCRDs': 'true'})
     release.install(True)

smol_k8s_lab/k8s_tools/helm.py

@@ -154,8 +154,8 @@ def add_default_repos(k8s_distro: str,
         repos['argo-cd'] = 'https://argoproj.github.io/argo-helm'
 
     if argo_secrets:
-        repos['appset-secret-plugin'] = ('https://jessebot.github.io/'
-                                         'argocd-appset-secret-plugin')
+        repos['appset-secret-plugin'] = ('https://small-hack.github.io/'
+                                         'appset-secret-plugin')
 
     # kind has a special install path
     if k8s_distro == 'kind':