Add check for generating manifests and code (#2234)

Signed-off-by: Yi Chen <[email protected]>
kubeflow · Oct 10, 2024 · c75d99f · c75d99f
1 parent 247e834
commit c75d99f
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 12 deletions.
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -38,6 +38,15 @@ jobs:
             false
           fi
 
+      - name: Generate code
+        run: |
+          make generate
+          if ! git diff --quiet; then
+            echo "Need to re-run 'make generate' and commit the changes."
+            git diff
+            false
+          fi
+
       - name: Run go fmt check
         run: |
           make go-fmt
@@ -145,6 +154,18 @@ jobs:
       - name: Set up chart-testing
         uses: helm/[email protected]
 
+      - name: Generate manifests
+        run: |
+          make manifests
+          if ! git diff --quiet; then
+            echo "Need to re-run 'make manifests' and commit the changes."
+            git diff
+            false
+          fi
+
+      - name: Detect CRDs drift between chart and manifest
+        run: make detect-crds-drift
+
       - name: Run chart-testing (list-changed)
         id: list-changed
         env:
@@ -161,10 +182,6 @@ jobs:
           BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
         run: ct lint --check-version-increment=false --target-branch $BRANCH
 
-      - name: Detect CRDs drift between chart and manifest
-        if: steps.list-changed.outputs.changed == 'true'
-        run: make detect-crds-drift
-
       - name: Produce the helm documentation
         if: steps.list-changed.outputs.changed == 'true'
         run: |

diff --git a/charts/spark-operator-chart/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml b/charts/spark-operator-chart/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml
@@ -9605,8 +9605,8 @@ spec:
                     additionalProperties:
                       type: string
                     description: |-
-                      HadoopConf carries user-specified Hadoop configuration properties as they would use the  the "--conf" option
-                      in spark-submit.  The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
+                      HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
+                      in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
                       configuration properties.
                     type: object
                   hadoopConfigMap:

diff --git a/charts/spark-operator-chart/crds/sparkoperator.k8s.io_sparkapplications.yaml b/charts/spark-operator-chart/crds/sparkoperator.k8s.io_sparkapplications.yaml
@@ -9514,8 +9514,8 @@ spec:
                 additionalProperties:
                   type: string
                 description: |-
-                  HadoopConf carries user-specified Hadoop configuration properties as they would use the  the "--conf" option
-                  in spark-submit.  The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
+                  HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
+                  in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
                   configuration properties.
                 type: object
               hadoopConfigMap:

diff --git a/config/crd/bases/sparkoperator.k8s.io_scheduledsparkapplications.yaml b/config/crd/bases/sparkoperator.k8s.io_scheduledsparkapplications.yaml
@@ -9605,8 +9605,8 @@ spec:
                     additionalProperties:
                       type: string
                     description: |-
-                      HadoopConf carries user-specified Hadoop configuration properties as they would use the  the "--conf" option
-                      in spark-submit.  The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
+                      HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
+                      in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
                       configuration properties.
                     type: object
                   hadoopConfigMap:

diff --git a/config/crd/bases/sparkoperator.k8s.io_sparkapplications.yaml b/config/crd/bases/sparkoperator.k8s.io_sparkapplications.yaml
@@ -9514,8 +9514,8 @@ spec:
                 additionalProperties:
                   type: string
                 description: |-
-                  HadoopConf carries user-specified Hadoop configuration properties as they would use the  the "--conf" option
-                  in spark-submit.  The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
+                  HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
+                  in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
                   configuration properties.
                 type: object
               hadoopConfigMap: