Skip to content

Commit

Permalink
fix: Upgrade go-jinja2 and generate files.json for embedded manifests (
Browse files Browse the repository at this point in the history
  • Loading branch information
codablock committed Apr 19, 2024
1 parent 1327654 commit e777ee1
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 9 deletions.
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ require (
github.com/imdario/mergo v0.3.16
github.com/jinzhu/copier v0.4.0
github.com/kevinburke/ssh_config v1.2.0
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-1
github.com/kluctl/go-jinja2 v0.0.0-20240321095105-c4279600dc1c
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-3
github.com/kluctl/go-jinja2 v0.0.0-20240419150031-a3bb154908ae
github.com/mattn/go-colorable v0.1.13
github.com/mattn/go-isatty v0.0.20
github.com/mattn/go-runewidth v0.0.15
Expand Down Expand Up @@ -211,7 +211,7 @@ require (
github.com/jmoiron/sqlx v1.3.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.7 // indirect
github.com/klauspost/compress v1.17.8 // indirect
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -434,15 +434,15 @@ github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4
github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg=
github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU=
github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-1 h1:iTRFxf3UDQw9vMqs128iCuCKA99u0lptLzp6ceDYfHc=
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-1/go.mod h1:FJ7V83X5BIqrkPpy2Lmlu2zoDpUnQfVfGpMeRbI0hQ4=
github.com/kluctl/go-jinja2 v0.0.0-20240321095105-c4279600dc1c h1:RJRccOHbOwGaxy2TF8tsixgUMEiWyoXhdHGvH5Gojrg=
github.com/kluctl/go-jinja2 v0.0.0-20240321095105-c4279600dc1c/go.mod h1:GkpC2+7HUb0iE8BFOmBii3iYWEJmdh9+qr1XhL3zXF8=
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-3 h1:56NfVBKvtvcD39YnmD6Ihht4/84OhmJljWfCiT6mgXk=
github.com/kluctl/go-embed-python v0.0.0-3.11.8-20240224-3/go.mod h1:MTNQT2OXzVfB37O67CsQ612RXInR6Jw7kXkpt3R5mdE=
github.com/kluctl/go-jinja2 v0.0.0-20240419150031-a3bb154908ae h1:WrYpwr+30how7x0sxi2YNQiEG1ghVLOaEVaZQodhll4=
github.com/kluctl/go-jinja2 v0.0.0-20240419150031-a3bb154908ae/go.mod h1:NzeSsm0BVgUKjIro2HMwx8vWO/ew6ccqyGDfOwX0OXE=
github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
Expand Down
45 changes: 45 additions & 0 deletions install/controller/files.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
{
"contentHash": "7072345526051e1b24003d701ebcac1fb9361b76752c5085f41ae3d94d1d7748",
"files": [
{
"name": ".kluctl-library.yaml",
"size": 464,
"perm": 420
},
{
"name": "controller",
"size": 0,
"perm": 2147484141
},
{
"name": "controller/crd.yaml",
"size": 42735,
"perm": 420
},
{
"name": "controller/kustomization.yaml",
"size": 2278,
"perm": 420
},
{
"name": "controller/manager.yaml",
"size": 2303,
"perm": 420
},
{
"name": "controller/rbac.yaml",
"size": 3452,
"perm": 420
},
{
"name": "deployment.yaml",
"size": 35,
"perm": 420
},
{
"name": "embed.go",
"size": 74,
"perm": 420
}
]
}
12 changes: 12 additions & 0 deletions internal/generate-install/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package main

import (
"github.com/kluctl/go-embed-python/embed_util"
)

func main() {
err := embed_util.BuildAndWriteFilesList("../install/controller")
if err != nil {
panic(err)
}
}
3 changes: 3 additions & 0 deletions internal/generate.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package internal

//go:generate go run ./generate-install

0 comments on commit e777ee1

Please sign in to comment.