From 9b5b6a971e15c90c9c05f361ee0d1fb4f01c19c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnar=20P=C3=A1ll?= Date: Fri, 8 Sep 2023 10:35:18 +0000 Subject: [PATCH] Helm chart to manage bigdata custom resrouces added In order to manage custom resources out of band from the default helm crd installation process a new helm chart has been introduced that enables us to deploy crds just like normal resources. This has the advantage that we can actually introduce a new resource through upgrades since helm only installs crds at install time. --- charts/bigdata-crds/.helmignore | 23 +++++++++++++++++++ charts/bigdata-crds/Chart.yaml | 17 ++++++++++++++ .../bigdata.spot.io_bigdatacomponents.yaml | 15 +++++++++++- charts/bigdata-crds/values.yaml | 0 charts/bigdata-operator/Chart.yaml | 2 +- 5 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 charts/bigdata-crds/.helmignore create mode 100644 charts/bigdata-crds/Chart.yaml rename charts/{bigdata-operator/crds => bigdata-crds/templates}/bigdata.spot.io_bigdatacomponents.yaml (92%) create mode 100644 charts/bigdata-crds/values.yaml diff --git a/charts/bigdata-crds/.helmignore b/charts/bigdata-crds/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/charts/bigdata-crds/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/bigdata-crds/Chart.yaml b/charts/bigdata-crds/Chart.yaml new file mode 100644 index 00000000..272f5089 --- /dev/null +++ b/charts/bigdata-crds/Chart.yaml @@ -0,0 +1,17 @@ +apiVersion: v2 +name: bigdata-crds +description: Custom Resource Definitions for the Spot Bigdata Platform +type: application +version: 1.0.0 +appVersion: "1.0.0" +home: https://github.com/spotinst/charts +icon: https://docs.spot.io/_media/images/spot_mark.png +sources: + - https://github.com/spotinst/bigdata-operator +keywords: + - spot + - toolkit + - ocean +maintainers: + - name: thorsteinnth + email: thorsteinn.sigurdsson@netapp.com diff --git a/charts/bigdata-operator/crds/bigdata.spot.io_bigdatacomponents.yaml b/charts/bigdata-crds/templates/bigdata.spot.io_bigdatacomponents.yaml similarity index 92% rename from charts/bigdata-operator/crds/bigdata.spot.io_bigdatacomponents.yaml rename to charts/bigdata-crds/templates/bigdata.spot.io_bigdatacomponents.yaml index 655b7633..bce6720b 100644 --- a/charts/bigdata-operator/crds/bigdata.spot.io_bigdatacomponents.yaml +++ b/charts/bigdata-crds/templates/bigdata.spot.io_bigdatacomponents.yaml @@ -14,7 +14,20 @@ spec: singular: bigdatacomponent scope: Namespaced versions: - - name: v1 + - additionalPrinterColumns: + - jsonPath: .spec.chartName + name: Chart + type: string + - jsonPath: .spec.version + name: Version + type: string + - jsonPath: .status.conditions[-1:].type + name: Status + type: string + - jsonPath: .status.conditions[-1:].message + name: Message + type: string + name: v1 schema: openAPIV3Schema: description: BigDataComponent is the Schema for the bigdatacomponents API diff --git a/charts/bigdata-crds/values.yaml b/charts/bigdata-crds/values.yaml new file mode 100644 index 00000000..e69de29b diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml index c1cfa4c3..2b6515b6 100644 --- a/charts/bigdata-operator/Chart.yaml +++ b/charts/bigdata-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: bigdata-operator description: Spot Ocean BigData Operator type: application -version: 0.3.1 +version: 0.3.2 appVersion: 0.3.0 home: https://github.com/spotinst/charts icon: https://docs.spot.io/_media/images/spot_mark.png