Merge pull request #562 from stuggi/schema_check_fix_new_crds

crd-schema-check: allow new CRDs
openstack-k8s-operators · Dec 13, 2024 · 92f9bd1 · 92f9bd1
2 parents 5fc45e1 + 098babb
commit 92f9bd1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 24 deletions.
diff --git a/api/bases/telemetry.openstack.org_ceilometers.yaml b/api/bases/telemetry.openstack.org_ceilometers.yaml
@@ -151,11 +151,11 @@ spec:
                 type: object
               mysqldExporterDatabaseAccountPrefix:
                 default: mysqld-exporter
-                description: MysqldExporterDatabaseAccountPrefix - Database account
-                  prefix for the mysqld-exporter. A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera
-                  CR name>" for each galera instance needs to be either created by
-                  the user or if it's missing, it'll be created by the telemetry-operator
-                  automatically.
+                description: |-
+                  MysqldExporterDatabaseAccountPrefix - Database account prefix for the mysqld-exporter.
+                  A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera CR name>" for each
+                  galera instance needs to be either created by the user or if it's missing, it'll be
+                  created by the telemetry-operator automatically.
                 type: string
               mysqldExporterEnabled:
                 description: Whether mysqld_exporter should be deployed

diff --git a/api/bases/telemetry.openstack.org_telemetries.yaml b/api/bases/telemetry.openstack.org_telemetries.yaml
@@ -448,11 +448,11 @@ spec:
                     type: object
                   mysqldExporterDatabaseAccountPrefix:
                     default: mysqld-exporter
-                    description: MysqldExporterDatabaseAccountPrefix - Database account
-                      prefix for the mysqld-exporter. A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera
-                      CR name>" for each galera instance needs to be either created
-                      by the user or if it's missing, it'll be created by the telemetry-operator
-                      automatically.
+                    description: |-
+                      MysqldExporterDatabaseAccountPrefix - Database account prefix for the mysqld-exporter.
+                      A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera CR name>" for each
+                      galera instance needs to be either created by the user or if it's missing, it'll be
+                      created by the telemetry-operator automatically.
                     type: string
                   mysqldExporterEnabled:
                     description: Whether mysqld_exporter should be deployed

diff --git a/config/crd/bases/telemetry.openstack.org_ceilometers.yaml b/config/crd/bases/telemetry.openstack.org_ceilometers.yaml
@@ -151,11 +151,11 @@ spec:
                 type: object
               mysqldExporterDatabaseAccountPrefix:
                 default: mysqld-exporter
-                description: MysqldExporterDatabaseAccountPrefix - Database account
-                  prefix for the mysqld-exporter. A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera
-                  CR name>" for each galera instance needs to be either created by
-                  the user or if it's missing, it'll be created by the telemetry-operator
-                  automatically.
+                description: |-
+                  MysqldExporterDatabaseAccountPrefix - Database account prefix for the mysqld-exporter.
+                  A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera CR name>" for each
+                  galera instance needs to be either created by the user or if it's missing, it'll be
+                  created by the telemetry-operator automatically.
                 type: string
               mysqldExporterEnabled:
                 description: Whether mysqld_exporter should be deployed

diff --git a/config/crd/bases/telemetry.openstack.org_telemetries.yaml b/config/crd/bases/telemetry.openstack.org_telemetries.yaml
@@ -448,11 +448,11 @@ spec:
                     type: object
                   mysqldExporterDatabaseAccountPrefix:
                     default: mysqld-exporter
-                    description: MysqldExporterDatabaseAccountPrefix - Database account
-                      prefix for the mysqld-exporter. A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera
-                      CR name>" for each galera instance needs to be either created
-                      by the user or if it's missing, it'll be created by the telemetry-operator
-                      automatically.
+                    description: |-
+                      MysqldExporterDatabaseAccountPrefix - Database account prefix for the mysqld-exporter.
+                      A mariadbaccount CR named "<mysqldExporterDatabaseAccountPrefix>-<galera CR name>" for each
+                      galera instance needs to be either created by the user or if it's missing, it'll be
+                      created by the telemetry-operator automatically.
                     type: string
                   mysqldExporterEnabled:
                     description: Whether mysqld_exporter should be deployed

diff --git a/hack/crd-schema-checker.sh b/hack/crd-schema-checker.sh
@@ -14,8 +14,9 @@ trap cleanup EXIT
 
 for crd in config/crd/bases/*.yaml; do
     mkdir -p "$(dirname "$TMP_DIR/$crd")"
-    git show "$BASE_REF:$crd" > "$TMP_DIR/$crd"
-    $CHECKER check-manifests \
-        --existing-crd-filename="$TMP_DIR/$crd" \
-        --new-crd-filename="$crd"
+    if git show "$BASE_REF:$crd" > "$TMP_DIR/$crd"; then
+        $CHECKER check-manifests \
+            --existing-crd-filename="$TMP_DIR/$crd" \
+            --new-crd-filename="$crd"
+    fi
 done