From 951738a47b1e7beb8d30acf73272007d07538678 Mon Sep 17 00:00:00 2001 From: Holden Omans Date: Thu, 17 Jun 2021 15:12:17 -0400 Subject: [PATCH] update chart depends for datadog labels --- ndustrial/cronjob/Chart.yaml | 6 ++--- ndustrial/cronjob/README.md | 2 ++ ndustrial/cronjob/_var_list.yml | 8 ++++++ ndustrial/cronjob/values.yaml | 4 +++ ndustrial/deployment/Chart.yaml | 6 ++--- ndustrial/deployment/README.md | 4 ++- ndustrial/deployment/_var_list.yml | 12 +++++++-- ndustrial/deployment/values.yaml | 4 +++ ndustrial/statefulset/Chart.yaml | 6 ++--- ndustrial/statefulset/README.md | 11 +++++++- ndustrial/statefulset/_var_list.yml | 40 +++++++++++++++++++++++++++-- ndustrial/statefulset/values.yaml | 4 +++ 12 files changed, 92 insertions(+), 15 deletions(-) diff --git a/ndustrial/cronjob/Chart.yaml b/ndustrial/cronjob/Chart.yaml index 377275c..fc04689 100644 --- a/ndustrial/cronjob/Chart.yaml +++ b/ndustrial/cronjob/Chart.yaml @@ -5,7 +5,7 @@ type: application dependencies: - name: common repository: https://ndustrialio.github.io/charts - version: 0.1.3 + version: 0.1.4 tags: - ndustrial-common sources: @@ -14,5 +14,5 @@ maintainers: - email: devops@ndustrial.io name: DevOps # Please make sure that version and appVersion are always the same. -version: 0.1.2 -appVersion: 0.1.2 +version: 0.1.3 +appVersion: 0.1.3 diff --git a/ndustrial/cronjob/README.md b/ndustrial/cronjob/README.md index 55ed8a1..d9343a8 100644 --- a/ndustrial/cronjob/README.md +++ b/ndustrial/cronjob/README.md @@ -10,6 +10,8 @@ | `ndustrial.name` | The name of the application (Required) | `nil` | | `ndustrial.organization` | The slug of the Organization that owns the application (Required) | `nil` | | `ndustrial.owner` | The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) | `nil` | +| `ndustrial.env` | The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) | `nil` | +| `ndustrial.version` | The app version being deployed | `nil` | | `contxt.stackId` | The ID of the Contxt Stack that this object belongs to (if applicable) | `nil` | | `contxt.serviceId` | The ID of the Contxt Service that this object belongs to (if applicable) | `nil` | | `contxt.serviceType` | The type of the Contxt Service that this object belongs to (if applicable) | `nil` | diff --git a/ndustrial/cronjob/_var_list.yml b/ndustrial/cronjob/_var_list.yml index cfeb0f1..f2efa3e 100644 --- a/ndustrial/cronjob/_var_list.yml +++ b/ndustrial/cronjob/_var_list.yml @@ -23,6 +23,14 @@ group: Global default: type: +- variable: ndustrial.env + group: Global + default: + type: +- variable: ndustrial.version + group: Global + default: + type: - variable: contxt.stackId group: Global default: diff --git a/ndustrial/cronjob/values.yaml b/ndustrial/cronjob/values.yaml index 10e5a88..cd315ee 100644 --- a/ndustrial/cronjob/values.yaml +++ b/ndustrial/cronjob/values.yaml @@ -18,6 +18,10 @@ ndustrial: organization: ## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) owner: + ## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) + env: + ## @param ndustrial.version The app version being deployed + version: contxt: ## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable) stackId: diff --git a/ndustrial/deployment/Chart.yaml b/ndustrial/deployment/Chart.yaml index 0c5ac0d..1be0104 100644 --- a/ndustrial/deployment/Chart.yaml +++ b/ndustrial/deployment/Chart.yaml @@ -5,12 +5,12 @@ type: application dependencies: - name: common repository: https://ndustrialio.github.io/charts - version: 0.1.3 + version: 0.1.4 tags: - ndustrial-common maintainers: - email: devops@ndustrial.io name: DevOps # Please make sure that version and appVersion are always the same. -version: 0.1.3 -appVersion: 0.1.3 +version: 0.1.4 +appVersion: 0.1.4 diff --git a/ndustrial/deployment/README.md b/ndustrial/deployment/README.md index de9dbb4..3ac8433 100644 --- a/ndustrial/deployment/README.md +++ b/ndustrial/deployment/README.md @@ -10,6 +10,8 @@ | `ndustrial.name` | The name of the application (Required) | `nil` | | `ndustrial.organization` | The slug of the Organization that owns the application (Required) | `nil` | | `ndustrial.owner` | The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) | `nil` | +| `ndustrial.env` | The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) | `nil` | +| `ndustrial.version` | The app version being deployed | `nil` | | `contxt.stackId` | The ID of the Contxt Stack that this object belongs to (if applicable) | `nil` | | `contxt.serviceId` | The ID of the Contxt Service that this object belongs to (if applicable) | `nil` | | `contxt.serviceType` | The type of the Contxt Service that this object belongs to (if applicable) | `nil` | @@ -61,7 +63,7 @@ | ---------------------------------- | ---------------------------------------------------- | ----------- | | `service.type` | Deployment service type | `ClusterIP` | | `service.port` | Deployment service HTTP port | `80` | -| `service.httpsPort` | Deployment service HTTPS port | `443` | +| `service.httpsPort` | Deployment service HTTPS port | `nil` | | `service.nodePorts.http` | Node port for HTTP | `nil` | | `service.nodePorts.https` | Node port for HTTPS | `nil` | | `service.clusterIP` | Deployment service Cluster IP | `nil` | diff --git a/ndustrial/deployment/_var_list.yml b/ndustrial/deployment/_var_list.yml index b194e75..5e35905 100644 --- a/ndustrial/deployment/_var_list.yml +++ b/ndustrial/deployment/_var_list.yml @@ -23,6 +23,14 @@ group: Global default: type: +- variable: ndustrial.env + group: Global + default: + type: +- variable: ndustrial.version + group: Global + default: + type: - variable: contxt.stackId group: Global default: @@ -157,8 +165,8 @@ type: number - variable: service.httpsPort group: Service - default: 443 - type: number + default: + type: - variable: service.nodePorts.http group: Service default: diff --git a/ndustrial/deployment/values.yaml b/ndustrial/deployment/values.yaml index 36cfcd5..deb7b50 100644 --- a/ndustrial/deployment/values.yaml +++ b/ndustrial/deployment/values.yaml @@ -18,6 +18,10 @@ ndustrial: organization: ## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) owner: + ## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) + env: + ## @param ndustrial.version The app version being deployed + version: contxt: ## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable) stackId: diff --git a/ndustrial/statefulset/Chart.yaml b/ndustrial/statefulset/Chart.yaml index fe63e54..f7e6a9c 100644 --- a/ndustrial/statefulset/Chart.yaml +++ b/ndustrial/statefulset/Chart.yaml @@ -5,12 +5,12 @@ type: application dependencies: - name: common repository: https://ndustrialio.github.io/charts - version: 0.1.3 + version: 0.1.4 tags: - ndustrial-common maintainers: - email: devops@ndustrial.io name: DevOps # Please make sure that version and appVersion are always the same. -version: 0.1.3 -appVersion: 0.1.3 +version: 0.1.4 +appVersion: 0.1.4 diff --git a/ndustrial/statefulset/README.md b/ndustrial/statefulset/README.md index a232279..6ec3d20 100644 --- a/ndustrial/statefulset/README.md +++ b/ndustrial/statefulset/README.md @@ -10,6 +10,8 @@ | `ndustrial.name` | The name of the application (Required) | `nil` | | `ndustrial.organization` | The slug of the Organization that owns the application (Required) | `nil` | | `ndustrial.owner` | The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) | `nil` | +| `ndustrial.env` | The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) | `nil` | +| `ndustrial.version` | The app version being deployed | `nil` | | `contxt.stackId` | The ID of the Contxt Stack that this object belongs to (if applicable) | `nil` | | `contxt.serviceId` | The ID of the Contxt Service that this object belongs to (if applicable) | `nil` | | `contxt.serviceType` | The type of the Contxt Service that this object belongs to (if applicable) | `nil` | @@ -30,6 +32,13 @@ | Name | Description | Value | | ------------------------------------ | -------------------------------------------------------------- | --------------- | | `replicaCount` | Number of Controller replicas | `1` | +| `startupProbe.enabled` | Enable startupProbe | `false` | +| `startupProbe.path` | Path for startupProbe | `/` | +| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `60` | +| `startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `1` | +| `startupProbe.failureThreshold` | Failure threshold for startupProbe | `3` | +| `startupProbe.successThreshold` | Success threshold for startupProbe | `1` | | `livenessProbe.enabled` | Enable livenessProbe | `true` | | `livenessProbe.path` | Path for livenessProbe | `/` | | `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `60` | @@ -54,7 +63,7 @@ | ---------------------------------- | ----------------------------------------------------- | ----------- | | `service.type` | StatefulSet service type | `ClusterIP` | | `service.port` | StatefulSet service HTTP port | `80` | -| `service.httpsPort` | StatefulSet service HTTPS port | `443` | +| `service.httpsPort` | StatefulSet service HTTPS port | `nil` | | `service.nodePorts.http` | Node port for HTTP | `nil` | | `service.nodePorts.https` | Node port for HTTPS | `nil` | | `service.clusterIP` | StatefulSet service Cluster IP | `nil` | diff --git a/ndustrial/statefulset/_var_list.yml b/ndustrial/statefulset/_var_list.yml index b743cf7..4a7b463 100644 --- a/ndustrial/statefulset/_var_list.yml +++ b/ndustrial/statefulset/_var_list.yml @@ -23,6 +23,14 @@ group: Global default: type: +- variable: ndustrial.env + group: Global + default: + type: +- variable: ndustrial.version + group: Global + default: + type: - variable: contxt.stackId group: Global default: @@ -55,6 +63,34 @@ group: StatefulSet default: 1 type: number +- variable: startupProbe.enabled + group: StatefulSet + default: false + type: boolean +- variable: startupProbe.path + group: StatefulSet + default: / + type: string +- variable: startupProbe.initialDelaySeconds + group: StatefulSet + default: 60 + type: number +- variable: startupProbe.periodSeconds + group: StatefulSet + default: 10 + type: number +- variable: startupProbe.timeoutSeconds + group: StatefulSet + default: 1 + type: number +- variable: startupProbe.failureThreshold + group: StatefulSet + default: 3 + type: number +- variable: startupProbe.successThreshold + group: StatefulSet + default: 1 + type: number - variable: livenessProbe.enabled group: StatefulSet default: true @@ -129,8 +165,8 @@ type: number - variable: service.httpsPort group: Service - default: 443 - type: number + default: + type: - variable: service.nodePorts.http group: Service default: diff --git a/ndustrial/statefulset/values.yaml b/ndustrial/statefulset/values.yaml index effbf96..3bc811e 100644 --- a/ndustrial/statefulset/values.yaml +++ b/ndustrial/statefulset/values.yaml @@ -18,6 +18,10 @@ ndustrial: organization: ## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required) owner: + ## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required) + env: + ## @param ndustrial.version The app version being deployed + version: contxt: ## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable) stackId: