From 377667509c7cc97ace377581726c1ecc0491881d Mon Sep 17 00:00:00 2001 From: Ivan P <2119240+i5okie@users.noreply.github.com> Date: Fri, 1 Nov 2024 08:45:49 -0700 Subject: [PATCH] quick cleanup/fix Signed-off-by: Ivan P <2119240+i5okie@users.noreply.github.com> --- .../workflows/uninstall_install_sandbox.yaml | 2 +- services/traction/charts/sandbox/Chart.yaml | 11 -- .../traction/charts/test/sandbox/Chart.yaml | 11 -- .../traction/charts/test/sandbox/Values.yaml | 153 ------------------ .../Values.yaml => sandbox/values.yaml} | 0 5 files changed, 1 insertion(+), 176 deletions(-) delete mode 100644 services/traction/charts/sandbox/Chart.yaml delete mode 100644 services/traction/charts/test/sandbox/Chart.yaml delete mode 100644 services/traction/charts/test/sandbox/Values.yaml rename services/traction/{charts/sandbox/Values.yaml => sandbox/values.yaml} (100%) diff --git a/.github/workflows/uninstall_install_sandbox.yaml b/.github/workflows/uninstall_install_sandbox.yaml index 5d11648..b9a9b02 100644 --- a/.github/workflows/uninstall_install_sandbox.yaml +++ b/.github/workflows/uninstall_install_sandbox.yaml @@ -79,7 +79,7 @@ jobs: helm repo add traction https://bcgov.github.io/traction helm upgrade --install \ -n ${{ secrets.OPENSHIFT_NAMESPACE }} --wait --timeout=7m \ - -f ./services/traction/sandbox/Values.yaml \ + -f ./services/traction/sandbox/values.yaml \ --set ui.ux.infoBanner.message="${BANNER_MESSAGE}" \ traction-sandbox traction/traction diff --git a/services/traction/charts/sandbox/Chart.yaml b/services/traction/charts/sandbox/Chart.yaml deleted file mode 100644 index 6464fad..0000000 --- a/services/traction/charts/sandbox/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: traction -type: application -description: traction - sandbox -version: "0.3.3" -appVersion: "0.5.1" - -dependencies: - - name: traction - version: "0.3.3" - repository: https://bcgov.github.io/traction diff --git a/services/traction/charts/test/sandbox/Chart.yaml b/services/traction/charts/test/sandbox/Chart.yaml deleted file mode 100644 index 4dc9eff..0000000 --- a/services/traction/charts/test/sandbox/Chart.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v2 -name: traction -type: application -description: traction - sandbox -version: 0.3.1 -appVersion: "0.4.2" - -dependencies: - - name: traction - version: 0.3.1 - repository: https://bcgov.github.io/traction diff --git a/services/traction/charts/test/sandbox/Values.yaml b/services/traction/charts/test/sandbox/Values.yaml deleted file mode 100644 index b111ec4..0000000 --- a/services/traction/charts/test/sandbox/Values.yaml +++ /dev/null @@ -1,153 +0,0 @@ -traction: - ingressSuffix: -sandbox.apps.silver.devops.gov.bc.ca - acapy: - image: - pullPolicy: Always - secret: - adminApiKey: - generated: true - pluginInnkeeper: - generated: true - ledgers.yml: - - id: bcovrin-test - is_production: true - is_write: true - genesis_url: "http://test.bcovrin.vonx.io/genesis" - endorser_did: "DfQetNSm7gGEHuzfUvpfPn" - endorser_alias: "bcovrin-test-endorser" - - id: candy-dev - is_production: true - is_write: false - genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/dev/pool_transactions_genesis" - - id: candy-test - is_production: true - is_write: false - genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/test/pool_transactions_genesis" - - id: candy-prod - is_production: true - is_write: false - genesis_url: "https://raw.githubusercontent.com/ICCS-ISAC/dtrust-reconu/main/CANdy/prod/pool_transactions_genesis" - - id: sovrin-testnet - is_production: true - is_write: false - genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_sandbox_genesis" - - id: sovrin-mainnet - is_production: true - is_write: false - genesis_url: "https://raw.githubusercontent.com/sovrin-foundation/sovrin/stable/sovrin/pool_transactions_live_genesis" - plugin-config.yml: - traction_innkeeper: - innkeeper_wallet: - print_key: true - print_token: true - connect_to_endorser: - - endorser_alias: bcovrin-test-endorser - ledger_id: bcovrin-test - create_public_did: - - bcovrin-test - reservation: - expiry_minutes: 2880 - auto_approve: true - auto_issuer: true - autoscaling: - enabled: true - minReplicas: 1 - maxReplicas: 10 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - stabilizationWindowSeconds: 300 - resources: - limits: - cpu: 400m - memory: 1600Mi - requests: - cpu: 200m - memory: 820Mi - networkPolicy: - enabled: true - ingress: - enabled: true - namespaceSelector: - network.openshift.io/policy-group: ingress - tenant_proxy: - image: - pullPolicy: Always - networkPolicy: - enabled: true - ingress: - enabled: true - namespaceSelector: - network.openshift.io/policy-group: ingress - ui: - quickConnectEndorserName: "bcovrin-test-endorser" - requireEmailForReservation: false - image: - pullPolicy: Always - ux: - aboutBusiness: - linkTitle: "No service agreement available for Sandbox environment" - link: " " - infoBanner: - showMessage: true - oidc: - active: false - showInnkeeperAdminLogin: true - showWritableComponents: true - authority: https://dev.loginproxy.gov.bc.ca/auth/realms/digitaltrust-citz - jwksUri: https://dev.loginproxy.gov.bc.ca/auth/realms/digitaltrust-citz/protocol/openid-connect/certs - extraQueryParams: '{"kc_idp_hint":"idir"}' - realm: "digitaltrust-citz" - reservationForm: >- - { - "formDataSchema": { - "type": "object", - "properties": { - "organization": { - "type": "string" - } - } - }, - "formUISchema": { - "type": "VerticalLayout", - "elements": [ - { - "type": "Control", - "scope": "#/properties/organization", - "label": "Company/organization " - } - ] - } - } - ariesDetails: - ledgerDescription: "bcovrin-test" - smtp: - server: apps.smtp.gov.bc.ca - port: 25 - senderAddress: DoNotReplyTractionSandbox@gov.bc.ca - innkeeperInbox: "" - networkPolicy: - enabled: true - ingress: - enabled: true - namespaceSelector: - network.openshift.io/policy-group: ingress - autoscaling: - enabled: true - minReplicas: 2 - maxReplicas: 5 - targetCPUUtilizationPercentage: 80 - targetMemoryUtilizationPercentage: 80 - ingress: - annotations: - route.openshift.io/termination: edge - postgresql: - primary: - persistence: - size: 5Gi - resources: - limits: - cpu: 2 - memory: 4000Mi - requests: - cpu: 200m - memory: 820Mi diff --git a/services/traction/charts/sandbox/Values.yaml b/services/traction/sandbox/values.yaml similarity index 100% rename from services/traction/charts/sandbox/Values.yaml rename to services/traction/sandbox/values.yaml