Skip to content

Commit eec0082

Browse files
epwilkinsepwilkins
authored
Merge pull request #433 from boozallen/419-dev-update
[#419] port patch changes to dev
2 parents 40b4d6a + c9d1369 commit eec0082

File tree

4 files changed

+51
-41
lines changed

4 files changed

+51
-41
lines changed

‎extensions/extensions-helm/aissemble-policy-decision-point-chart/README.md‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,38 @@ helm install policy-decision-point oci://ghcr.io/boozallen/aissemble-policy-deci
99
**Note**: *the version should match the aiSSEMBLE project version.*
1010

1111
# Properties
12-
| Property | Description | Required Override | Default |
13-
|------------------------------|-------------------------------------------------------------------|-------------------|-----------------------------------------------------------------------------------|
14-
| app.name | Sets label for app.kubernetes.io/name | No | Chart.Name (aissemble-policy-decision-point-chart) |
15-
| app.version | Sets label for app.kubernetes.io/version | No | Chart.AppVersion (aiSSEMBLE project version) |
16-
| hostname | The hostname for the application | No | policy-decision-point |
17-
| image.name | The image name | Yes | boozallen/aissemble-policy-decision-point |
18-
| image.imagePullPolicy | The image pull policy | No | Always (ensure to pull from remote repository i.e. ghcr.io) |
19-
| image.dockerRepo | The image docker repository | No | ghcr.io/ |
20-
| image.tag | The image tag | No | Chart.AppVersion |
21-
| service.spec.ports | The service spec ports | No | - name: rest-api <br/>&emsp;&emsp;port: 8080 <br/>&emsp;&emsp;targetPort: 8080 |
22-
| deployment.ports | The deployment ports | No | - name: http-1 <br/>&emsp;&emsp;containerPort: 8080 <br/>&emsp;&emsp;protocol: TCP |
23-
| deployment.restartPolicy | The deployment restart policy | No | Always |
24-
| deployment.imagePullSecrets | The secrets to use for pulling any of the images used by this pod | No | [] |
12+
| Property | Description | Required Override | Default |
13+
|-------------------------------|-------------------------------------------------------------------|-------------------|------------------------------------------------------------------------------------|
14+
| app.name | Sets label for app.kubernetes.io/name | No | Chart.Name (aissemble-policy-decision-point-chart) |
15+
| app.version | Sets label for app.kubernetes.io/version | No | Chart.AppVersion (aiSSEMBLE project version) |
16+
| hostname | The hostname for the application | No | policy-decision-point |
17+
| image.name | The image name | Yes | boozallen/aissemble-policy-decision-point |
18+
| image.imagePullPolicy | The image pull policy | No | Always (ensure to pull from remote repository i.e. ghcr.io) |
19+
| image.dockerRepo | The image docker repository | No | ghcr.io/ |
20+
| image.tag | The image tag | No | Chart.AppVersion |
21+
| service.spec.ports | The service spec ports | No | - name: rest-api <br/>&emsp;&emsp;port: 8080 <br/>&emsp;&emsp;targetPort: 8080 |
22+
| deployment.ports | The deployment ports | No | - name: http-1 <br/>&emsp;&emsp;containerPort: 8080 <br/>&emsp;&emsp;protocol: TCP |
23+
| deployment.restartPolicy | The deployment restart policy | No | Always |
24+
| deployment.imagePullSecrets | The secrets to use for pulling any of the images used by this pod | No | [] |
2525

2626
# Migration from aiSSEMBLE v1 Helm Charts
2727
If you are migrating from the v1 version of the policy decision point chart, use the tables below to apply any existing customizations from the old chart to the new v2 chart.
2828

2929
## Property Location
3030
All properties listed below have been moved to the parent chart. If any properties are set to the default value, we recommend removing them from your values file entirely.
3131

32-
| Old Property Location | New Property Location |
33-
|--------------------------------------------|-------------------------------------------------------------------------|
34-
| app.name | aissemble-policy-decision-point-chart.app.name |
35-
| app.version | aissemble-policy-decision-point-chart.app.version |
36-
| hostname | aissemble-policy-decision-point-chart.hostname |
37-
| image.name | aissemble-policy-decision-point-chart.image.name |
38-
| image.imagePullPolicy | aissemble-policy-decision-point-chart.image.imagePullPolicy |
39-
| image.dockerRepo | aissemble-policy-decision-point-chart.image.dockerRepo |
40-
| image.tag | aissemble-policy-decision-point-chart.image.tag |
41-
| service.spec.ports | aissemble-policy-decision-point-chart.service.spec.ports |
42-
| deployment.ports | aissemble-policy-decision-point-chart.deployment.ports |
43-
| deployment.restartPolicy | aissemble-policy-decision-point-chart.deployment.restartPolicy |
32+
| Old Property Location | New Property Location |
33+
|--------------------------------------------|----------------------------------------------------------------|
34+
| app.name | aissemble-policy-decision-point-chart.app.name |
35+
| app.version | aissemble-policy-decision-point-chart.app.version |
36+
| hostname | aissemble-policy-decision-point-chart.hostname |
37+
| image.name | aissemble-policy-decision-point-chart.image.name |
38+
| image.imagePullPolicy | aissemble-policy-decision-point-chart.image.imagePullPolicy |
39+
| image.dockerRepo | aissemble-policy-decision-point-chart.image.dockerRepo |
40+
| image.tag | aissemble-policy-decision-point-chart.image.tag |
41+
| service.spec.ports | aissemble-policy-decision-point-chart.service.spec.ports |
42+
| deployment.ports | aissemble-policy-decision-point-chart.deployment.ports |
43+
| deployment.restartPolicy | aissemble-policy-decision-point-chart.deployment.restartPolicy |
4444

4545
## Property Removed
4646
The following properties no longer exist.

‎extensions/extensions-helm/extensions-helm-pipeline-invocation/aissemble-pipeline-invocation-app-chart/README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ helm install pipeline-invocation-service oci://ghcr.io/boozallen/aissemble-pipel
1010
**Note**: *the version should match the aiSSEMBLE project version.*
1111

1212
# Properties
13-
| Property | Description | Required Override | Default |
14-
|-------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------|-------------------|-----------------------------------------------------|
15-
| ingress.apiVersion | k8s API version to use | No | networking.k8s.io/v1 |
16-
| ingress.enabled | k8s Whether to enable ingress | No | false |
17-
| ingress.kind | Type of kubernetes entity | No | Ingress |
18-
| ingress.metadata.name | Name of the ingress | No | pipeline-invocation-service-web |
19-
| ingress.metadata.annotations.kubernetes.io/ingress.class | Ingress class name | No | nginx |
20-
| ingress.metadata.annotations.nginx.ingress.kubernetes.io/server-snippet | Custom configurations for the nginx ingress class | No | gunzip on; gzip on; gzip_proxied any; gzip_types *; |
21-
| ingress.spec.rules.hosts | A list of hosts for ingress to support, each with their own path definition | No | |
22-
| ingress.status | Load balancer IP if required | No | None |
23-
| rbac.createClusterRole | Create and use RBAC `ClusterRole` resources. | No | true |
13+
| Property | Description | Required Override | Default |
14+
|-------------------------------------------------------------------------|-----------------------------------------------------------------------------|-------------------|-----------------------------------------------------|
15+
| ingress.apiVersion | k8s API version to use | No | networking.k8s.io/v1 |
16+
| ingress.enabled | k8s Whether to enable ingress | No | false |
17+
| ingress.kind | Type of kubernetes entity | No | Ingress |
18+
| ingress.metadata.name | Name of the ingress | No | pipeline-invocation-service-web |
19+
| ingress.metadata.annotations.kubernetes.io/ingress.class | Ingress class name | No | nginx |
20+
| ingress.metadata.annotations.nginx.ingress.kubernetes.io/server-snippet | Custom configurations for the nginx ingress class | No | gunzip on; gzip on; gzip_proxied any; gzip_types *; |
21+
| ingress.spec.rules.hosts | A list of hosts for ingress to support, each with their own path definition | No | |
22+
| ingress.status | Load balancer IP if required | No | None |
23+
| rbac.createClusterRole | Create and use RBAC `ClusterRole` resources. | No | true |
2424

2525
# Quarkus Configuration
2626

‎foundation/foundation-mda/src/main/resources/templates/deployment/argocd/spark-operator.yaml.vm‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ spec:
3131
automated: {}
3232
{{- end }}
3333
{{- end }}
34-
{{/* This template comment explains how the logic below works*/}}
35-
{{- /* This one trims the newlines so it doesn't affect output */ -}}
36-
#these options are important
3734
syncOptions:
3835
- ServerSideApply=true # https://github.com/argoproj/argo-cd/issues/820#issuecomment-135463693
3936
{{- if .Values.spec.syncPolicy }}

‎foundation/foundation-mda/src/main/resources/templates/deployment/argocd/v2/spark.operator.yaml.vm‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,18 @@ spec:
2323
{{ end }}
2424
{{- with .Values.spec.syncPolicy }}
2525
syncPolicy:
26-
{{- toYaml . | nindent 4 }}
27-
{{- end }}
26+
{{- with .Values.spec.syncPolicy }}
27+
{{- if .automated }}
28+
automated:
29+
{{- toYaml .automated | nindent 6}}
30+
{{- else if hasKey . "automated" }}
31+
automated: {}
32+
{{- end }}
33+
{{- end }}
34+
syncOptions:
35+
- ServerSideApply=true # https://github.com/argoproj/argo-cd/issues/820#issuecomment-135463693
36+
{{- if .Values.spec.syncPolicy }}
37+
{{- with .Values.spec.syncPolicy.syncOptions }}
38+
{{- toYaml . | nindent 6 }}
39+
{{- end }}
40+
{{- end }}

0 commit comments

Comments
 (0)