Merge pull request #14 from onmetal/feature/docker-action

Use docker actions for image builds

Author: afritzler

.github/workflows/publish-docker.yml

@@ -14,39 +14,36 @@ on:
       - 'docs/**'
       - '**/*.md'
 
-env:
-  IMAGE_NAME: template-operator
-
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Run test build
-        run: |
-         docker build . --file Dockerfile
-  push:
-    # Ensure test job passes before pushing image.
-    needs: test
-
+  buildAndPush:
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
     steps:
       - uses: actions/checkout@v2
-      - name: Build image
-        run: docker build . --file Dockerfile --tag image
-      - name: Login to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-      - name: Push image
-        run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "main" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          docker tag image $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+      - uses: docker/metadata-action@v3
+        with:
+          images: |
+            ghcr.io/${{ github.repository_owner }}/template-operator
+          tags: |
+            type=semver,pattern={{version}}
+            type=sha
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        with:
+          platforms: all
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

controllers/template_controller.go

@@ -587,6 +587,18 @@ func (r *TemplateReconciler) deleteWatches(key client.ObjectKey) error {
 }
 
 func (r *TemplateReconciler) reconcile(ctx context.Context, logger logr.Logger, template *templatev1alpha1.Template) (ctrl.Result, error) {
+	if err := r.applyWatches(template); err != nil {
+		if err := r.updateStatus(ctx, template,
+			nil,
+			corev1.ConditionUnknown,
+			"CannotApplyWatches",
+			fmt.Sprintf("Applying watches resulted in an error: %v", err),
+		); err != nil {
+			logger.Error(err, "Error updating status.")
+		}
+		return ctrl.Result{}, fmt.Errorf("error applying watches: %w", err)
+	}
+
 	objs, err := r.engine.Render(ctx, template)
 	if err != nil {
 		if err := r.updateStatus(ctx, template,

kubectl-template_operator/main.go

@@ -166,6 +166,9 @@ func RunRender(ctx context.Context, namespace, name, filename string) error {
 	}
 
 	tmpl, err := getOrReadTemplate(ctx, c, namespace, name, filename)
+	if err != nil {
+		return fmt.Errorf("could not obtain template: %w", err)
+	}
 
 	objs, err := template.NewEngine(c, scheme).Render(ctx, tmpl)
 	if err != nil {