Add 'datadog-crds' chart as dependency in datadog-operator (#98)

DataDog · Nov 16, 2020 · 3342ac8 · 3342ac8
1 parent 596d07f
commit 3342ac8
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 4 deletions.
diff --git a/charts/datadog-operator/CHANGELOG.md b/charts/datadog-operator/CHANGELOG.md
@@ -1,3 +1,9 @@
+# Changelog
+
+## 0.2.1
+
+* Add "datadog-crds" chart as dependency. It is used to install the datadog's CRDs.
+
 ## 0.2.0
 
 * Use `gcr.io` instead of Dockerhub

diff --git a/charts/datadog-operator/Chart.lock b/charts/datadog-operator/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: datadog-crds
+  repository: https://helm.datadoghq.com
+  version: 0.1.1
+digest: sha256:e21fd98042d1108d1565c6f92fa56a2366d2a80994a159ba48fea4fc2450e2dd
+generated: "2020-11-16T16:45:19.150951+01:00"
diff --git a/charts/datadog-operator/Chart.yaml b/charts/datadog-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: datadog-operator
-version: 0.2.0
+version: 0.2.1
 appVersion: 0.3.1
 description: Datadog Operator
 keywords:

diff --git a/charts/datadog-operator/README.md b/charts/datadog-operator/README.md
@@ -1,17 +1,20 @@
 # Datadog Operator
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
+![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![AppVersion: 0.3.1](https://img.shields.io/badge/AppVersion-0.3.1-informational?style=flat-square)
 
 ## Values
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | affinity | object | `{}` | Allows to specify affinity for Datadog Operator PODs |
+| datadog-crds.crds.datadogAgents | bool | `true` | Set to true to deploy the DatadogAgents CRD |
+| datadog-crds.crds.datadogMetrics | bool | `true` | Set to true to deploy the DatadogMetrics CRD |
 | fullnameOverride | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` | Define the pullPolicy for Datadog Operator image |
 | image.repository | string | `"gcr.io/datadoghq/operator"` | Repository to use for Datadog Operator image |
 | image.tag | string | `"0.3.1"` | Define the Datadog Operator version to use |
 | imagePullSecrets | list | `[]` | Datadog Operator repository pullSecret (ex: specify docker registry credentials) |
+| installCRDs | bool | `true` | Set to true to deploy the Datadog's CRDs |
 | logLevel | string | `"info"` | Set Datadog Operator log level (debug, info, error, panic, fatal) |
 | metricsPort | int | `8383` | Port used for OpenMetrics endpoint |
 | nameOverride | string | `""` | Override name of app |

diff --git a/charts/datadog-operator/crds/datadoghq.com_datadogagents_crd.yaml b/charts/datadog-operator/crds/datadoghq.com_datadogagents_crd.yaml
diff --git a/charts/datadog-operator/crds/datadoghq.com_datadogmetrics_crd.yaml b/charts/datadog-operator/crds/datadoghq.com_datadogmetrics_crd.yaml
diff --git a/charts/datadog-operator/requirements.yaml b/charts/datadog-operator/requirements.yaml
@@ -0,0 +1,7 @@
+dependencies:
+  - name: datadog-crds
+    version: "=0.1.1"
+    repository: https://helm.datadoghq.com
+    condition: installCRDs
+    tags:
+    - install-crds
diff --git a/charts/datadog-operator/values.yaml b/charts/datadog-operator/values.yaml
@@ -55,3 +55,14 @@ nodeSelector: {}
 tolerations: []
 # affinity -- Allows to specify affinity for Datadog Operator PODs
 affinity: {}
+
+
+# installCRDs -- Set to true to deploy the Datadog's CRDs
+installCRDs: true
+
+datadog-crds:
+  crds:
+    # datadog-crds.crds.datadogAgents -- Set to true to deploy the DatadogAgents CRD
+    datadogAgents: true
+    # datadog-crds.crds.datadogMetrics -- Set to true to deploy the DatadogMetrics CRD
+    datadogMetrics: true