ci: OpenAPI model generated files checked in pipeline

Signed-off-by: Marc Nuri <[email protected]>

.github/workflows/gobuild.yml → .github/workflows/generate-model.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-name: Go Generate Model
+name: Generate Model
 
 on:
   push:
@@ -55,11 +55,14 @@ jobs:
       - name: Check No Schema file modified
         run: |
           git add .
-          MODIFIED_KUBE_SCHEMA=`git status | grep -v 'validation-schema.json' | grep 'kube-schema.json\|src/generated/java' | wc -l`
-          if [ $MODIFIED_KUBE_SCHEMA -eq "0" ]; then
+          CHANGED_FILES=$(git status)
+          CHANGED_FILES_IGNORE_VALIDATION=$(echo "$CHANGED_FILES" | grep -v 'validation-schema.json')
+          MODIFIED_FILES=$(echo "$CHANGED_FILES_IGNORE_VALIDATION" | grep 'kube-schema.json\|src/generated/java\|openapi/schemas/')
+          MODIFIED_FILES_COUNT=$(echo "$MODIFIED_FILES" | grep "modified: " | wc -l)
+          if [ $MODIFIED_FILES_COUNT -eq "0" ]; then
             echo "No Schema files modified. Build Success.";
           else
-            git status | grep -v 'validation-schema.json' | grep 'kube-schema.json\|src/generated/java'
+            echo $MODIFIED_FILES;
             echo "Schema files modified. Build Failure";
             exit 1;
           fi;

Makefile

@@ -29,10 +29,13 @@ generate-openapi:
 	./kubernetes-model-generator/openapi/generator/generator ./kubernetes-model-generator/openapi/schemas
 
 # Legacy generation of the model: TODO: remove
-.PHONY: generate-model
-generate-model:
+.PHONY: generate-model-legacy
+generate-model-legacy:
 	cd kubernetes-model-generator && ./generateModel.sh
 
+.PHONY: generate-model
+generate-model: generate-openapi generate-model-legacy
+
 .PHONY: sonar
 sonar:
 	mvn $(MAVEN_OPTIONS) clean install sonar:sonar -Psonar