Skip to content

Commit

Permalink
Merge pull request #10 from ndustrialio/ndustrial-labels
Browse files Browse the repository at this point in the history
update chart depends
  • Loading branch information
kalinon authored Jun 24, 2021
2 parents 397370a + eaef9da commit cb88ac1
Show file tree
Hide file tree
Showing 15 changed files with 247 additions and 72 deletions.
6 changes: 3 additions & 3 deletions ndustrial/cronjob/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
digest: sha256:02710fcbd3bc77bfdb726980c7c0fb417eccc9bcf04d16e4cce0304a3b332a79
generated: "2021-06-17T19:17:00.3196653Z"
version: 0.1.5
digest: sha256:0e3593bbf3facd4ee2ddc28b2f7f43ffa955271bc3950d581dcde6c37dbf7acc
generated: "2021-06-24T20:27:31.2346371Z"
6 changes: 3 additions & 3 deletions ndustrial/cronjob/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type: application
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
version: 0.1.5
tags:
- ndustrial-common
sources:
Expand All @@ -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.3
appVersion: 0.1.3
version: 0.1.4
appVersion: 0.1.4
34 changes: 21 additions & 13 deletions ndustrial/cronjob/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@

### Global parameters

| Name | Description | Value |
| ------------------------- | ------------------------------------------------------------------------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `nil` |
| `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` |
| Name | Description | Value |
| ----------------------------- | ------------------------------------------------------------------------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `nil` |
| `ndustrial.name` | The name of the application/service. (Required) | `""` |
| `ndustrial.organization` | The slug of the Organization that owns the application (Required) | `""` |
| `ndustrial.owner` | The person/team that owns this service. (Required) | `nil` |
| `ndustrial.managed_by` | 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) | `""` |
| `ndustrial.version` | The app version being deployed (Required) | `""` |
| `ndustrial.repo` | The github repository where the code exists (populated by CI/CD) | `""` |
| `ndustrial.project` | | `{}` |
| `ndustrial.project.slug` | Unique project id that this repository belongs too (Required) | `""` |
| `ndustrial.project.type` | The service type of this deployment (api, database, backend, frontend, etl, etc...) (Required) | `""` |
| `ndustrial.depends` | List of projects/services this serivce depends on | `[]` |
| `ndustrial.depends.0.project` | The name of the project that this service depends on | `""` |
| `ndustrial.depends.0.name` | The name of the project service | `""` |
| `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` |


### Common parameters
Expand Down
32 changes: 32 additions & 0 deletions ndustrial/cronjob/_var_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
group: Global
default:
type:
- variable: ndustrial.managed_by
group: Global
default:
type:
- variable: ndustrial.env
group: Global
default:
Expand All @@ -31,6 +35,34 @@
group: Global
default:
type:
- variable: ndustrial.repo
group: Global
default:
type:
- variable: ndustrial.project
group: Global
default:
type:
- variable: ndustrial.project.slug
group: Global
default:
type:
- variable: ndustrial.project.type
group: Global
default:
type:
- variable: ndustrial.depends
group: Global
default: &1 []
type:
- variable: ndustrial.depends.0.project
group: Global
default: *1
type:
- variable: ndustrial.depends.0.name
group: Global
default: *1
type:
- variable: contxt.stackId
group: Global
default:
Expand Down
29 changes: 24 additions & 5 deletions ndustrial/cronjob/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,35 @@ global:
storageClass:

ndustrial:
## @param ndustrial.name The name of the application (Required)
## @param ndustrial.name [string] The name of the application/service. (Required)
# Should match gitrepository name (if able)
name:
## @param ndustrial.organization The slug of the Organization that owns the application (Required)
## @param ndustrial.organization [string] The slug of the Organization that owns the application (Required)
organization:
## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
## @param ndustrial.owner The person/team that owns this service. (Required)
owner:
## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required)
## @param ndustrial.managed_by The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
managed_by:
## @param ndustrial.env [string] 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
## @param ndustrial.version [string] The app version being deployed (Required)
version:

## @param ndustrial.repo [string] The github repository where the code exists (populated by CI/CD)
repo:

## @param ndustrial.project [object]
project:
## @param ndustrial.project.slug [string] Unique project id that this repository belongs too (Required)
slug:
## @param ndustrial.project.type [string] The service type of this deployment (api, database, backend, frontend, etl, etc...) (Required)
type:

## @param ndustrial.depends [array] List of projects/services this serivce depends on
## @param ndustrial.depends.0.project [string] The name of the project that this service depends on
## @param ndustrial.depends.0.name [string] The name of the project service
depends: []

contxt:
## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable)
stackId:
Expand Down
6 changes: 3 additions & 3 deletions ndustrial/deployment/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
digest: sha256:02710fcbd3bc77bfdb726980c7c0fb417eccc9bcf04d16e4cce0304a3b332a79
generated: "2021-06-17T19:17:02.0522688Z"
version: 0.1.5
digest: sha256:0e3593bbf3facd4ee2ddc28b2f7f43ffa955271bc3950d581dcde6c37dbf7acc
generated: "2021-06-24T20:27:32.8589353Z"
6 changes: 3 additions & 3 deletions ndustrial/deployment/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ type: application
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
version: 0.1.5
tags:
- ndustrial-common
maintainers:
- email: devops@ndustrial.io
name: DevOps
# Please make sure that version and appVersion are always the same.
version: 0.1.4
appVersion: 0.1.4
version: 0.1.5
appVersion: 0.1.5
34 changes: 21 additions & 13 deletions ndustrial/deployment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,27 @@

### Global parameters

| Name | Description | Value |
| ------------------------- | ------------------------------------------------------------------------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `nil` |
| `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` |
| Name | Description | Value |
| ----------------------------- | ------------------------------------------------------------------------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `nil` |
| `ndustrial.name` | The name of the application/service. (Required) | `""` |
| `ndustrial.organization` | The slug of the Organization that owns the application (Required) | `""` |
| `ndustrial.owner` | The person/team that owns this service. (Required) | `nil` |
| `ndustrial.managed_by` | 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) | `""` |
| `ndustrial.version` | The app version being deployed (Required) | `""` |
| `ndustrial.repo` | The github repository where the code exists (populated by CI/CD) | `""` |
| `ndustrial.project` | | `{}` |
| `ndustrial.project.slug` | Unique project id that this repository belongs too (Required) | `""` |
| `ndustrial.project.type` | The service type of this deployment (api, database, backend, frontend, etl, etc...) (Required) | `""` |
| `ndustrial.depends` | List of projects/services this serivce depends on | `[]` |
| `ndustrial.depends.0.project` | The name of the project that this service depends on | `""` |
| `ndustrial.depends.0.name` | The name of the project service | `""` |
| `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` |


### Common parameters
Expand Down
32 changes: 32 additions & 0 deletions ndustrial/deployment/_var_list.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
group: Global
default:
type:
- variable: ndustrial.managed_by
group: Global
default:
type:
- variable: ndustrial.env
group: Global
default:
Expand All @@ -31,6 +35,34 @@
group: Global
default:
type:
- variable: ndustrial.repo
group: Global
default:
type:
- variable: ndustrial.project
group: Global
default:
type:
- variable: ndustrial.project.slug
group: Global
default:
type:
- variable: ndustrial.project.type
group: Global
default:
type:
- variable: ndustrial.depends
group: Global
default: &1 []
type:
- variable: ndustrial.depends.0.project
group: Global
default: *1
type:
- variable: ndustrial.depends.0.name
group: Global
default: *1
type:
- variable: contxt.stackId
group: Global
default:
Expand Down
28 changes: 23 additions & 5 deletions ndustrial/deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,34 @@ global:
storageClass:

ndustrial:
## @param ndustrial.name The name of the application (Required)
## @param ndustrial.name [string] The name of the application/service. (Required)
# Should match gitrepository name (if able)
name:
## @param ndustrial.organization The slug of the Organization that owns the application (Required)
## @param ndustrial.organization [string] The slug of the Organization that owns the application (Required)
organization:
## @param ndustrial.owner The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
## @param ndustrial.owner The person/team that owns this service. (Required)
owner:
## @param ndustrial.env The environment being deployed into Should most likely be one of: dev, staging, prod, or qa. (Required)
## @param ndustrial.managed_by The service which manages the kubernetes object Should most likely be one of: helm, contxt, fleet. (Required)
managed_by:
## @param ndustrial.env [string] 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
## @param ndustrial.version [string] The app version being deployed (Required)
version:

## @param ndustrial.repo [string] The github repository where the code exists (populated by CI/CD)
repo:

## @param ndustrial.project [object]
project:
## @param ndustrial.project.slug [string] Unique project id that this repository belongs too (Required)
slug:
## @param ndustrial.project.type [string] The service type of this deployment (api, database, backend, frontend, etl, etc...) (Required)
type:

## @param ndustrial.depends [array] List of projects/services this serivce depends on
## @param ndustrial.depends.0.project [string] The name of the project that this service depends on
## @param ndustrial.depends.0.name [string] The name of the project service
depends: []
contxt:
## @param contxt.stackId The ID of the Contxt Stack that this object belongs to (if applicable)
stackId:
Expand Down
6 changes: 3 additions & 3 deletions ndustrial/statefulset/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
digest: sha256:02710fcbd3bc77bfdb726980c7c0fb417eccc9bcf04d16e4cce0304a3b332a79
generated: "2021-06-17T19:17:03.7441453Z"
version: 0.1.5
digest: sha256:0e3593bbf3facd4ee2ddc28b2f7f43ffa955271bc3950d581dcde6c37dbf7acc
generated: "2021-06-24T20:27:34.4773057Z"
6 changes: 3 additions & 3 deletions ndustrial/statefulset/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ type: application
dependencies:
- name: common
repository: https://ndustrialio.github.io/charts
version: 0.1.4
version: 0.1.5
tags:
- ndustrial-common
maintainers:
- email: devops@ndustrial.io
name: DevOps
# Please make sure that version and appVersion are always the same.
version: 0.1.4
appVersion: 0.1.4
version: 0.1.5
appVersion: 0.1.5
Loading

0 comments on commit cb88ac1

Please sign in to comment.