Skip to content

Commit d8594da

Browse files
committed
refactor out CRD diff test optimazation
1 parent 5df833c commit d8594da

File tree

2 files changed

+3
-25
lines changed

2 files changed

+3
-25
lines changed

docs/config_properties.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Spark Operator Config Properties
33
| Key | Type | Default Value | Allow Hot Reloading | Description |
44
| --- | --- | --- | --- | --- |
5+
| spark.logConf | Boolean | false | true | When enabled, operator will print configurations |
56
| spark.kubernetes.operator.name | String | spark-kubernetes-operator | false | Name of the operator. |
67
| spark.kubernetes.operator.namespace | String | default | false | Namespace that operator is deployed within. |
78
| spark.kubernetes.operator.watchedNamespaces | String | default | true | Comma-separated list of namespaces that the operator would be watching for Spark resources. If set to '*', operator would watch all namespaces. |

spark-operator-api/build.gradle

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,31 +89,8 @@ tasks.register("assertGeneratedCRDMatchesHelmChart") {
8989
"${stagedCRDFileBase}sparkclusters.spark.apache.org-v1.yaml"
9090
].execute().text.trim()
9191
if (generatedAppCRD != stagedAppCRD || generatedClusterCRD != stagedClusterCRD) {
92-
def errorMessage = new StringBuilder("Generated CRD yaml does not match the staged " +
93-
"version in Helm Chart, please keep the chart updated.\n\n")
94-
95-
if (generatedAppCRD != stagedAppCRD) {
96-
errorMessage.append("=== SparkApplication CRD Differences ===\n")
97-
def appDiff = ["bash", "-c",
98-
"diff -u <(echo '${generatedAppCRD.replace("'", "'\\''")}' " +
99-
"| yq -P 'sort_keys(..)') <(echo '${stagedAppCRD.replace("'", "'\\''")}' " +
100-
"| yq -P 'sort_keys(..)')"]
101-
.execute().text
102-
errorMessage.append(appDiff ?: "Unable to generate diff\n")
103-
errorMessage.append("\n")
104-
}
105-
106-
if (generatedClusterCRD != stagedClusterCRD) {
107-
errorMessage.append("=== SparkCluster CRD Differences ===\n")
108-
def clusterDiff = ["bash", "-c",
109-
"diff -u <(echo '${generatedClusterCRD.replace("'", "'\\''")}' " +
110-
"| yq -P 'sort_keys(..)') <(echo '${stagedClusterCRD.replace("'", "'\\''")}' " +
111-
"| yq -P 'sort_keys(..)')"]
112-
.execute().text
113-
errorMessage.append(clusterDiff ?: "Unable to generate diff\n")
114-
}
115-
116-
throw new GradleException(errorMessage.toString())
92+
throw new GradleException("Generated CRD yaml does not match the staged version in " +
93+
"Helm Chart, please keep the chart updated.")
11794
}
11895
}
11996
}

0 commit comments

Comments
 (0)