Skip to content

Commit

Permalink
build: update to new ff-common
Browse files Browse the repository at this point in the history
  • Loading branch information
@philipsens
philipsens committed Sep 26, 2023
1 parent 0a943ff commit b34df76
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 35 deletions.
6 changes: 3 additions & 3 deletions charts/zaakbrug/Chart.lock
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: ff-common
repository: https://ibissource.github.io/charts/
version: 0.1.13
version: 0.1.14
- name: openzaak
repository: https://maykinmedia.github.io/charts/
version: 1.1.0
digest: sha256:8d0720a44aa811e1a8cea7a903957ccfae94b4c05e18cc8c297fea7fa4c27b6e
generated: "2023-08-30T16:56:58.772593205+02:00"
digest: sha256:8f446f6cccc3dd378596d50ad8892b01ace8868158851e6d49f14e4a078d54f7
generated: "2023-09-26T12:13:19.382494004+02:00"
4 changes: 2 additions & 2 deletions charts/zaakbrug/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ description: A Helm chart for running ZaakBrug on Kubernetes
name: zaakbrug
icon: https://raw.githubusercontent.com/wearefrank/charts/master/charts/zaakbrug/icon.png
type: application
version: 2.0.9
version: 2.0.10

dependencies:
- name: ff-common
version: ~0.1.13
version: ~0.1.14
repository: https://ibissource.github.io/charts/
- name: openzaak
alias: staging
Expand Down
63 changes: 39 additions & 24 deletions charts/zaakbrug/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,30 @@ helm delete zaakbrug

### Frank! Configuration parameters

| Name | Description | Value |
| ------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- | --------- |
| `frank.memory` | Sets the initial and maximum size of the heap that will be used by the Frank!Framework | `4G` |
| `frank.dtap.stage` | Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD` | `TST` |
| `frank.dtap.side` | Set the `DTAP` side of where the instance is running | `cluster` |
| `frank.credentials.secret` | Set the secret name of the existing secret | `""` |
| `frank.credentials.key` | Set the key inside the secret that contains the data (e.g. `credentials.properties`) | `""` |
| `frank.instance.name` | Set the name of the Frank! instance (default is the `fullname`) | `""` |
| `frank.configurations.names` | Set the configurations to load. Leave empty to use the default | `[]` |
| `frank.security.http.authentication` | Set http authentication for the Frank! | `false` |
| `frank.security.http.localUsers` | Set localUsers who can log in on the Frank! | `[]` |
| `frank.security.http.localUsers.username` | Set the username of the user | `""` |
| `frank.security.http.localUsers.password` | Set the password of the user | `""` |
| `frank.security.http.localUsers.roles` | Set the roles of the user. Options: `IbisTester`, `IbisDataAdmin`, `IbisAdmin`, `IbisWebService`, `IbisObserver` | `[]` |
| `frank.security.http.activeDirectory.enabled` | Enable Active Directory for authentication | `false` |
| `frank.security.http.activeDirectory.url` | Set url for Active Directory | `""` |
| `frank.security.http.activeDirectory.baseDn` | Set baseDn for Active Directory users | `""` |
| `frank.security.http.activeDirectory.roleMapping.tester` | Map the rol for Tester | `""` |
| `frank.security.http.activeDirectory.roleMapping.dataAdmin` | Map the rol for DataAdmin | `""` |
| `frank.security.http.activeDirectory.roleMapping.admin` | Map the rol for Admin | `""` |
| `frank.security.http.activeDirectory.roleMapping.webService` | Map the rol for WebService | `""` |
| `frank.security.http.activeDirectory.roleMapping.observer` | Map the rol for Observer | `""` |
| `frank.server.transactionManager` | Set the transaction manager for Tomcat. Options: `NARAYANA`, `BTM`, `` | `""` |
| `frank.environmentVariables` | Set extra environment variables for the Frank! | `{}` |
| Name | Description | Value |
| ------------------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------- | ------- |
| `frank.memory` | Sets the initial and maximum size of the heap that will be used by the Frank!Framework | `4G` |
| `frank.dtap.stage` | (Required) Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD` | `""` |
| `frank.dtap.side` | Set the `DTAP` side of where the instance is running | `""` |
| `frank.credentials.secret` | Set the secret name of the existing secret | `""` |
| `frank.credentials.key` | Set the key inside the secret that contains the data (e.g. `credentials.properties`) | `""` |
| `frank.instance.name` | Set the name of the Frank! instance (default is the `fullname`) | `""` |
| `frank.configurations.names` | Set the configurations to load. Leave empty to use the default | `[]` |
| `frank.security.http.authentication` | Set http authentication for the Frank! | `false` |
| `frank.security.http.localUsers` | Set localUsers who can log in on the Frank! | `[]` |
| `frank.security.http.localUsers.username` | Set the username of the user | `""` |
| `frank.security.http.localUsers.password` | Set the password of the user | `""` |
| `frank.security.http.localUsers.roles` | Set the roles of the user. Options: `IbisTester`, `IbisDataAdmin`, `IbisAdmin`, `IbisWebService`, `IbisObserver` | `[]` |
| `frank.security.http.activeDirectory.enabled` | Enable Active Directory for authentication | `false` |
| `frank.security.http.activeDirectory.url` | Set url for Active Directory | `""` |
| `frank.security.http.activeDirectory.baseDn` | Set baseDn for Active Directory users | `""` |
| `frank.security.http.activeDirectory.roleMapping.tester` | Map the rol for Tester | `""` |
| `frank.security.http.activeDirectory.roleMapping.dataAdmin` | Map the rol for DataAdmin | `""` |
| `frank.security.http.activeDirectory.roleMapping.admin` | Map the rol for Admin | `""` |
| `frank.security.http.activeDirectory.roleMapping.webService` | Map the rol for WebService | `""` |
| `frank.security.http.activeDirectory.roleMapping.observer` | Map the rol for Observer | `""` |
| `frank.server.transactionManager` | Set the transaction manager for Tomcat. Options: `NARAYANA`, `BTM`, `` | `""` |
| `frank.environmentVariables` | Set extra environment variables for the Frank! | `{}` |

### Frank!Framework Connection parameters

Expand Down Expand Up @@ -288,4 +288,19 @@ ref: https://open-zaak.readthedocs.io/en/stable/installation/prerequisites.html#
| `staging.apiProxy.ingress.hosts.paths.pathType` | Set type of path | `""` |
| `staging.apiProxy.ingress.tls` | Define tls secrets for hosts (implementation not done yet) | `[]` |

## Configuration and installation details

### DTAP Stage

The Frank!Framework will start with different settings enabled, depending on what DTAP stage is configured.

For more information about DTAP stages read: https://frank-manual.readthedocs.io/en/latest/deploying/dtapAndProperties.html

## Notable changes

### 2.0.10

The `.Values.frank.dtap.stage` and `.Values.frank.dtap.side` are now empty by default.

* `.Values.frank.dtap.stage` is now required and should be set to the right stage. Read more in the [Installation details](#dtap-stage)
* `.Values.frank.dtap.side` will default to the release namespace deployed in.
6 changes: 3 additions & 3 deletions charts/zaakbrug/values.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
"properties": {
"stage": {
"type": "string",
"description": "Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD`",
"default": "TST"
"description": "(Required) Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD`",
"default": ""
},
"side": {
"type": "string",
"description": "Set the `DTAP` side of where the instance is running",
"default": "cluster"
"default": ""
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions charts/zaakbrug/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ frank:
##
memory: 4G
## @skip frank.dtap [object]
## @param frank.dtap.stage Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD`
## @param frank.dtap.stage (Required) Set the `DTAP` stage. Options: `LOC`, `DEV`, `TST`, `ACC`, `PRD`
## @param frank.dtap.side Set the `DTAP` side of where the instance is running
##
dtap:
stage: TST
side: cluster
stage: ""
side: ""
## @skip frank.credentials [object]
## @param frank.credentials.secret Set the secret name of the existing secret
## @param frank.credentials.key Set the key inside the secret that contains the data (e.g. `credentials.properties`)
Expand Down

0 comments on commit b34df76

Please sign in to comment.