Merge pull request #210 from fluxcd/codegen-ci

Check if working tree is dirty in CI
fluxcd · Dec 3, 2021 · 62c06ea · 62c06ea
2 parents 074cbc9 + 1341350
commit 62c06ea
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -44,6 +44,13 @@ jobs:
       run: make test
       env:
         KUBEBUILDER_ASSETS: ${{ github.workspace }}/kubebuilder/bin
+    - name: Check if working tree is dirty
+      run: |
+        if [[ $(git diff --stat) != '' ]]; then
+          git --no-pager diff
+          echo 'run make test and commit changes'
+          exit 1
+        fi
     - name: Build container image
       run: |
         make docker-build IMG=ghcr.io/fluxcd/${{ github.event.repository.name }}:latest \

diff --git a/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml b/config/crd/bases/image.toolkit.fluxcd.io_imagepolicies.yaml
@@ -95,8 +95,6 @@ spec:
             - policy
             type: object
           status:
-            default:
-              observedGeneration: -1
             description: ImagePolicyStatus defines the observed state of ImagePolicy
             properties:
               conditions:
@@ -146,7 +144,6 @@ spec:
                 description: LatestImage gives the first in the list of images scanned by the image repository, when filtered and ordered according to the policy.
                 type: string
               observedGeneration:
-                description: ObservedGeneration is the last reconciled generation.
                 format: int64
                 type: integer
             type: object
@@ -373,6 +370,8 @@ spec:
             - policy
             type: object
           status:
+            default:
+              observedGeneration: -1
             description: ImagePolicyStatus defines the observed state of ImagePolicy
             properties:
               conditions:

diff --git a/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml b/config/crd/bases/image.toolkit.fluxcd.io_imagerepositories.yaml
@@ -71,8 +71,6 @@ spec:
                 type: string
             type: object
           status:
-            default:
-              observedGeneration: -1
             description: ImageRepositoryStatus defines the observed state of ImageRepository
             properties:
               canonicalImageName:
@@ -340,6 +338,8 @@ spec:
                 type: string
             type: object
           status:
+            default:
+              observedGeneration: -1
             description: ImageRepositoryStatus defines the observed state of ImageRepository
             properties:
               canonicalImageName: