flux 2.3.0 working?

pthomison · May 19, 2024 · 1e19e29 · 1e19e29
1 parent bbc09e0
commit 1e19e29
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 29 deletions.
diff --git a/default/deployments/ingress-controller.yaml b/default/deployments/ingress-controller.yaml
@@ -13,7 +13,7 @@ spec:
   url: https://kubernetes.github.io/ingress-nginx
   interval: 10m
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: ingress-nginx

diff --git a/default/deployments/kube-state-metrics.yaml b/default/deployments/kube-state-metrics.yaml
@@ -13,7 +13,7 @@ spec:
   interval: 1m
   url: https://charts.bitnami.com/bitnami
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: kube-state-metrics

diff --git a/default/deployments/metrics-server.yaml b/default/deployments/metrics-server.yaml
@@ -13,7 +13,7 @@ spec:
   interval: 1m
   url: https://kubernetes-sigs.github.io/metrics-server/
 ---
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: metrics-server

diff --git a/default/k3d-config.yaml b/default/k3d-config.yaml
@@ -3,7 +3,7 @@ kind: Simple
 metadata:
   name: k3auto
 servers: 1
-# image: docker.io/rancher/k3s:v1.21.7-k3s1 # Injected By k3auto for default config
+image: docker.io/rancher/k3s:v1.29.4-k3s1
 kubeAPI:
   hostPort: "6443"
 

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/docker/docker v26.1.3+incompatible
 	github.com/fluxcd/cli-utils v0.36.0-flux.7
-	github.com/fluxcd/flux2/v2 v2.2.3
+	github.com/fluxcd/flux2/v2 v2.3.0
 	github.com/fluxcd/helm-controller/api v1.0.1
 	github.com/fluxcd/kustomize-controller/api v1.3.0
 	github.com/fluxcd/pkg/runtime v0.47.1
@@ -25,7 +25,7 @@ require (
 	k8s.io/apiextensions-apiserver v0.30.1
 	k8s.io/apimachinery v0.30.1
 	k8s.io/client-go v0.30.1
-	k8s.io/kubectl v0.30.1
+	k8s.io/kubectl v0.30.0
 	sigs.k8s.io/controller-runtime v0.18.2
 )
 
@@ -50,7 +50,7 @@ require (
 	github.com/containers/ocicrypt v1.1.9 // indirect
 	github.com/containers/storage v1.53.0 // indirect
 	github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f // indirect
-	github.com/cyphar/filepath-securejoin v0.2.4 // indirect
+	github.com/cyphar/filepath-securejoin v0.2.5 // indirect
 	github.com/dimchansky/utfbom v1.1.1 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/cli v26.0.0+incompatible // indirect
@@ -66,8 +66,8 @@ require (
 	github.com/fluxcd/pkg/apis/acl v0.3.0 // indirect
 	github.com/fluxcd/pkg/apis/kustomize v1.5.0 // indirect
 	github.com/fluxcd/pkg/apis/meta v1.5.0 // indirect
-	github.com/fluxcd/pkg/kustomize v1.6.0 // indirect
-	github.com/fluxcd/pkg/tar v0.4.0 // indirect
+	github.com/fluxcd/pkg/kustomize v1.11.0 // indirect
+	github.com/fluxcd/pkg/tar v0.7.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/fvbommel/sortorder v1.1.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect

diff --git a/go.sum b/go.sum
@@ -81,8 +81,8 @@ github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
 github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f h1:eHnXnuK47UlSTOQexbzxAZfekVz6i+LKRdj1CU5DPaM=
 github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw=
-github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
-github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
+github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo=
+github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -129,8 +129,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/fluxcd/cli-utils v0.36.0-flux.7 h1:81zEo/LNmIRWMgtsZy/8L13TMUZHmmJib4gHRvKwVE8=
 github.com/fluxcd/cli-utils v0.36.0-flux.7/go.mod h1:TcfLhvBjtQnqxYMsHQUAEB2c5WJRVuibtas2Izz5ZTs=
-github.com/fluxcd/flux2/v2 v2.2.3 h1:sVeYLHIDGMTkT1ibbdz52z5y9pr456XSRULsehxqEXI=
-github.com/fluxcd/flux2/v2 v2.2.3/go.mod h1:vDwnGaRVqeChwgg2eo6MtoF8NJ0OmBnE2tfRPa3PZrQ=
+github.com/fluxcd/flux2/v2 v2.3.0 h1:R90fCqLj52F2KL7DWG3/r5LyhJF+zgCaNjdzF2/WrvY=
+github.com/fluxcd/flux2/v2 v2.3.0/go.mod h1:nFebvCRq3CIQGeZuoC9h76oGjd2H+doM+Nmxc54fLJ0=
 github.com/fluxcd/helm-controller/api v1.0.1 h1:Gn9qEVuif6D5+gHmVwTEZkR4+nmLOcOhKx4Sw2gL2EA=
 github.com/fluxcd/helm-controller/api v1.0.1/go.mod h1:/6AD5a2qjo/ttxVM8GR33syLZwqigta60DCLdy8GrME=
 github.com/fluxcd/kustomize-controller/api v1.3.0 h1:IwXkU48lQ/YhU6XULlPXDgQlnpNyQdCNbUvhLdWVIbE=
@@ -141,12 +141,12 @@ github.com/fluxcd/pkg/apis/kustomize v1.5.0 h1:ah4sfqccnio+/5Edz/tVz6LetFhiBoDzX
 github.com/fluxcd/pkg/apis/kustomize v1.5.0/go.mod h1:nEzhnhHafhWOUUV8VMFLojUOH+HHDEsL75y54mt/c30=
 github.com/fluxcd/pkg/apis/meta v1.5.0 h1:/G82d2Az5D9op3F+wJUpD8jw/eTV0suM6P7+cSURoUM=
 github.com/fluxcd/pkg/apis/meta v1.5.0/go.mod h1:Y3u7JomuuKtr5fvP1Iji2/50FdRe5GcBug2jawNVkdM=
-github.com/fluxcd/pkg/kustomize v1.6.0 h1:LIZ0BkpGLkyj33yzJ3HUsNzJ20wcLSxkUFcZg9kpg34=
-github.com/fluxcd/pkg/kustomize v1.6.0/go.mod h1:LitgZWd9+2X9g+Y4JeyZJewel+E10OIkUaUw4t4YWM8=
+github.com/fluxcd/pkg/kustomize v1.11.0 h1:8YV4i6VCCxpXGlK+NzfNKbuhuSlK6Bfdr/Qv5jJgEtQ=
+github.com/fluxcd/pkg/kustomize v1.11.0/go.mod h1:SfkN+DKgf8aLNoQtNuHBUEeB/uyC4nGzbbF+Ld0TmPU=
 github.com/fluxcd/pkg/runtime v0.47.1 h1:Q1tAFsp92uurWyoEe52AmMC4k+6DYTPBrUQDs+nz/9c=
 github.com/fluxcd/pkg/runtime v0.47.1/go.mod h1:97a+PqpWMgQsoqh91uH3EQz+/DC7Uxc8xcu/rDHFC5c=
-github.com/fluxcd/pkg/tar v0.4.0 h1:SuXpfXBIcSJ5R/yqQi2CBxBmV/i/LH0agqNAh2PWBZg=
-github.com/fluxcd/pkg/tar v0.4.0/go.mod h1:SyJBaQvuv2VA/rv4d1OHhCV6R8+9QKc9np193EzNHBc=
+github.com/fluxcd/pkg/tar v0.7.0 h1:xdg95f4DlzMgd4m+xPRXrX4NLb8P8b5SAqB19sDOLIs=
+github.com/fluxcd/pkg/tar v0.7.0/go.mod h1:KLg1zMZF7sEncGA9LEsfkskbCMyLSEgrjBRXqFK++VE=
 github.com/fluxcd/source-controller/api v1.3.0 h1:Z5Lq0aJY87yg0cQDEuwGLKS60GhdErCHtsi546HUt10=
 github.com/fluxcd/source-controller/api v1.3.0/go.mod h1:+tfd0vltjcVs/bbnq9AlYR9AAHSVfM/Z4v4TpQmdJf4=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -519,8 +519,8 @@ github.com/sebdah/goldie/v2 v2.5.3 h1:9ES/mNN+HNUbNWpVAlrzuZ7jE+Nrczbj8uFRjM7624
 github.com/sebdah/goldie/v2 v2.5.3/go.mod h1:oZ9fp0+se1eapSRjfYbsV/0Hqhbuu3bJVvKI/NNtssI=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbmfHkLguCE9laoZCUzEEpIZXA=
 github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU=
-github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
+github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
 github.com/sigstore/fulcio v1.4.3 h1:9JcUCZjjVhRF9fmhVuz6i1RyhCc/EGCD7MOl+iqCJLQ=
 github.com/sigstore/fulcio v1.4.3/go.mod h1:BQPWo7cfxmJwgaHlphUHUpFkp5+YxeJes82oo39m5og=
 github.com/sigstore/rekor v1.2.2 h1:5JK/zKZvcQpL/jBmHvmFj3YbpDMBQnJQ6ygp8xdF3bY=
@@ -857,8 +857,8 @@ k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3 h1:SbdLaI6mM6ffDSJCadEaD4IkuPzepLDGlkd2xV0t1uA=
 k8s.io/kube-openapi v0.0.0-20240411171206-dc4e619f62f3/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
-k8s.io/kubectl v0.30.1 h1:sHFIRI3oP0FFZmBAVEE8ErjnTyXDPkBcvO88mH9RjuY=
-k8s.io/kubectl v0.30.1/go.mod h1:7j+L0Cc38RYEcx+WH3y44jRBe1Q1jxdGPKkX0h4iDq0=
+k8s.io/kubectl v0.30.0 h1:xbPvzagbJ6RNYVMVuiHArC1grrV5vSmmIcSZuCdzRyk=
+k8s.io/kubectl v0.30.0/go.mod h1:zgolRw2MQXLPwmic2l/+iHs239L49fhSeICuMhQQXTI=
 k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
 k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/controller-runtime v0.18.2 h1:RqVW6Kpeaji67CY5nPEfRz6ZfFMk0lWQlNrLqlNpx+Q=

diff --git a/hack/hack_test.go b/hack/hack_test.go
@@ -0,0 +1,17 @@
+package hack
+
+import (
+	"testing"
+
+	"github.com/davecgh/go-spew/spew"
+	"github.com/pthomison/k3auto/internal/flux"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestManifestGeneration(t *testing.T) {
+	manifests, err := flux.GenerateManifests()
+	assert.Nil(t, err)
+
+	spew.Dump(manifests)
+
+}
diff --git a/internal/flux/generate.go b/internal/flux/generate.go
@@ -9,11 +9,16 @@ func GenerateManifests() (*manifestgen.Manifest, error) {
 	// Generate Flux Controller Manifests
 	genOps := install.MakeDefaultOptions()
 	genOps.NetworkPolicy = false
-	genOps.Version = "v2.2.3"
+	genOps.Version = "v2.3.0"
 	manifests, err := install.Generate(genOps, "")
 	if err != nil {
 		return nil, err
 	}
 
+	// err = os.WriteFile("/tmp/test-manifests.yaml", []byte(manifests.Content), 0644)
+	// if err != nil {
+	// 	return nil, err
+	// }
+
 	return manifests, nil
 }
diff --git a/internal/k8s/client.go b/internal/k8s/client.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"strings"
 
+	"github.com/davecgh/go-spew/spew"
 	helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	helmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
@@ -103,13 +104,15 @@ func CreateManifests(ctx context.Context, k8sC client.Client, manifests string)
 
 	for i := range rawObjs {
 
-		obj, _, err := decoder.Decode(rawObjs[i], nil, nil)
+		obj, t, err := decoder.Decode(rawObjs[i], nil, nil)
 		if err != nil {
 			return err
 		}
 
 		err = k8sC.Create(ctx, obj.(client.Object))
 		if err != nil {
+			spew.Dump(t, obj)
+
 			return err
 		}
 

diff --git a/internal/yaml/yaml.go b/internal/yaml/yaml.go
@@ -6,13 +6,15 @@ import (
 )
 
 func YamlReadAndSplit(reader io.Reader) ([][]byte, error) {
-	r := regexp.MustCompile(`---\n`)
+	r := regexp.MustCompile(`\n---\n`)
 
 	fb, err := io.ReadAll(reader)
 	if err != nil {
 		return nil, err
 	}
 
+	// fmt.Println(fb)
+
 	var objs [][]byte
 	for _, obj := range r.Split(string(fb), -1) {
 		if len(obj) != 0 {

diff --git a/pkg/k3auto/config.go b/pkg/k3auto/config.go
@@ -1,9 +1,6 @@
 package k3auto
 
 import (
-	"fmt"
-
-	"github.com/davecgh/go-spew/spew"
 	k3dv1alpha5 "github.com/k3d-io/k3d/v5/pkg/config/v1alpha5"
 	defaults "github.com/pthomison/k3auto/default"
 	"github.com/pthomison/k3auto/internal/k3d"
@@ -37,8 +34,6 @@ func ParseK3dConfigFile(configPath string) (*k3dv1alpha5.SimpleConfig, error) {
 		if err != nil {
 			return nil, err
 		}
-		clusterConfig.Image = fmt.Sprintf("docker.io/rancher/k3s:v1.29.4-k3s1")
-		spew.Dump(clusterConfig.Image)
 	}
 
 	return clusterConfig, nil