Merge branch 'main' into renovate/main-external-dns-1.x

onedr0p · Apr 5, 2024 · c7fc3f2 · c7fc3f2
2 parents 467790b + 88e9bb3
commit c7fc3f2
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 104 deletions.
diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/dnsendpoint-crd.yaml b/kubernetes/main/apps/network/external-dns/cloudflare/dnsendpoint-crd.yaml
diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/helmrelease.yaml b/kubernetes/main/apps/network/external-dns/cloudflare/helmrelease.yaml
@@ -15,10 +15,12 @@ spec:
         name: external-dns
         namespace: flux-system
   install:
+    crds: CreateReplace
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
+    crds: CreateReplace
     remediation:
       strategy: rollback
       retries: 3

diff --git a/kubernetes/main/apps/network/external-dns/cloudflare/kustomization.yaml b/kubernetes/main/apps/network/external-dns/cloudflare/kustomization.yaml
@@ -3,6 +3,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./dnsendpoint-crd.yaml
   - ./externalsecret.yaml
   - ./helmrelease.yaml
diff --git a/kubernetes/main/bootstrap/readme.md b/kubernetes/main/bootstrap/readme.md
@@ -4,44 +4,52 @@ This is how I am bootstrapping Talos over PXE Boot using [Vyos](https://vyos.io/
 
 ## Vyos Config
 
-### TFTP
+### TFTP Setup
 
 > [!NOTE]
 > My router IP address is `192.168.0.1`
 
 ```sh
 set service tftp-server directory '/config/tftpboot'
 set service tftp-server listen-address 192.168.0.1
+```
+
+### TFTP assets
+
+```sh
 curl -L -o /config/tftpboot/ipxe.efi http://boot.ipxe.org/ipxe.efi
 curl -L -o /config/tftpboot/undionly.kpxe http://boot.ipxe.org/undionly.kpxe
-sudo chown -R tftp:tftp /config/tftpboot/
 ```
 
-### Matchbox
+### Matchbox Setup
 
 > [!NOTE]
-> My container network is `192.168.254.0/24`. Configuration files under the **matchbox** dir need to go into the respected directories on Vyos.
+> My container network is `192.168.254.0/24`. Configuration files under the **matchbox** dir need to go into the respected directories on Vyos: `mkdir -p /config/containers/matchbox/data/{assets,groups,profiles}`
 
 ```sh
-mkdir -p /config/containers/matchbox/data/{assets,groups,profiles}
 set container name matchbox arguments '-address=0.0.0.0:80 -log-level=debug'
 set container name matchbox cap-add 'net-bind-service'
-set container name matchbox image 'quay.io/poseidon/matchbox:v0.10.0'
+set container name matchbox image 'quay.io/poseidon/matchbox:v0.11.0'
 set container name matchbox memory '0'
 set container name matchbox network containers address '192.168.254.12'
 set container name matchbox shared-memory '0'
 set container name matchbox volume matchbox-data destination '/var/lib/matchbox'
 set container name matchbox volume matchbox-data mode 'rw'
 set container name matchbox volume matchbox-data propagation 'private'
 set container name matchbox volume matchbox-data source '/config/containers/matchbox/data'
-curl -L -o /config/containers/matchbox/data/assets/vmlinuz https://factory.talos.dev/image/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100/v1.6.4/kernel-amd64
-curl -L -o /config/containers/matchbox/data/assets/initramfs.xz https://factory.talos.dev/image/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100/v1.6.4/initramfs-amd64.xz
+```
+
+### Talos assets
+
+```sh
+curl -L -o /config/containers/matchbox/data/assets/kernel-amd64 https://factory.talos.dev/image/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100/v1.6.7/kernel-amd64
+curl -L -o /config/containers/matchbox/data/assets/initramfs-amd64.xz https://factory.talos.dev/image/d715f723f882b1e1e8063f1b89f237dcc0e3bd000f9f970243af59c8baae0100/v1.6.7/initramfs-amd64.xz
 ```
 
 ### DHCP
 
 > [!NOTE]
-> My node network is `192.168.42.0/24`
+> My Kubernetes node network is `192.168.42.0/24`
 
 ```sh
 set service dhcp-server global-parameters 'option system-arch code 93 = unsigned integer 16;'

diff --git a/kubernetes/storage/apps/network/external-dns/bind/helmrelease.yaml b/kubernetes/storage/apps/network/external-dns/bind/helmrelease.yaml
@@ -9,16 +9,18 @@ spec:
   chart:
     spec:
       chart: external-dns
-      version: 1.14.3
+      version: 1.14.4
       sourceRef:
         kind: HelmRepository
         name: external-dns
         namespace: flux-system
   install:
+    crds: CreateReplace
     remediation:
       retries: 3
   upgrade:
     cleanupOnFail: true
+    crds: CreateReplace
     remediation:
       strategy: rollback
       retries: 3