Skip to content

Commit

Permalink
Helm: Updated chart and documentation for 2.8.0 release. (#1373)
Browse files Browse the repository at this point in the history
  • Loading branch information
@karok2m
karok2m authored Sep 2, 2021
1 parent 63476b6 commit c02c574
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 449 deletions.
8 changes: 4 additions & 4 deletions deploy/helm/azure-industrial-iot/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ $ az eventhubs eventhub create --resource-group MyResourceGroup --namespace-name
##### Azure Event Hub Consumer Groups
Please create a consumer group for the Event Hub. For example, you can call it `telemetry_ux`.
Please create a consumer group for the Event Hub. For example, you can call it `telemetry_ux`.
These can be created with the commands bellow. More details about the command and its
parameters can be found
[here](https://docs.microsoft.com/cli/azure/eventhubs/eventhub/consumer-group?view=azure-cli-latest#az-eventhubs-eventhub-consumer-group-create).
Expand Down Expand Up @@ -457,7 +457,7 @@ The following details of the Azure Log Analytics Workspace would be required:
## Installing the Chart
This chart installs `2.8` version of components by default.
This chart installs `2.8.0` version of components by default.
To install the chart first ensure that you have added `azure-iiot` repository:
Expand Down Expand Up @@ -519,7 +519,7 @@ values.
| Parameter | Description | Default |
|---------------------|------------------------------------------|---------------------|
| `image.registry` | URL of Docker Image Registry | `mcr.microsoft.com` |
| `image.tag` | Image tag | `2.8` |
| `image.tag` | Image tag | `2.8.0` |
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `image.pullSecrets` | docker-registry secret names as an array | `[]` |
Expand Down Expand Up @@ -597,7 +597,7 @@ A few notes about `loadConfFromKeyVault`:
result in an error. This is because for loading configuration from Azure Key Vault we require both
`azure.auth.servicesApp.appId` and `azure.auth.servicesApp.secret`.
* You should use `loadConfFromKeyVault` only when Azure environment has been created for the same version
(major and minor) of Azure Industrial IoT components. That is, you should use it to install the chart that
(major and minor) of Azure Industrial IoT components. That is, you should not use it to install the chart that
deploys `2.8.x` or `2.7.x` version of components to the environment that has been created for `2.6.x` version of
components.
Expand Down
54 changes: 2 additions & 52 deletions deploy/helm/azure-industrial-iot/templates/10_industrial_iot_env_secret.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@ values can be provided, which will reslut in overrides values received from Azur
{{- if .Values.azure.iotHub.eventHub.consumerGroup.telemetry }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_TELEMETRY: {{ .Values.azure.iotHub.eventHub.consumerGroup.telemetry | b64enc }}
{{- end }}
{{- if .Values.azure.iotHub.eventHub.consumerGroup.tunnel }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_TUNNEL: {{ .Values.azure.iotHub.eventHub.consumerGroup.tunnel | b64enc }}
{{- end }}
{{- if .Values.azure.iotHub.eventHub.consumerGroup.onboarding }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_ONBOARDING: {{ .Values.azure.iotHub.eventHub.consumerGroup.onboarding | b64enc }}
{{- end }}
Expand All @@ -54,26 +51,13 @@ values can be provided, which will reslut in overrides values received from Azur
{{- if .Values.azure.storageAccount.container.dataProtection.name }}
PCS_STORAGE_CONTAINER_DATAPROTECTION: {{ .Values.azure.storageAccount.container.dataProtection.name | b64enc }}
{{- end }}
{{- /* ADLS Gen2 Storage Account */}}
{{- if .Values.azure.adlsg2.connectionString }}
PCS_ADLSG2_CONNSTRING: {{ .Values.azure.adlsg2.connectionString | b64enc }}
{{- end }}
{{- if .Values.azure.adlsg2.container.cdm.name }}
PCS_ADLSG2_CONTAINER_CDM: {{ .Values.azure.adlsg2.container.cdm.name | b64enc }}
{{- end }}
{{- if .Values.azure.adlsg2.container.cdm.rootFolder }}
PCS_ADLSG2_CONTAINER_CDM_ROOTFOLDER: {{ .Values.azure.adlsg2.container.cdm.rootFolder | b64enc }}
{{- end }}
{{- /* Event Hub Namespace and Event Hubs */}}
{{- if .Values.azure.eventHubNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString }}
PCS_EVENTHUB_CONNSTRING: {{ .Values.azure.eventHubNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString | b64enc }}
{{- end }}
{{- if .Values.azure.eventHubNamespace.eventHub.name }}
PCS_EVENTHUB_NAME: {{ .Values.azure.eventHubNamespace.eventHub.name | b64enc }}
{{- end }}
{{- if .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm }}
PCS_EVENTHUB_CONSUMERGROUP_TELEMETRY_CDM: {{ .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm | b64enc }}
{{- end }}
{{- if .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx }}
PCS_EVENTHUB_CONSUMERGROUP_TELEMETRY_UX: {{ .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx | b64enc }}
{{- end }}
Expand Down Expand Up @@ -191,11 +175,6 @@ values can be provided, which will reslut in overrides values received from Azur
{{- else }}
PCS_HISTORY_SERVICE_PATH_BASE: ""
{{- end }}
{{- if .Values.deployment.microServices.gateway.enabled }}
PCS_GATEWAY_SERVICE_PATH_BASE: {{ required "A valid .Values.apps.urlPathBase.gateway is required!" .Values.apps.urlPathBase.gateway | b64enc }}
{{- else }}
PCS_GATEWAY_SERVICE_PATH_BASE: ""
{{- end }}
{{- if .Values.deployment.microServices.publisher.enabled }}
PCS_PUBLISHER_SERVICE_PATH_BASE: {{ required "A valid .Values.apps.urlPathBase.publisher is required!" .Values.apps.urlPathBase.publisher | b64enc }}
{{- else }}
Expand Down Expand Up @@ -241,10 +220,9 @@ the chart and result in an entry in this Secret.
{{- if .Values.azure.iotHub.eventHub.consumerGroup }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_EVENTS: {{ required "A valid .Values.azure.iotHub.eventHub.consumerGroup.events is required!" .Values.azure.iotHub.eventHub.consumerGroup.events | b64enc }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_TELEMETRY: {{ required "A valid .Values.azure.iotHub.eventHub.consumerGroup.telemetry is required!" .Values.azure.iotHub.eventHub.consumerGroup.telemetry | b64enc }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_TUNNEL: {{ required "A valid .Values.azure.iotHub.eventHub.consumerGroup.tunnel is required!" .Values.azure.iotHub.eventHub.consumerGroup.tunnel | b64enc }}
PCS_IOTHUB_EVENTHUB_CONSUMER_GROUP_ONBOARDING: {{ required "A valid .Values.azure.iotHub.eventHub.consumerGroup.onboarding is required!" .Values.azure.iotHub.eventHub.consumerGroup.onboarding | b64enc }}
{{- else }}
{{- fail "Valid .Values.azure.iotHub.eventHub.consumerGroup.events, .Values.azure.iotHub.eventHub.consumerGroup.telemetry, .Values.azure.iotHub.eventHub.consumerGroup.tunnel and .Values.azure.iotHub.eventHub.consumerGroup.onboarding are required!" }}
{{- fail "Valid .Values.azure.iotHub.eventHub.consumerGroup.events, .Values.azure.iotHub.eventHub.consumerGroup.telemetry and .Values.azure.iotHub.eventHub.consumerGroup.onboarding are required!" }}
{{- end }}
{{- /* Cosmos DB */}}
PCS_COSMOSDB_CONNSTRING: {{ required "A valid .Values.azure.cosmosDB.connectionString is required!" .Values.azure.cosmosDB.connectionString | b64enc }}
Expand All @@ -263,36 +241,13 @@ the chart and result in an entry in this Secret.
{{- else }}
PCS_STORAGE_CONTAINER_DATAPROTECTION: ""
{{- end }}
{{- /* ADLS Gen2 Storage Account */}}
{{- if .Values.deployment.microServices.telemetryCdmProcessor.enabled }}
PCS_ADLSG2_CONNSTRING: {{ required "A valid .Values.azure.adlsg2.connectionString is required!" .Values.azure.adlsg2.connectionString | b64enc }}
PCS_ADLSG2_CONTAINER_CDM: {{ required "A valid .Values.azure.adlsg2.container.cdm.name is required!" .Values.azure.adlsg2.container.cdm.name | b64enc }}
PCS_ADLSG2_CONTAINER_CDM_ROOTFOLDER: {{ required "A valid .Values.azure.adlsg2.container.cdm.rootFolder is required!" .Values.azure.adlsg2.container.cdm.rootFolder | b64enc }}
{{- else }}
PCS_ADLSG2_CONNSTRING: ""
PCS_ADLSG2_CONTAINER_CDM: ""
PCS_ADLSG2_CONTAINER_CDM_ROOTFOLDER: ""
{{- end }}
{{- /* Event Hub Namespace and Event Hubs */}}
PCS_EVENTHUB_CONNSTRING: {{ required "A valid .Values.azure.eventHubNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString is required!" .Values.azure.eventHubNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString | b64enc }}
PCS_EVENTHUB_NAME: {{ required "A valid .Values.azure.eventHubNamespace.eventHub.name is required!" .Values.azure.eventHubNamespace.eventHub.name | b64enc }}
{{- if .Values.azure.eventHubNamespace.eventHub.consumerGroup }}
{{- if .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm }}
{{- if .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx }}
{{- if eq ( trim .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm ) ( trim .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx ) }}
{{- fail ".Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm and .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx should have different values!" }}
{{- else }}
PCS_EVENTHUB_CONSUMERGROUP_TELEMETRY_CDM: {{ required "A valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm is required!" .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm | b64enc }}
PCS_EVENTHUB_CONSUMERGROUP_TELEMETRY_UX: {{ required "A valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx is required!" .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx | b64enc }}
{{- end }}
{{- else }}
{{- fail "A valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx is required!" }}
{{- end }}
{{- else }}
{{- fail "A valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm is required!" }}
{{- end }}
{{- else }}
{{- fail "Valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryCdm and .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx are required!" }}
{{- fail "Valid .Values.azure.eventHubNamespace.eventHub.consumerGroup.telemetryUx is required!" }}
{{- end }}
{{- /* Service Bus */}}
PCS_SERVICEBUS_CONNSTRING: {{ required "A valid .Values.azure.serviceBusNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString is required!" .Values.azure.serviceBusNamespace.sharedAccessPolicies.rootManageSharedAccessKey.connectionString | b64enc }}
Expand Down Expand Up @@ -432,11 +387,6 @@ the chart and result in an entry in this Secret.
{{- else }}
PCS_HISTORY_SERVICE_PATH_BASE: ""
{{- end }}
{{- if .Values.deployment.microServices.gateway.enabled }}
PCS_GATEWAY_SERVICE_PATH_BASE: {{ required "A valid .Values.apps.urlPathBase.gateway is required!" .Values.apps.urlPathBase.gateway | b64enc }}
{{- else }}
PCS_GATEWAY_SERVICE_PATH_BASE: ""
{{- end }}
{{- if .Values.deployment.microServices.publisher.enabled }}
PCS_PUBLISHER_SERVICE_PATH_BASE: {{ required "A valid .Values.apps.urlPathBase.publisher is required!" .Values.apps.urlPathBase.publisher | b64enc }}
{{- else }}
Expand Down
84 changes: 0 additions & 84 deletions deploy/helm/azure-industrial-iot/templates/23_gateway_deployment.yaml
View file

This file was deleted.

58 changes: 0 additions & 58 deletions deploy/helm/azure-industrial-iot/templates/23_gateway_svc.yaml
View file

This file was deleted.

Loading

0 comments on commit c02c574

Please sign in to comment.