diff --git a/templates/bucket.yaml b/templates/bucket.yaml index 57cff98..d701d66 100644 --- a/templates/bucket.yaml +++ b/templates/bucket.yaml @@ -2,9 +2,9 @@ apiVersion: s3.onyxia.sh/v1alpha1 kind: Policy metadata: - name: memelord-laurivosandi-policy + name: {{ .Release.name }}-policy spec: - name: memelord-laurivosandi-policy + name: {{ .Release.name }}-policy s3InstanceRef: minio/default policyContent: >- { @@ -18,8 +18,8 @@ spec: "s3:PutObject" ], "Resource": [ - "arn:aws:s3:::memelord-laurivosandi", - "arn:aws:s3:::memelord-laurivosandi/*" + "arn:aws:s3:::{{ .Release.name }}", + "arn:aws:s3:::{{ .Release.name }}/*" ] } ] @@ -28,19 +28,19 @@ spec: apiVersion: s3.onyxia.sh/v1alpha1 kind: S3User metadata: - name: memelord-laurivosandi-bucket + name: {{ .Release.name }}-bucket spec: - accessKey: memelord-laurivosandi-bucket # This is automatically created + accessKey: {{ .Release.name }}-bucket # This is automatically created policies: - - memelord-laurivosandi-policy + - {{ .Release.name }}-policy s3InstanceRef: minio/default --- apiVersion: s3.onyxia.sh/v1alpha1 kind: Bucket metadata: - name: memelord-laurivosandi + name: {{ .Release.name }} spec: - name: memelord-laurivosandi + name: {{ .Release.name }} s3InstanceRef: minio/default quota: default: 100000000 diff --git a/templates/deployment.yaml b/templates/deployment.yaml index 055a0f3..dfb74ad 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -43,29 +43,29 @@ spec: - name: DB_ENGINE value: postgres - name: POSTGRES_HOST - value: memelord-laurivosandi-database-rw + value: {{ .Release.Name }}-database-rw - name: POSTGRES_PORT value: '5432' - name: POSTGRES_DB - value: memelord-laurivosandi + value: {{ .Release.Name }} - name: POSTGRES_USER valueFrom: secretKeyRef: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database key: username - name: POSTGRES_PASSWORD valueFrom: secretKeyRef: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database key: password - name: REDIS_HOST - value: memelord-laurivosandi-redis + value: {{ .Release.Name }}-redis - name: REDIS_PORT value: '6379' - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: memelord-laurivosandi-redis + name: {{ .Release.Name }}-redis key: redis-password - name: STORAGE_BACKEND value: s3 @@ -79,15 +79,15 @@ spec: - name: AWS_ACCESS_KEY_ID valueFrom: secretKeyRef: - name: memelord-laurivosandi-bucket + name: {{ .Release.Name }}-bucket key: accessKey - name: AWS_SECRET_ACCESS_KEY valueFrom: secretKeyRef: - name: memelord-laurivosandi-bucket + name: {{ .Release.Name }}-bucket key: secretKey - name: AWS_STORAGE_BUCKET_NAME - value: "memelord-laurivosandi" + value: "{{ .Release.Name }}" - name: AWS_S3_REGION_NAME value: "ee-lte-1" - name: AWS_S3_ENDPOINT_URL @@ -105,34 +105,34 @@ spec: - name: OIDC_RP_SIGN_ALGO valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_ID_TOKEN_SIGNED_RESPONSE_ALG - name: OIDC_OP_JWKS_ENDPOINT value: https://auth.ee-lte-1.codemowers.io/jwks - name: OIDC_RP_CLIENT_ID valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_ID - name: OIDC_RP_CLIENT_SECRET valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_CLIENT_SECRET - name: OIDC_OP_AUTHORIZATION_ENDPOINT valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_IDP_AUTH_URI - name: OIDC_OP_TOKEN_ENDPOINT valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_IDP_TOKEN_URI - name: OIDC_OP_USER_ENDPOINT valueFrom: secretKeyRef: - name: oidc-client-memelord-laurivosandi-owner-secrets + name: oidc-client-{{ .Release.Name }}-owner-secrets key: OIDC_IDP_USERINFO_URI - name: SECRET_KEY valueFrom: diff --git a/templates/ingress.yaml b/templates/ingress.yaml index 10d6e75..273728d 100644 --- a/templates/ingress.yaml +++ b/templates/ingress.yaml @@ -15,9 +15,9 @@ spec: apiVersion: cert-manager.io/v1 kind: Certificate metadata: - name: memelord-laurivosandi + name: {{ .Release.Name }} spec: - secretName: memelord-laurivosandi-tls + secretName: {{ .Release.Name }}-tls dnsNames: - {{ .Values.hostname }} issuerRef: @@ -27,7 +27,7 @@ spec: apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: memelord-laurivosandi + name: {{ .Release.Name }} annotations: traefik.ingress.kubernetes.io/router.entrypoints: websecure spec: @@ -43,13 +43,13 @@ spec: port: number: 80 tls: - - secretName: memelord-laurivosandi-tls + - secretName: {{ .Release.Name }}-tls --- apiVersion: codemowers.cloud/v1beta1 kind: OIDCClient metadata: - name: memelord-laurivosandi + name: {{ .Release.Name }} spec: displayName: Memelord laurivosandi uri: https://{{ .Values.hostname }}/oidc/authenticate/ diff --git a/templates/postgres.yaml b/templates/postgres.yaml index e5fd18a..6087a69 100644 --- a/templates/postgres.yaml +++ b/templates/postgres.yaml @@ -2,12 +2,12 @@ apiVersion: secretgenerator.mittwald.de/v1alpha1 kind: StringSecret metadata: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database labels: cnpg.io/reload: "true" spec: data: - username: memelord-laurivosandi + username: {{ .Release.Name }} fields: - fieldName: password length: "32" @@ -16,7 +16,7 @@ spec: apiVersion: postgresql.cnpg.io/v1 kind: Cluster metadata: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database spec: instances: 2 imageName: ghcr.io/cloudnative-pg/postgresql:17 @@ -49,18 +49,18 @@ spec: effective_cache_size: "2GB" managed: roles: - - name: memelord-laurivosandi + - name: {{ .Release.Name }} ensure: present login: true passwordSecret: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database --- apiVersion: postgresql.cnpg.io/v1 kind: Database metadata: - name: memelord-laurivosandi + name: {{ .Release.Name }} spec: - name: memelord-laurivosandi - owner: memelord-laurivosandi + name: {{ .Release.Name }} + owner: {{ .Release.Name }} cluster: - name: memelord-laurivosandi-database + name: {{ .Release.Name }}-database diff --git a/templates/redis.yaml b/templates/redis.yaml index 95351e5..021a7f3 100644 --- a/templates/redis.yaml +++ b/templates/redis.yaml @@ -2,7 +2,7 @@ apiVersion: secretgenerator.mittwald.de/v1alpha1 kind: StringSecret metadata: - name: memelord-laurivosandi-redis + name: {{ .Release.Name }}-redis spec: fields: - fieldName: redis-password @@ -12,7 +12,7 @@ spec: apiVersion: dragonflydb.io/v1alpha1 kind: Dragonfly metadata: - name: memelord-laurivosandi-redis + name: {{ .Release.Name }}-redis spec: affinity: podAffinity: @@ -25,7 +25,7 @@ spec: topologyKey: topology.kubernetes.io/zone authentication: passwordFromSecret: - name: memelord-laurivosandi-redis + name: {{ .Release.Name }}-redis key: redis-password replicas: 2 resources: