Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat/superadmin password #109

Merged
merged 6 commits into from
Oct 24, 2023
Merged

feat/superadmin password #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2d88c8a
feat: Add superadmin secret to values.
Aries0d0f Oct 24, 2023
cceee50
feat: Impl capt-superadmin secret template.
Aries0d0f Oct 24, 2023
216b3e4
feat: Add env on captain deployment template via refer superadmin sec…
Aries0d0f Oct 24, 2023
3fe833d
docs: Correct params key name.
Aries0d0f Oct 24, 2023
4e83f58
docs: Modify Readme.
Aries0d0f Oct 24, 2023
aa29699
build: Update chart version.
Aries0d0f Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/values.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,14 @@ captain:
enabled: true
secretName: capt-jwt-secret
secret: ""
## @param captain.secret.superadmin.enabled Enable secret generate for Super Admin
## @param captain.secret.superadmin.secretName Secret name for Super Admin
## @param captain.secret.superadmin.password Super Admin password
##
superadmin:
enabled: true
secretName: capt-superadmin-password
password: ""
## @extra captain.service Captain service parameters
##
service:
Expand Down
2 changes: 1 addition & 1 deletion charts/agh2/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 2.0.2
version: 2.1.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
43 changes: 24 additions & 19 deletions charts/agh2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@ Leave as default if using external DB
| `postgresql.auth.username` | Internal database initial user | `argushack` |
| `postgresql.auth.password` | Internal database initial password | `""` |
| `postgresql.auth.postgresPassword` | Internal database initial postgres admin password | `""` |
| `postgresql.primary.extendedConfiguration` | Extended configuration for the primary node | `max_connections = 32768 shared_buffers = 4GB` |
| `postgresql.primary.extendedConfiguration` | Extended configuration for the primary node | `max_connections = 32768
shared_buffers = 4GB
` |
| `postgresql.primary.initdb.enabled` | Enable initdb scripts generation | `true` |
| `postgresql.primary.initdb.scriptsConfigMap` | Name of ConfigMap containing db-init scripts | `db-init-scripts` |
| `postgresql.primary.initdb.user` | Specify the PostgreSQL username to execute the initdb scripts | `argushack` |
Expand Down Expand Up @@ -121,11 +123,11 @@ Leave as default if using external DB
| --------------------------------- | --------------------------------------------------------- | ----------------------------- |
| `minio.internal.enabled` | Enable internal minio | `true` |
| `minio.image.repository` | Internal MinIO image repository | `docker/bitnami/minio` |
| `minio.image.tag` | Internal MinIO image tag (immutable tags are recommended) | `2022.12.2-debian-11-r0` |
| `minio.image.tag` | Internal MinIO image tag (immutable tags are recommended) | `2023.3.24` |
| `minio.image.pullPolicy` | Internal MinIO image pull policy | `IfNotPresent` |
| `minio.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `minio.clientImage.repository` | Internal MinIO image repository | `docker/bitnami/minio-client` |
| `minio.clientImage.tag` | Internal MinIO image tag (immutable tags are recommended) | `2022.11.17-debian-11-r4` |
| `minio.clientImage.tag` | Internal MinIO image tag (immutable tags are recommended) | `2023.4.12` |
| `minio.clientImage.pullPolicy` | Internal MinIO image pull policy | `IfNotPresent` |
| `minio.clientImage.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `minio.auth.rootUser` | Internal database root user | `argushack` |
Expand Down Expand Up @@ -154,7 +156,7 @@ ref: https://github.com/Leukocyte-Lab/AGH2-ATTACK
| --------------------------------------- | -------------------------------------------------------------- | ------------------------------------------ |
| `attack.enabled` | Enable ATTACK module | `true` |
| `attack.image.repository` | ATTACK image repository | `leukocyte-lab/argushack2/attack` |
| `attack.image.tag` | ATTACK image tag (immutable tags are recommended) | `v0.10.0` |
| `attack.image.tag` | ATTACK image tag (immutable tags are recommended) | `v0.12.0` |
| `attack.image.pullPolicy` | ATTACK image pull policy | `IfNotPresent` |
| `attack.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `attack.secret.enabled` | Enable secret generate for ATTACK | `true` |
Expand All @@ -165,10 +167,10 @@ ref: https://github.com/Leukocyte-Lab/AGH2-ATTACK
| `attack.service` | ATTACK service parameters | |
| `attack.service.group.enabled` | Enable ATTACK Group worker | `true` |
| `attack.service.group.image.repository` | ATTACK Group worker image repository | `leukocyte-lab/argushack2/group` |
| `attack.service.group.image.tag` | ATTACK Group worker image tag (immutable tags are recommended) | `v1.3.7` |
| `attack.service.group.image.tag` | ATTACK Group worker image tag (immutable tags are recommended) | `v1.6.2` |
| `attack.service.ui.enabled` | Enable ATTACK UI | `true` |
| `attack.service.ui.image.repository` | ATTACK UI image repository | `leukocyte-lab/argushack2/attack-frontend` |
| `attack.service.ui.image.tag` | ATTACK UI image tag (immutable tags are recommended) | `v0.3.1` |
| `attack.service.ui.image.tag` | ATTACK UI image tag (immutable tags are recommended) | `v0.3.2-rc.0` |
| `attack.service.ui.image.pullPolicy` | ATTACK UI image pull policy | `IfNotPresent` |
| `attack.service.ui.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `attack.service.redis.enabled` | Enable redis | `true` |
Expand Down Expand Up @@ -201,7 +203,7 @@ ref: https://github.com/Leukocyte-Lab/AGH2-Captain
| ------------------------------------------------- | --------------------------------------------------------- | ----------------------------------------- |
| `captain.enabled` | Enable Captain module | `true` |
| `captain.image.repository` | Captain image repository | `leukocyte-lab/argushack2/captain` |
| `captain.image.tag` | Captain image tag (immutable tags are recommended) | `v0.20.1-rc.0` |
| `captain.image.tag` | Captain image tag (immutable tags are recommended) | `v0.23.0` |
| `captain.image.pullPolicy` | Captain image pull policy | `IfNotPresent` |
| `captain.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `captain.secret.enabled` | Enable secret generate for Captain | `true` |
Expand All @@ -216,6 +218,9 @@ ref: https://github.com/Leukocyte-Lab/AGH2-Captain
| `captain.secret.jwt.enabled` | Enable secret generate for JWT | `true` |
| `captain.secret.jwt.secretName` | Secret name for JWT | `capt-jwt-secret` |
| `captain.secret.jwt.secret` | JWT secret | `""` |
| `captain.secret.superadmin.enabled` | Enable secret generate for Super Admin | `true` |
| `captain.secret.superadmin.secretName` | Secret name for Super Admin | `capt-superadmin-secret` |
| `captain.secret.superadmin.password` | Super Admin password | `""` |
| `captain.service` | Captain service parameters | |
| `captain.service.redis.enabled` | Enable redis | `true` |
| `captain.service.checkinDaemon.enabled` | Enable checkin-daemon | `true` |
Expand All @@ -236,7 +241,7 @@ ref: https://github.com/Leukocyte-Lab/AGH2-Core
| ------------------------------ | ------------------------------------------------ | ------------------------------- |
| `core.enabled` | Enable Core module | `true` |
| `core.image.repository` | Core image repository | `leukocyte-lab/argushack2/core` |
| `core.image.tag` | Core image tag (immutable tags are recommended) | `v1.18.1-rc.0` |
| `core.image.tag` | Core image tag (immutable tags are recommended) | `v1.20.2` |
| `core.image.pullPolicy` | Core image pull policy | `IfNotPresent` |
| `core.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `core.secret.enabled` | Enable secret generate for Core | `true` |
Expand Down Expand Up @@ -264,7 +269,7 @@ ref: https://github.com/Leukocyte-Lab/AGH2-Exploit-Manager
| ---------------------------------- | ---------------------------------------------------------- | ------------------------------------- |
| `exploitmgr.enabled` | Enable Exploit-Manager module | `true` |
| `exploitmgr.image.repository` | Exploit-Manager image repository | `leukocyte-lab/argushack2/exploitmgr` |
| `exploitmgr.image.tag` | Exploit-Manager image tag (immutable tags are recommended) | `v0.14.0-rc.0` |
| `exploitmgr.image.tag` | Exploit-Manager image tag (immutable tags are recommended) | `v0.17.0` |
| `exploitmgr.image.pullPolicy` | Exploit-Manager image pull policy | `IfNotPresent` |
| `exploitmgr.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `exploitmgr.secret.enabled` | Enable secret generate for Exploit-Manager | `true` |
Expand Down Expand Up @@ -342,21 +347,21 @@ ref: https://github.com/Leukocyte-Lab/AGH2-UI
| ---------------------- | ------------------------------------------------ | ----------------------------------- |
| `ui.enabled` | Enable UI module | `true` |
| `ui.image.repository` | UI image repository | `leukocyte-lab/argushack2/frontend` |
| `ui.image.tag` | UI image tag (immutable tags are recommended) | `v2.20.1` |
| `ui.image.tag` | UI image tag (immutable tags are recommended) | `v2.22.0` |
| `ui.image.pullPolicy` | UI image pull policy | `IfNotPresent` |
| `ui.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `ui.extraEnv` | UI additional environment variables | `{}` |


### System shared image parameters

| Name | Description | Value |
| ------------------------------- | ------------------------------------- | ---------------------------------------------------------------- |
| `shared.enabled` | Enable shared image config generation | `true` |
| `shared.configMapName` | Shared image configMap name | `system-image` |
| `shared.images.poster` | Poster image | `leukocyte-lab/argushack2/worker/poster:v2.0.0` |
| `shared.images.cronjob` | Cronjob image | `leukocyte-lab/argushack2/worker/cronjob:v1.0.0` |
| `shared.images.reportInit` | Report init image | `leukocyte-lab/argushack2/worker/report-init:v0.0.9` |
| `shared.images.reportGenerator` | Report generator image | `leukocyte-lab/argushack2/worker/report-generator:v0.0.7` |
| `shared.images.reportTemplate` | Report template image | `leukocyte-lab/argushack2/attack-report-template:v0.0.7-alpha.3` |
| Name | Description | Value |
| ------------------------------- | ------------------------------------- | --------------------------------------------------------- |
| `shared.enabled` | Enable shared image config generation | `true` |
| `shared.configMapName` | Shared image configMap name | `system-image` |
| `shared.images.poster` | Poster image | `leukocyte-lab/argushack2/worker/poster:v2.0.0` |
| `shared.images.cronjob` | Cronjob image | `leukocyte-lab/argushack2/worker/cronjob:v1.0.0` |
| `shared.images.reportInit` | Report init image | `leukocyte-lab/argushack2/worker/report-init:v0.0.8` |
| `shared.images.reportGenerator` | Report generator image | `leukocyte-lab/argushack2/worker/report-generator:v0.0.7` |
| `shared.images.reportTemplate` | Report template image | `leukocyte-lab/argushack2/attack-report-template:v0.0.8` |

7 changes: 7 additions & 0 deletions charts/agh2/templates/captain/captain-deployment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,13 @@ spec:
- name: TEMPLATE_URL
value: "template.$(NAMESPACE).svc.cluster.local:50005"
{{- end }}
{{- if .Values.captain.secret.superadmin.enabled }}
- name: SUPERADMIN_PASSWORD
valueFrom:
secretKeyRef:
name: {{ .Values.captain.secret.superadmin.secretName }}
key: SUPERADMIN_PASSWORD
{{- end }}
- name: DB_Conn
valueFrom:
secretKeyRef:
Expand Down
24 changes: 24 additions & 0 deletions charts/agh2/templates/captain/captain-superadmin-secret.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{{- if and .Values.captain.enabled .Values.captain.secret.enabled .Values.captain.secret.superadmin.enabled }}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.captain.secret.superadmin.secretName }}
labels:
{{- include "AGH2.labels" . | nindent 4 }}
stringData:
SUPERADMIN_PASSWORD: {{
(
default
.Values.captain.secret.superadmin.password
(
include "specify-password"
(
dict
"domain" (default .Values.ingress.host "app.argushack.com")
"token" .Values.keygen.apiToken
"prefix" .Values.captain.secret.superadmin.secretName
)
)
) | quote
}}
{{- end }}
8 changes: 8 additions & 0 deletions charts/agh2/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,14 @@ captain:
enabled: true
secretName: capt-jwt-secret
secret: ""
## @param captain.secret.superadmin.enabled Enable secret generate for Super Admin
## @param captain.secret.superadmin.secretName Secret name for Super Admin
## @param captain.secret.superadmin.password Super Admin password
##
superadmin:
enabled: true
secretName: capt-superadmin-secret
password: ""
## @extra captain.service Captain service parameters
##
service:
Expand Down
Loading