Skip to content

Commit c75d99f

Browse files
authored
Add check for generating manifests and code (kubeflow#2234)
Signed-off-by: Yi Chen <[email protected]>
1 parent 247e834 commit c75d99f

File tree

5 files changed

+29
-12
lines changed

5 files changed

+29
-12
lines changed

.github/workflows/integration.yaml

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ jobs:
3838
false
3939
fi
4040
41+
- name: Generate code
42+
run: |
43+
make generate
44+
if ! git diff --quiet; then
45+
echo "Need to re-run 'make generate' and commit the changes."
46+
git diff
47+
false
48+
fi
49+
4150
- name: Run go fmt check
4251
run: |
4352
make go-fmt
@@ -145,6 +154,18 @@ jobs:
145154
- name: Set up chart-testing
146155
uses: helm/[email protected]
147156

157+
- name: Generate manifests
158+
run: |
159+
make manifests
160+
if ! git diff --quiet; then
161+
echo "Need to re-run 'make manifests' and commit the changes."
162+
git diff
163+
false
164+
fi
165+
166+
- name: Detect CRDs drift between chart and manifest
167+
run: make detect-crds-drift
168+
148169
- name: Run chart-testing (list-changed)
149170
id: list-changed
150171
env:
@@ -161,10 +182,6 @@ jobs:
161182
BRANCH: ${{ steps.get_branch.outputs.BRANCH }}
162183
run: ct lint --check-version-increment=false --target-branch $BRANCH
163184

164-
- name: Detect CRDs drift between chart and manifest
165-
if: steps.list-changed.outputs.changed == 'true'
166-
run: make detect-crds-drift
167-
168185
- name: Produce the helm documentation
169186
if: steps.list-changed.outputs.changed == 'true'
170187
run: |

charts/spark-operator-chart/crds/sparkoperator.k8s.io_scheduledsparkapplications.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9605,8 +9605,8 @@ spec:
96059605
additionalProperties:
96069606
type: string
96079607
description: |-
9608-
HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
9609-
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
9608+
HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
9609+
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
96109610
configuration properties.
96119611
type: object
96129612
hadoopConfigMap:

charts/spark-operator-chart/crds/sparkoperator.k8s.io_sparkapplications.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9514,8 +9514,8 @@ spec:
95149514
additionalProperties:
95159515
type: string
95169516
description: |-
9517-
HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
9518-
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
9517+
HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
9518+
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
95199519
configuration properties.
95209520
type: object
95219521
hadoopConfigMap:

config/crd/bases/sparkoperator.k8s.io_scheduledsparkapplications.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9605,8 +9605,8 @@ spec:
96059605
additionalProperties:
96069606
type: string
96079607
description: |-
9608-
HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
9609-
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
9608+
HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
9609+
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
96109610
configuration properties.
96119611
type: object
96129612
hadoopConfigMap:

config/crd/bases/sparkoperator.k8s.io_sparkapplications.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9514,8 +9514,8 @@ spec:
95149514
additionalProperties:
95159515
type: string
95169516
description: |-
9517-
HadoopConf carries user-specified Hadoop configuration properties as they would use the the "--conf" option
9518-
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
9517+
HadoopConf carries user-specified Hadoop configuration properties as they would use the "--conf" option
9518+
in spark-submit. The SparkApplication controller automatically adds prefix "spark.hadoop." to Hadoop
95199519
configuration properties.
95209520
type: object
95219521
hadoopConfigMap:

0 commit comments

Comments
 (0)