From ca9ea76f645ca00292468b8b387ebcc31413daf3 Mon Sep 17 00:00:00 2001 From: treydock Date: Tue, 23 Jul 2024 09:13:52 -0400 Subject: [PATCH] Remove focalmap (#267) --- .github/config/k8-ldap-configmaps.yaml | 3 - .github/config/namespaces.yaml | 7 --- .github/workflows/test-private.yaml | 1 - charts-private/focalmap/.helmignore | 24 -------- charts-private/focalmap/Chart.yaml | 13 ----- charts-private/focalmap/ci/test-values.yaml | 23 -------- charts-private/focalmap/values.yaml | 65 --------------------- 7 files changed, 136 deletions(-) delete mode 100644 charts-private/focalmap/.helmignore delete mode 100644 charts-private/focalmap/Chart.yaml delete mode 100644 charts-private/focalmap/ci/test-values.yaml delete mode 100644 charts-private/focalmap/values.yaml diff --git a/.github/config/k8-ldap-configmaps.yaml b/.github/config/k8-ldap-configmaps.yaml index 98289141..49ef03dc 100644 --- a/.github/config/k8-ldap-configmaps.yaml +++ b/.github/config/k8-ldap-configmaps.yaml @@ -11,7 +11,6 @@ metadata: data: user-immunegenetics: "41773" user-k8spublic: "38635" - user-focalmapdev: "36971" user-nominatim: "39237" user-phylogatrdev: "33253" user-test: "1000" @@ -27,7 +26,6 @@ metadata: data: user-immunegenetics: "4215" user-k8spublic: "4097" - user-focalmapdev: "2925" user-nominatim: "4097" user-phylogatrdev: "6314" user-test: "1001" @@ -43,7 +41,6 @@ metadata: data: user-immunegenetics: '["4215"]' user-k8spublic: '["4097"]' - user-focalmapdev: '["2925","6393","7175"]' user-nominatim: '["4097"]' user-phylogatrdev: '["6314","6557","6558"]' user-test: '["1001","1002"]' diff --git a/.github/config/namespaces.yaml b/.github/config/namespaces.yaml index 267e5433..301d0480 100644 --- a/.github/config/namespaces.yaml +++ b/.github/config/namespaces.yaml @@ -8,13 +8,6 @@ metadata: --- apiVersion: v1 kind: Namespace -metadata: - name: focalmap - labels: - osc.edu/role: webservice ---- -apiVersion: v1 -kind: Namespace metadata: name: nominatim labels: diff --git a/.github/workflows/test-private.yaml b/.github/workflows/test-private.yaml index 2a795009..73f3cf1b 100644 --- a/.github/workflows/test-private.yaml +++ b/.github/workflows/test-private.yaml @@ -35,7 +35,6 @@ jobs: matrix: chart: - "phylogatr-web" - - "focalmap" - "sirmodel" # TODO: Maybe too few resources with Kind cluster to support init job # Init job is required to bootstrap Nominatim diff --git a/charts-private/focalmap/.helmignore b/charts-private/focalmap/.helmignore deleted file mode 100644 index 156c5b88..00000000 --- a/charts-private/focalmap/.helmignore +++ /dev/null @@ -1,24 +0,0 @@ -*.gpg -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts-private/focalmap/Chart.yaml b/charts-private/focalmap/Chart.yaml deleted file mode 100644 index 76b1f6d1..00000000 --- a/charts-private/focalmap/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v2 -name: focalmap -description: OSC focalmap web service -type: application -version: 0.15.1 -appVersion: v0.9.0 -maintainers: - - name: treydock -dependencies: - - name: webservice - version: 0.36.1 - repository: https://osc.github.io/osc-helm-charts/ - # repository: file://../../charts/webservice diff --git a/charts-private/focalmap/ci/test-values.yaml b/charts-private/focalmap/ci/test-values.yaml deleted file mode 100644 index a24aa9cf..00000000 --- a/charts-private/focalmap/ci/test-values.yaml +++ /dev/null @@ -1,23 +0,0 @@ -global: - environment: dev - imagePullSecret: - password: IMAGE-PULL-PASSWORD - nodeSelectorRole: test - env: - dev: - podResources: - limits: - cpu: 200m - memory: 256Mi - requests: - cpu: 100m - memory: 128Mi -webservice: - ingress: - host: test.local - mounts: - roDir: - project: null - auth: - oidcIssuerURL: http://keycloak.keycloak.svc.cluster.local/realms/master - cookieSecret: KMdIWJeLDNssdLoaXxiLBw== diff --git a/charts-private/focalmap/values.yaml b/charts-private/focalmap/values.yaml deleted file mode 100644 index c5ebb26f..00000000 --- a/charts-private/focalmap/values.yaml +++ /dev/null @@ -1,65 +0,0 @@ -global: - environment: "" - imageTag: v2.4.0 - env: - production: - serviceAccount: focalmap - replicas: 2 - image: - tag: '{{ .Values.global.imageTag }}' - podResources: - limits: - cpu: 4 - memory: 4Gi - requests: - cpu: 1 - memory: 256Mi - auth: - replicas: 2 - test: - serviceAccount: focalmap - replicas: 2 - image: - tag: '{{ .Values.global.imageTag }}' - podResources: - limits: - cpu: 4 - memory: 4Gi - requests: - cpu: 1 - memory: 256Mi - auth: - replicas: 2 - dev: - serviceAccount: focalmapdev - replicas: 1 - image: - tag: latest - podResources: - limits: - cpu: 4 - memory: 4Gi - requests: - cpu: 1 - memory: 256Mi - auth: - replicas: 1 -webservice: - appType: rshiny - auth: - enable: true - accessGroup: PDE0006 - idpHost: EXTERNAL-DATA - clientSecret: EXTERNAL-SECRET - cookieSecret: EXTERNAL-SECRET - workingDir: /app - image: - repository: docker-registry.osc.edu/webservices/focalmap - mounts: - roDir: - project: /fs/ess/PDE0001 - alert: - receiver: focalmap - debugGroups: - - focalmap_developer - - wiagstf