switch to zot

service/helmfile.yaml

@@ -1,6 +1,6 @@
 repositories:
   - name: zot
-    url: git.badhouseplants.net/softplayer/helm
+    url: registry.badhouseplants.net/softplayer/helm
     oci: true
 
 releases:
@@ -81,8 +81,8 @@ releases:
       - ./values/cert-mangager.yaml
 
   - name: metallb
-    chart: metallb/metallb
-    version: 0.14.3
+    chart: zot/metallb
+    version: 0.14.5
     namespace: metallb-system
     createNamespace: false
     needs:
@@ -134,8 +134,45 @@ releases:
     values:
       - ./values/values.istiod.yaml
 
+  - name: keel
+    chart: zot/keel
+    version: 1.0.3
+    namespace: kube-system
+
+  - name: network-base
+    namespace: istio-system
+    createNamespace: false
+    chart: ../charts/network-base/
+    values:
+      - ./values/network-base.yaml
+    secrets:
+      - ./secrets/network-base.yaml
+    needs:
+      - istio-system/istio-ingressgateway
+      - cert-manager/cert-manager
+  
+  - name: ippool
+    namespace: metallb-system
+    createNamespace: false
+    chart: ../charts/ippool
+    values:
+      {{ $ip4 := trim (exec "bash" (list "-c" "cat /tmp/outputs/provider_outputs.yaml | yq '.user_entrypoint'")) }}
+      - ipPool: "{{- printf "%s-%s" $ip4 $ip4 -}}"
+    needs:
+      - istio-system/istio-ingressgateway
+      - metallb-system/metallb
+      - cert-manager/cert-manager
+      - softplayer-backend/softplayer-backend
+      - softplayer-backend/softplayer-web
+
   - name: softplayer-backend
     chart: ../charts/softplayer-backend
     namespace: softplayer-backend
     needs:
       - istio-system/istio-ingressgateway
+
+  - name: softplayer-web
+    chart: ../charts/softplayer-web
+    namespace: softplayer-backend
+    needs:
+      - istio-system/istio-ingressgateway

service/secrets/network-base.yaml

@@ -0,0 +1,22 @@
+certificate:
+    cloudflareToken: ENC[AES256_GCM,data:82Y0qs40zEv9UY/Zp1BjSl/90UQCG6sUd6a6MIZW12NY9Os0k48W3w==,iv:THZC/Xf2JhQP2UUMTj2vZVfMe4oCmlQWaVsPssBSgnk=,tag:Ek29sys6S1DcihPwc0fXHA==,type:str]
+sops:
+    kms: []
+    gcp_kms: []
+    azure_kv: []
+    hc_vault: []
+    age:
+        - recipient: age1mrdee45qq36trja45u0wcem7c2mgydw35zkuhh97khgc7veanaaq29wzh4
+          enc: |
+            -----BEGIN AGE ENCRYPTED FILE-----
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0SVVDcFlFZ3l2cExqTHVJ
+            T0JLeHNubENpdmpmRkFBRjdLVWFWUzMvR0ZrCkVrV01acUJvcUtQSkhYcHpadlRH
+            UGFWZzliaXZ0dWt4RTl6V3NSYi85U2cKLS0tIGxxYWFNOGRrOExwdHArak1HaXNn
+            ZlU2WUwvRUNKWVVJVTRNaVA5d2EyMXcKfEPSd6MPfVHjYUgT5fMbiHfwvGXd9o+f
+            xW8rQMXUQ8d5Dojjw3GHgajE52kN4WuAMEVlPAC4tn7FbXD5Rz80gw==
+            -----END AGE ENCRYPTED FILE-----
+    lastmodified: "2024-05-05T10:02:48Z"
+    mac: ENC[AES256_GCM,data:C30vhqgW+aTTQxv8OuU1fGf8aUB5HsJaQEK7aaE/SVndFWBxgww+eKubdRqJ/jojClZxwH1lOlRTZe+v+8qnHGF9mMM6cqf2fsNuo8CuKKfrVDYuEd/eGszCYVOGv1Bo6zv6ZInzXhfUQBoPkpAuraJpuMG81RZOSnRQZ0qK25s=,iv:p8gPjjWSeHXcjzHNjJVpbo0GQ7jNbb2lxiEqkLn2ZwM=,tag:Bqxfd7Te3yEbGtAUxOMhYA==,type:str]
+    pgp: []
+    unencrypted_suffix: _unencrypted
+    version: 3.8.1

service/values/network-base.yaml

@@ -0,0 +1,4 @@
+certificate:
+  email: allanger@badhouseplants.net
+domain: dev.badhouseplants.net
+ipPool: 0.0.0.0-1.1.1.1