-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added: Ingress for the configmanager DB migration init container README and helm chart values generated from values.yaml Fixes: Some labeling and annotations Spurious use of configMap
- Loading branch information
1 parent
2f76d05
commit f8f68bb
Showing
7 changed files
with
262 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| apiVersion: v2 | ||
| name: configmanager | ||
| appVersion: 0.1.1 | ||
| appVersion: 1.1.0 | ||
| description: A generated Helm Chart for Soniclabs T&M configmanager | ||
| version: 0.0.6 | ||
| version: 1.0.0 | ||
| type: application | ||
| maintainers: | ||
| - name: cdecatapult | ||
| url: cdecatapult.github.io/soniclabs-helmcharts | ||
| dependencies: | ||
| - name: postgresql | ||
| version: '^12.1.14' | ||
| version: '^12.x.x' | ||
| repository: https://charts.bitnami.com/bitnami | ||
| condition: postgresql.enabled |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| # ConfigManager | ||
|
|
||
| ## Parameters | ||
|
|
||
| ### ConfigManager Parameters | ||
|
|
||
| | Name | Description | Value | | ||
| | -------------------------- | ----------------------------------------------------------------------- | ---------------- | | ||
| | `config.replicaCount` | The amount of containers to run | `1` | | ||
| | `config.type` | The type of service to create | `LoadBalancer` | | ||
| | `config.appPort` | The port to expose the service and application on | `8000` | | ||
| | `config.nodePort` | The nodePort to use if the the service type is LoadBalancer or NodePort | `30342` | | ||
| | `config.commonAnnotations` | The annotations to set on the Config Manager application | `{}` | | ||
| | `config.debug` | Whether or not to enable debug mode for the application | `False` | | ||
| | `config.logLevel` | The log level to use for the application | `DEBUG` | | ||
| | `config.gui.host` | The hostname of the GUI service | `portal` | | ||
| | `config.gui.port` | The port of the GUI service | `8000` | | ||
| | `config.sma.host` | The hostname of the Suite Manager service | `suitemanager` | | ||
| | `config.sma.port` | The port of the Suite Manager service | `8000` | | ||
| | `config.tma.host` | The hostname of the Test Manager service | `testmanager` | | ||
| | `config.tma.port` | The port of the Test Manager service | `8000` | | ||
| | `config.rma.host` | The hostname of the Results Manager service | `resultsmanager` | | ||
| | `config.rma.port` | The port of the Results Manager service | `8000` | | ||
| | `config.apg.host` | The hostname of the API Gateway service | `apigateway` | | ||
| | `config.apg.port` | The port of the API Gateway service | `8000` | | ||
| | `config.dma.host` | The hostname of the Deploy Manager service | `deploymanager` | | ||
| | `config.dma.port` | The port of the Deploy Manager service | `8000` | | ||
|
|
||
| ### ConfigManager Image Parameters | ||
|
|
||
| | Name | Description | Value | | ||
| | ------------------- | ---------------------------------------------------- | --------------------------------------------- | | ||
| | `image.repository` | The repository to use for the Config Manager image | `ghcr.io/cdecatapult/soniclabs-configmanager` | | ||
| | `image.pullPolicy` | The pull policy to use for the Config Manager image | `Always` | | ||
| | `image.tag` | The tag to use for the Config Manager image | `v1.1.0` | | ||
| | `image.pullSecrets` | The pull secrets to use for the Config Manager image | `["soniclabs"]` | | ||
|
|
||
| ### ConfigManager Ingress parameters | ||
|
|
||
| | Name | Description | Value | | ||
| | --------------------------- | ------------------------------------------------------------------------ | --------------------- | | ||
| | `ingress.enabled` | Whether or not to enable the ingress for the Config Manager application | `true` | | ||
| | `ingress.annotations` | The annotations to set on the ingress for the Config Manager application | `{}` | | ||
| | `ingress.ingressClassName` | The ingress class to use for the Config Manager application | `""` | | ||
| | `ingress.hostname` | The hostname to use for the Config Manager application | `configmanager.local` | | ||
| | `ingress.paths` | The paths to use for the Config Manager application | | | ||
| | `ingress.paths[0].path` | The path to use for the Config Manager application | `/api/cma` | | ||
| | `ingress.paths[0].pathType` | The path type to use for the Config Manager application | `Prefix` | | ||
|
|
||
| ### ConfigManager ServiceAccount parameters | ||
|
|
||
| | Name | Description | Value | | ||
| | ---------------------------- | ------------------------------------------------------------------------- | ------- | | ||
| | `serviceAccount.create` | Whether or not to create a service account for the Config Manager service | `false` | | ||
| | `serviceAccount.annotations` | The annotations to use for the Config Manager service account | `{}` | | ||
| | `serviceAccount.name` | The name of the service account to use for the Config Manager service | `""` | | ||
|
|
||
| ### ConfigManager PostgreSQL parameters | ||
|
|
||
| | Name | Description | Value | | ||
| | --------------------------------------------- | ------------------------------------------------------------------------------- | --------------- | | ||
| | `postgresql.enabled` | Whether or not to enable the PostgreSQL SubChart for the Config Manager service | `true` | | ||
| | `postgresql.primary.service.ports.postgresql` | The port to expose the PostgreSQL database service on | `5432` | | ||
| | `postgresql.auth.username` | The username to use for the PostgreSQL database | `tamuser` | | ||
| | `postgresql.auth.password` | The password to use for the PostgreSQL database | `tampassword` | | ||
| | `postgresql.auth.database` | The name of the database to use for the PostgreSQL database | `configmanager` | |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| {{- if .Values.ingress.enabled }} | ||
| --- | ||
| apiVersion: networking.k8s.io/v1 | ||
| kind: Ingress | ||
| metadata: | ||
| name: {{ include "configmanager.fullname" . }}-app | ||
| labels: | ||
| {{- include "configmanager.labels" . | nindent 4 }} | ||
| {{- if or .Values.ingress.annotations .Values.config.commonAnnotations }} | ||
| annotations: | ||
| {{- if .Values.ingress.annotations }} | ||
| {{- toYaml .Values.ingress.annotations | nindent 4 }} | ||
| {{- end }} | ||
| {{- if .Values.config.commonAnnotations }} | ||
| {{- toYaml .Values.config.commonAnnotations | nindent 4 }} | ||
| {{- end }} | ||
| {{- end }} | ||
| spec: | ||
| {{ if .Values.ingress.ingressClassName }} | ||
| ingressClassName: {{ .Values.ingress.ingressClassName | quote }} | ||
| {{ end }} | ||
| rules: | ||
| - host: {{ .Values.ingress.hostname }} | ||
| http: | ||
| paths: | ||
| {{- range .Values.ingress.paths }} | ||
| - path: {{ .path }} | ||
| pathType: {{ .pathType }} | ||
| {{- end }} | ||
| backend: | ||
| service: | ||
| name: {{ include "configmanager.fullname" . }} | ||
| port: | ||
| number: {{ $.Values.config.appPort }} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,102 @@ | ||
| postgresql: | ||
| enabled: true | ||
| auth: | ||
| username: tamuser | ||
| password: tampassword | ||
| database: configmanager | ||
|
|
||
| ## @section ConfigManager Parameters | ||
| ## | ||
| config: | ||
| ## @param config.replicaCount The amount of containers to run | ||
| replicaCount: 1 | ||
| appPort: 8000 | ||
| ## @param config.type The type of service to create | ||
| type: LoadBalancer | ||
| ## @param config.appPort The port to expose the service and application on | ||
| appPort: 8000 | ||
| ## @param config.nodePort The nodePort to use if the the service type is LoadBalancer or NodePort | ||
| nodePort: 30342 | ||
| debug: "True" | ||
| ## @param config.commonAnnotations The annotations to set on the Config Manager application | ||
| commonAnnotations: {} | ||
| ## @param config.debug Whether or not to enable debug mode for the application | ||
| debug: "False" | ||
| ## @param config.logLevel The log level to use for the application | ||
| logLevel: DEBUG | ||
| guiHost: portal | ||
| guiPort: 8000 | ||
| smaHost: suitemanager | ||
| smaPort: 8000 | ||
| tmaHost: testmanager | ||
| tmaPort: 8000 | ||
| rmaHost: resultsmanager | ||
| rmaPort: 8000 | ||
| apgHost: apigateway | ||
| apgPort: 8000 | ||
| dmaHost: deploymanager | ||
| dmaPort: 8000 | ||
| gui: | ||
| ## @param config.gui.host The hostname of the GUI service | ||
| host: portal | ||
| ## @param config.gui.port The port of the GUI service | ||
| port: 8000 | ||
| sma: | ||
| ## @param config.sma.host The hostname of the Suite Manager service | ||
| host: suitemanager | ||
| ## @param config.sma.port The port of the Suite Manager service | ||
| port: 8000 | ||
| tma: | ||
| ## @param config.tma.host The hostname of the Test Manager service | ||
| host: testmanager | ||
| ## @param config.tma.port The port of the Test Manager service | ||
| port: 8000 | ||
| rma: | ||
| ## @param config.rma.host The hostname of the Results Manager service | ||
| host: resultsmanager | ||
| ## @param config.rma.port The port of the Results Manager service | ||
| port: 8000 | ||
| apg: | ||
| ## @param config.apg.host The hostname of the API Gateway service | ||
| host: apigateway | ||
| ## @param config.apg.port The port of the API Gateway service | ||
| port: 8000 | ||
| dma: | ||
| ## @param config.dma.host The hostname of the Deploy Manager service | ||
| host: deploymanager | ||
| ## @param config.dma.port The port of the Deploy Manager service | ||
| port: 8000 | ||
|
|
||
| ## @section ConfigManager Image Parameters | ||
| image: | ||
| ## @param image.repository The repository to use for the Config Manager image | ||
| repository: ghcr.io/cdecatapult/soniclabs-configmanager | ||
| ## @param image.pullPolicy The pull policy to use for the Config Manager image | ||
| pullPolicy: Always | ||
| tag: sha256:ee67c1d87d9f0c9b4438cf6d10d025f9995200c36cdccb7544cb77bf99f225b3 | ||
| ## @param image.tag The tag to use for the Config Manager image | ||
| tag: v1.1.0 | ||
| ## @param image.pullSecrets The pull secrets to use for the Config Manager image | ||
| pullSecrets: ['soniclabs'] | ||
|
|
||
| autoscaling: | ||
| enabled: false | ||
| minReplicas: 1 | ||
| maxReplicas: 100 | ||
| targetCPUUtilizationPercentage: 80 | ||
| ## @section ConfigManager Ingress parameters | ||
| ## | ||
| ingress: | ||
| ## @param ingress.enabled Whether or not to enable the ingress for the Config Manager application | ||
| enabled: true | ||
| ## @param ingress.annotations The annotations to set on the ingress for the Config Manager application | ||
| annotations: {} | ||
| ## @param ingress.ingressClassName The ingress class to use for the Config Manager application | ||
| ingressClassName: "" | ||
| ## @param ingress.hostname The hostname to use for the Config Manager application | ||
| hostname: configmanager.local | ||
| ## @extra ingress.paths The paths to use for the Config Manager application | ||
| paths: | ||
| ## @param ingress.paths[0].path The path to use for the Config Manager application | ||
| ## @param ingress.paths[0].pathType The path type to use for the Config Manager application | ||
| - path: /api/cma | ||
| pathType: Prefix | ||
|
|
||
| ## @section ConfigManager ServiceAccount parameters | ||
| serviceAccount: | ||
| ## @param serviceAccount.create Whether or not to create a service account for the Config Manager service | ||
| create: false | ||
| ## @param serviceAccount.annotations The annotations to use for the Config Manager service account | ||
| annotations: {} | ||
| ## @param serviceAccount.name The name of the service account to use for the Config Manager service | ||
| name: "" | ||
|
|
||
| ## @section ConfigManager PostgreSQL parameters | ||
| postgresql: | ||
| ## @param postgresql.enabled Whether or not to enable the PostgreSQL SubChart for the Config Manager service | ||
| enabled: true | ||
| ## @param postgresql.primary.service.ports.postgresql The port to expose the PostgreSQL database service on | ||
| primary: | ||
| service: | ||
| ports: | ||
| postgresql: 5432 | ||
| auth: | ||
| ## @param postgresql.auth.username The username to use for the PostgreSQL database | ||
| username: tamuser | ||
| ## @param postgresql.auth.password The password to use for the PostgreSQL database | ||
| password: tampassword | ||
| ## @param postgresql.auth.database The name of the database to use for the PostgreSQL database | ||
| database: configmanager |