Skip to content

Commit

Permalink
[#419] port patch changes to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewilkins-csi
ewilkins-csi committed Oct 23, 2024
1 parent 91857d9 commit c9d1369
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 41 deletions.
50 changes: 25 additions & 25 deletions extensions/extensions-helm/aissemble-policy-decision-point-chart/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,38 @@ helm install policy-decision-point oci://ghcr.io/boozallen/aissemble-policy-deci
**Note**: *the version should match the aiSSEMBLE project version.*

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

# Migration from aiSSEMBLE v1 Helm Charts
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.

## Property Location
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.

| Old Property Location | New Property Location |
|--------------------------------------------|-------------------------------------------------------------------------|
| app.name | aissemble-policy-decision-point-chart.app.name |
| app.version | aissemble-policy-decision-point-chart.app.version |
| hostname | aissemble-policy-decision-point-chart.hostname |
| image.name | aissemble-policy-decision-point-chart.image.name |
| image.imagePullPolicy | aissemble-policy-decision-point-chart.image.imagePullPolicy |
| image.dockerRepo | aissemble-policy-decision-point-chart.image.dockerRepo |
| image.tag | aissemble-policy-decision-point-chart.image.tag |
| service.spec.ports | aissemble-policy-decision-point-chart.service.spec.ports |
| deployment.ports | aissemble-policy-decision-point-chart.deployment.ports |
| deployment.restartPolicy | aissemble-policy-decision-point-chart.deployment.restartPolicy |
| Old Property Location | New Property Location |
|--------------------------------------------|----------------------------------------------------------------|
| app.name | aissemble-policy-decision-point-chart.app.name |
| app.version | aissemble-policy-decision-point-chart.app.version |
| hostname | aissemble-policy-decision-point-chart.hostname |
| image.name | aissemble-policy-decision-point-chart.image.name |
| image.imagePullPolicy | aissemble-policy-decision-point-chart.image.imagePullPolicy |
| image.dockerRepo | aissemble-policy-decision-point-chart.image.dockerRepo |
| image.tag | aissemble-policy-decision-point-chart.image.tag |
| service.spec.ports | aissemble-policy-decision-point-chart.service.spec.ports |
| deployment.ports | aissemble-policy-decision-point-chart.deployment.ports |
| deployment.restartPolicy | aissemble-policy-decision-point-chart.deployment.restartPolicy |

## Property Removed
The following properties no longer exist.
Expand Down
22 changes: 11 additions & 11 deletions ...ions-helm-pipeline-invocation/aissemble-pipeline-invocation-app-chart/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ helm install pipeline-invocation-service oci://ghcr.io/boozallen/aissemble-pipel
**Note**: *the version should match the aiSSEMBLE project version.*

# Properties
| Property | Description | Required Override | Default |
|-------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------|-------------------|-----------------------------------------------------|
| ingress.apiVersion | k8s API version to use | No | networking.k8s.io/v1 |
| ingress.enabled | k8s Whether to enable ingress | No | false |
| ingress.kind | Type of kubernetes entity | No | Ingress |
| ingress.metadata.name | Name of the ingress | No | pipeline-invocation-service-web |
| ingress.metadata.annotations.kubernetes.io/ingress.class | Ingress class name | No | nginx |
| 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 *; |
| ingress.spec.rules.hosts | A list of hosts for ingress to support, each with their own path definition | No | |
| ingress.status | Load balancer IP if required | No | None |
| rbac.createClusterRole | Create and use RBAC `ClusterRole` resources. | No | true |
| Property | Description | Required Override | Default |
|-------------------------------------------------------------------------|-----------------------------------------------------------------------------|-------------------|-----------------------------------------------------|
| ingress.apiVersion | k8s API version to use | No | networking.k8s.io/v1 |
| ingress.enabled | k8s Whether to enable ingress | No | false |
| ingress.kind | Type of kubernetes entity | No | Ingress |
| ingress.metadata.name | Name of the ingress | No | pipeline-invocation-service-web |
| ingress.metadata.annotations.kubernetes.io/ingress.class | Ingress class name | No | nginx |
| 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 *; |
| ingress.spec.rules.hosts | A list of hosts for ingress to support, each with their own path definition | No | |
| ingress.status | Load balancer IP if required | No | None |
| rbac.createClusterRole | Create and use RBAC `ClusterRole` resources. | No | true |

# Quarkus Configuration

Expand Down
3 changes: 0 additions & 3 deletions ...tion/foundation-mda/src/main/resources/templates/deployment/argocd/spark-operator.yaml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ spec:
automated: {}
{{- end }}
{{- end }}
{{/* This template comment explains how the logic below works*/}}
{{- /* This one trims the newlines so it doesn't affect output */ -}}
#these options are important
syncOptions:
- ServerSideApply=true # https://github.com/argoproj/argo-cd/issues/820#issuecomment-135463693
{{- if .Values.spec.syncPolicy }}
Expand Down
17 changes: 15 additions & 2 deletions ...n/foundation-mda/src/main/resources/templates/deployment/argocd/v2/spark.operator.yaml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,18 @@ spec:
{{ end }}
{{- with .Values.spec.syncPolicy }}
syncPolicy:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.spec.syncPolicy }}
{{- if .automated }}
automated:
{{- toYaml .automated | nindent 6}}
{{- else if hasKey . "automated" }}
automated: {}
{{- end }}
{{- end }}
syncOptions:
- ServerSideApply=true # https://github.com/argoproj/argo-cd/issues/820#issuecomment-135463693
{{- if .Values.spec.syncPolicy }}
{{- with .Values.spec.syncPolicy.syncOptions }}
{{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}

0 comments on commit c9d1369

Please sign in to comment.