Merge pull request #519 from bcgov/yj

Yj
bcgov · Aug 8, 2024 · cc7fbc0 · cc7fbc0
2 parents bc94afb + 86803a4
commit cc7fbc0
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 0 deletions.
diff --git a/backup-container/helm/prod-values.yaml b/backup-container/helm/prod-values.yaml
@@ -0,0 +1,42 @@
+global:
+  labels:
+    environment: prod
+    env: prod
+    owner: "b0471a-team"
+    project: "b0471a-project"
+    DataClass: "Medium"
+
+nameOverride: strdssprod-backup
+fullnameOverride: strdssprod-backup
+
+backupConfig: |
+  postgres=strdssprod:5432/strdssprod
+
+  0 1 * * * default ./backup.sh -s
+  0 4 * * * default ./backup.sh -s -v all
+
+db:
+  secretName: strdssprod
+  passwordKey: postgres-password
+
+persistence:
+  backup:
+    size: 700Mi
+    mountPath: /backups/
+    storageClassName: netapp-block-standard
+    storageAccessMode: ReadWriteOnce
+  verification:
+    size: 512Mi
+    mountPath: /var/lib/pgsql/data
+    storageClassName: netapp-block-standard
+    storageAccessMode: ReadWriteOnce
+
+env:
+  DATABASE_SERVICE_NAME:
+    value: strdssprod
+  ENVIRONMENT_FRIENDLY_NAME:
+    value: "STRDSS PROD DB Backups"
+
+backup-storage:
+  labels:
+    DataClass: "Medium"
diff --git a/frontend/src/app/common/services/auth.service.ts b/frontend/src/app/common/services/auth.service.ts
@@ -5,6 +5,9 @@ import { environment } from '../../../environments/environment';
 @Injectable({
   providedIn: 'root'
 })
+
+// before KC Quarkus update
+
 export class AuthService {
 
   constructor(private keycloak: KeycloakService) { }
@@ -16,3 +19,27 @@ export class AuthService {
     window.location.href = logoffUri;
   }
 }
+
+// after KC Quarkus update
+
+// export class AuthService {
+//   constructor(private keycloak: KeycloakService) {}
+
+//   async logout(): Promise<void> {
+//       try {
+//           const idToken = await this.keycloak.getToken();
+//           const redirectUri = `${environment.SM_LOGOFF_URL}?returl=${encodeURIComponent(
+//               window.location.origin,
+//           )}&retnow=1`;
+//           const logoffUri = `${this.keycloak.getKeycloakInstance().authServerUrl}/realms/${
+//               this.keycloak.getKeycloakInstance().realm
+//           }/protocol/openid-connect/logout?post_logout_redirect_uri=${encodeURIComponent(
+//               redirectUri,
+//           )}&id_token_hint=${idToken}`;
+//           window.location.href = logoffUri;
+//       } catch (error) {
+//           console.error('Failed to get ID token', error);
+//       }
+//   }
+// }
+
diff --git a/postgres/values-prod.yaml b/postgres/values-prod.yaml
@@ -0,0 +1,28 @@
+postgresql:
+  image:
+    tag: 16.3.0
+primary:
+  podSecurityContext:
+    enabled: false
+  containerSecurityContext:
+    enabled: false
+  persistence:
+    size: 900Mi
+  resources:
+    limits:
+      cpu: 150m
+      memory: 300Mi
+    requests:
+      cpu: 50m
+      memory: 250Mi
+readReplicas:
+  persistence:
+    size: 400Mi
+nameOverride: strdssprod
+fullnameOverride: strdssprod
+annotations:
+  haproxy.router.openshift.io/balance: roundrobin
+  haproxy.router.openshift.io/disable_cookies: 'true'
+  haproxy.router.openshift.io/timeout: 180s
+commonLabels:
+  DataClass: "Medium"