Merge pull request #301 from stefanprodan/timoni-module

Add Timoni module

.gitattributes

@@ -0,0 +1 @@
+timoni/podinfo/cue.mod/* linguist-vendored

.github/workflows/test.yml

@@ -17,17 +17,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
-      - name: Restore Go cache
-        uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: ${{ runner.os }}-go-
+        uses: actions/checkout@v4
       - name: Setup Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.21.x
+          cache-dependency-path: |
+            **/go.sum
+            **/go.mod
       - name: Setup kubectl
         uses: azure/setup-kubectl@v3
         with:
@@ -39,7 +36,9 @@ jobs:
         with:
           version: v3.10.3
       - name: Setup CUE
-        uses: cue-lang/setup-cue@main
+        uses: cue-lang/[email protected]
+      - name: Setup Timoni
+        uses: stefanprodan/timoni/actions/setup@main
       - name: Run unit tests
         run: make test
       - name: Validate Helm chart
@@ -49,24 +48,22 @@ jobs:
       - name: Validate Kustomize overlay
         run: |
           kubectl kustomize ./kustomize/ | kubeconform -strict -summary -kubernetes-version ${{ env.KUBERNETES_VERSION }}
-      - name: Generate CUE definitions
-        run: make cue-mod
       - name: Verify CUE formatting
-        working-directory: ./cue
+        working-directory: ./timoni/podinfo
         run: |
-          cue fmt .
+          cue fmt ./..
           status=$(git status . --porcelain)
           [[ -z "$status" ]] || {
             echo "CUE files are not correctly formatted"
             echo "$status"
             git diff
             exit 1
           }
-      - name: Validate CUE
-        working-directory: ./cue
+      - name: Validate Timoni module
+        working-directory: ./timoni/podinfo
         run: |
-          cue vet --all-errors --concrete .
-          cue gen | kubeconform -strict -summary -skip=ServiceMonitor -kubernetes-version ${{ env.KUBERNETES_VERSION }}
+          timoni mod lint . 
+          timoni build podinfo . -f test_values.cue | kubeconform -strict -summary -skip=ServiceMonitor -kubernetes-version ${{ env.KUBERNETES_VERSION }}
       - name: Check if working tree is dirty
         run: |
           if [[ $(git diff --stat) != '' ]]; then

Makefile

@@ -82,8 +82,8 @@ version-set:
 	/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/webapp/backend/deployment.yaml && \
 	/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/frontend/deployment.yaml && \
 	/usr/bin/sed -i '' "s/podinfo:$$current/podinfo:$$next/g" deploy/bases/backend/deployment.yaml && \
-	/usr/bin/sed -i '' "s/$$current/$$next/g" cue/main.cue && \
-	echo "Version $$next set in code, deployment, chart and kustomize"
+	/usr/bin/sed -i '' "s/$$current/$$next/g" timoni/podinfo/values.cue && \
+	echo "Version $$next set in code, deployment, module, chart and kustomize"
 
 release:
 	git tag -s -m $(VERSION) $(VERSION)
@@ -95,13 +95,6 @@ swagger:
 	go get github.com/swaggo/swag/cmd/swag@latest
 	cd pkg/api && $$(go env GOPATH)/bin/swag init -g server.go
 
-.PHONY: cue-mod
-cue-mod:
-	@cd cue && go mod init github.com/stefanprodan/podinfo/cue
-	@cd cue && go get k8s.io/api/...
-	@cd cue && cue get go k8s.io/api/...
-
-.PHONY: cue-gen
-cue-gen:
-	@cd cue && cue fmt ./... && cue vet --all-errors --concrete ./...
-	@cd cue && cue gen
+.PHONY: timoni-build
+timoni-build:
+	@timoni build podinfo ./timoni/podinfo -f ./timoni/podinfo/test_values.cue