diff --git a/.github/workflows/create-github-draft-release.yaml b/.github/workflows/create-github-draft-release.yaml index cd9a183da..5443486db 100644 --- a/.github/workflows/create-github-draft-release.yaml +++ b/.github/workflows/create-github-draft-release.yaml @@ -29,12 +29,12 @@ on: paths: description: "paths - A CSV string detailing which files and directories should be included in the artifact. If not provided only the standard artifacts will be created." type: string - default: "charts/modernization-api, charts/nbs-gateway, charts/dataingestion-service, charts/nginx-ingress, charts/elasticsearch-efs, charts/nifi-efs, charts/page-builder-api, charts/keycloak, charts/liquibase, charts/nnd-service, charts/investigation-reporting-service, charts/ldfdata-reporting-service, charts/observation-reporting-service, charts/organization-reporting-service, charts/person-reporting-service, charts/post-processing-reporting-service, charts/kafka-connect-sink, charts/debezium, charts/data-processing-service, charts/cluster-autoscaler, k8-manifests/cluster-issuer-prod.yaml, charts/case-notification-service, charts/data-extraction-service, charts/xml-hl7-parser-service, charts/debezium-case-notifications, k8-manifests/nbs-secrets.yaml, charts/rtr" + default: "charts/modernization-api, charts/nbs-gateway, charts/dataingestion-service, charts/nginx-ingress, charts/elasticsearch-efs, charts/nifi-efs, charts/page-builder-api, charts/keycloak, charts/liquibase, charts/nnd-service, charts/investigation-reporting-service, charts/ldfdata-reporting-service, charts/observation-reporting-service, charts/organization-reporting-service, charts/person-reporting-service, charts/post-processing-reporting-service, charts/kafka-connect-sink, charts/debezium, charts/data-processing-service, charts/cluster-autoscaler, k8-manifests/cluster-issuer-prod.yaml, charts/case-notification-service, charts/data-extraction-service, charts/debezium-case-notifications, k8-manifests/nbs-secrets.yaml, charts/rtr" required: false excluded_paths: description: "excluded_paths - A CSV list detailing specific files and directories to exclude from the provided paths (this variable serves only to limit scope of the paths variable)." type: string - default: "charts/modernization-api/values-*, charts/nbs-gateway/values-*, charts/dataingestion-service/values-*, charts/elasticsearch-efs/values-*, charts/nifi-efs/values-*, charts/page-builder-api/values-*, charts/liquibase/values-*, charts/nnd-service/values-*, charts/investigation-reporting-service/values-*, charts/ldfdata-reporting-service/values-*, charts/observation-reporting-service/values-*, charts/organization-reporting-service/values-*, charts/person-reporting-service/values-*, charts/post-processing-reporting-service/values-*, charts/kafka-connect-sink/values-*, charts/debezium/values-*, charts/data-processing-service/values-*, charts/cluster-autoscaler/values-*, charts/case-notification-service/values-*, charts/data-extraction-service/values-*, charts/xml-hl7-parser-service/values-*, charts/debezium-case-notifications/values-*, charts/rtr/values-*" + default: "charts/modernization-api/values-*, charts/nbs-gateway/values-*, charts/dataingestion-service/values-*, charts/elasticsearch-efs/values-*, charts/nifi-efs/values-*, charts/page-builder-api/values-*, charts/liquibase/values-*, charts/nnd-service/values-*, charts/investigation-reporting-service/values-*, charts/ldfdata-reporting-service/values-*, charts/observation-reporting-service/values-*, charts/organization-reporting-service/values-*, charts/person-reporting-service/values-*, charts/post-processing-reporting-service/values-*, charts/kafka-connect-sink/values-*, charts/debezium/values-*, charts/data-processing-service/values-*, charts/cluster-autoscaler/values-*, charts/case-notification-service/values-*, charts/data-extraction-service/values-*, charts/debezium-case-notifications/values-*, charts/rtr/values-*" required: false secrets: GIT_USER_EMAIL: diff --git a/argocd/template-values.yaml b/argocd/template-values.yaml index 96b7ac491..5811d9667 100644 --- a/argocd/template-values.yaml +++ b/argocd/template-values.yaml @@ -180,13 +180,6 @@ pageBuilderApi: rtr: ######### -xmlHl7ParserService: - podRequestCPU: - podLimitCPU: - podRequestMemory: - podLimitMemory: - - splunk: clusterName: ingex: diff --git a/argocd/templates/xml-hl7-parser-service.yaml b/argocd/templates/xml-hl7-parser-service.yaml deleted file mode 100644 index de5e2fb86..000000000 --- a/argocd/templates/xml-hl7-parser-service.yaml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: xml-hl7-parser-service - namespace: argocd - annotations: - helm.sh/hook: post-install, post-upgrade - helm.sh/hook-weight: "6" -spec: - destination: - name: '' - namespace: default - server: 'https://kubernetes.default.svc' - source: - repoURL: 'https://github.com/CDCgov/NEDSS-Helm.git' - path: charts/xml-hl7-parser-service - targetRevision: {{ .Chart.AppVersion | quote }} - helm: - valueFiles: - - values.yaml - parameters: - - name: ingressHost - value: {{ .Values.env.appUrl }} - - name: authUri - value: 'http://keycloak.default.svc.cluster.local/auth/realms/NBS' - - name: jdbc.username - value: {{ .Values.env.ODSUsername }} - - name: jdbc.password - value: {{ .Values.env.ODSPassword }} - - name: jdbc.dbserver - value: {{ .Values.env.dbEndpoint }} - - name: resources.requests.cpu - value: {{ .Values.xmlHl7ParserService.podRequestCPU }} - - name: resources.limits.cpu - value: {{ .Values.xmlHl7ParserService.podLimitCPU }} - - name: resources.requests.memory - value: {{ .Values.xmlHl7ParserService.podRequestMemory }} - - name: resources.limits.memory - value: {{ .Values.xmlHl7ParserService.podLimitMemory }} - syncPolicy: - automated: - prune: true - selfHeal: true - project: default diff --git a/argocd/values.yaml b/argocd/values.yaml index a4107b026..e065cc196 100644 --- a/argocd/values.yaml +++ b/argocd/values.yaml @@ -180,13 +180,6 @@ pageBuilderApi: rtr: threadPoolSize: -xmlHl7ParserService: - podRequestCPU: - podLimitCPU: - podRequestMemory: - podLimitMemory: - - splunk: clusterName: ingex: diff --git a/charts/dataingestion-service/templates/ingress.yaml b/charts/dataingestion-service/templates/ingress.yaml index 3ed56fdbb..79ea11daf 100644 --- a/charts/dataingestion-service/templates/ingress.yaml +++ b/charts/dataingestion-service/templates/ingress.yaml @@ -113,15 +113,6 @@ spec: port: number: {{ .Values.caseNotification.port }} {{- end }} - {{- if eq .Values.xmlHl7Parser.enabled "true" }} - - path: "/hl7-parser/" - pathType: Prefix - backend: - service: - name: xml-hl7-parser-service - port: - number: {{ .Values.xmlHl7Parser.port }} - {{- end }} {{- if eq .Values.compare.enabled "true" }} - path: "/comparison/" pathType: Prefix diff --git a/charts/dataingestion-service/values.yaml b/charts/dataingestion-service/values.yaml index 02ecf5fa3..151b63193 100644 --- a/charts/dataingestion-service/values.yaml +++ b/charts/dataingestion-service/values.yaml @@ -60,9 +60,6 @@ caseNotification: enabled: "true" port: 8093 -xmlHl7Parser: - enabled: "true" - port: 8088 compare: enabled: "false" diff --git a/charts/keycloak/extra/10-nbs-users-xml-hl7-parser-service.json b/charts/keycloak/extra/10-nbs-users-xml-hl7-parser-service.json deleted file mode 100644 index aa9eb1871..000000000 --- a/charts/keycloak/extra/10-nbs-users-xml-hl7-parser-service.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "clients": [ - { - "clientId": "xml-hl7-parser-keycloak-client", - "name": "", - "description": "", - "rootUrl": "", - "adminUrl": "", - "baseUrl": "", - "surrogateAuthRequired": false, - "enabled": true, - "alwaysDisplayInConsole": false, - "clientAuthenticatorType": "client-secret", - "redirectUris": [ - "/*" - ], - "webOrigins": [ - "/*" - ], - "notBefore": 0, - "bearerOnly": false, - "consentRequired": false, - "standardFlowEnabled": false, - "implicitFlowEnabled": false, - "directAccessGrantsEnabled": false, - "serviceAccountsEnabled": true, - "publicClient": false, - "frontchannelLogout": true, - "protocol": "openid-connect", - "attributes": { - "oidc.ciba.grant.enabled": "false", - "backchannel.logout.session.required": "true", - "post.logout.redirect.uris": "+", - "oauth2.device.authorization.grant.enabled": "false", - "backchannel.logout.revoke.offline.tokens": "false" - }, - "authenticationFlowBindingOverrides": {}, - "fullScopeAllowed": true, - "nodeReRegistrationTimeout": -1, - "protocolMappers": [ - { - "name": "Client IP Address", - "protocol": "openid-connect", - "protocolMapper": "oidc-usersessionmodel-note-mapper", - "consentRequired": false, - "config": { - "user.session.note": "clientAddress", - "userinfo.token.claim": "true", - "id.token.claim": "true", - "access.token.claim": "true", - "claim.name": "clientAddress", - "jsonType.label": "String" - } - }, - { - "name": "Client Host", - "protocol": "openid-connect", - "protocolMapper": "oidc-usersessionmodel-note-mapper", - "consentRequired": false, - "config": { - "user.session.note": "clientHost", - "userinfo.token.claim": "true", - "id.token.claim": "true", - "access.token.claim": "true", - "claim.name": "clientHost", - "jsonType.label": "String" - } - }, - { - "name": "Client ID", - "protocol": "openid-connect", - "protocolMapper": "oidc-usersessionmodel-note-mapper", - "consentRequired": false, - "config": { - "user.session.note": "client_id", - "userinfo.token.claim": "true", - "id.token.claim": "true", - "access.token.claim": "true", - "claim.name": "client_id", - "jsonType.label": "String" - } - } - ], - "defaultClientScopes": [ - "web-origins", - "acr", - "profile", - "roles", - "email" - ], - "optionalClientScopes": [ - "address", - "phone", - "offline_access", - "microprofile-jwt" - ], - "access": { - "view": true, - "configure": true, - "manage": true - } - } - ] -} diff --git a/charts/xml-hl7-parser-service/.helmignore b/charts/xml-hl7-parser-service/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/charts/xml-hl7-parser-service/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# 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/xml-hl7-parser-service/Chart.yaml b/charts/xml-hl7-parser-service/Chart.yaml deleted file mode 100644 index f064b6bb7..000000000 --- a/charts/xml-hl7-parser-service/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v2 -name: xml-hl7-parser-service -description: A Helm chart for Data Extraction Service for NND Case Notifications - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -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: 1.0.2 - -# 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 -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -#appVersion: "1.16.0" -appVersion: "7.11.1" diff --git a/charts/xml-hl7-parser-service/templates/_helpers.tpl b/charts/xml-hl7-parser-service/templates/_helpers.tpl deleted file mode 100644 index 209424511..000000000 --- a/charts/xml-hl7-parser-service/templates/_helpers.tpl +++ /dev/null @@ -1,66 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "xml-hl7-parser-service.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Create a default fully qualified app name. -We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). -If release name contains chart name it will be used as a full name. -*/}} -{{- define "xml-hl7-parser-service.fullname" -}} -{{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- $name := default .Chart.Name .Values.nameOverride }} -{{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} -{{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} -{{- end }} -{{- end }} -{{- end }} - -{{/* -Create chart name and version as used by the chart label. -*/}} -{{- define "xml-hl7-parser-service.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "xml-hl7-parser-service.labels" -}} -app: NBS -type: Data -helm.sh/chart: {{ include "xml-hl7-parser-service.chart" . }} -{{ include "xml-hl7-parser-service.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "xml-hl7-parser-service.selectorLabels" -}} -app: NBS -type: Data -app.kubernetes.io/name: {{ include "xml-hl7-parser-service.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} - -{{/* -Create the name of the service account to use -*/}} -{{- define "xml-hl7-parser-service.serviceAccountName" -}} -{{- if .Values.serviceAccount.create }} -{{- default (include "xml-hl7-parser-service.fullname" .) .Values.serviceAccount.name }} -{{- else }} -{{- default "default" .Values.serviceAccount.name }} -{{- end }} -{{- end }} diff --git a/charts/xml-hl7-parser-service/templates/deployment.yaml b/charts/xml-hl7-parser-service/templates/deployment.yaml deleted file mode 100644 index cb2f4e1b8..000000000 --- a/charts/xml-hl7-parser-service/templates/deployment.yaml +++ /dev/null @@ -1,52 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "xml-hl7-parser-service.fullname" . }} - labels: - {{- include "xml-hl7-parser-service.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "xml-hl7-parser-service.selectorLabels" . | nindent 6 }} - template: - metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "xml-hl7-parser-service.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - serviceAccountName: {{ include "xml-hl7-parser-service.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: http - containerPort: {{ .Values.service.port }} - protocol: TCP - env: - - name: CN_AUTH_URI - value: {{ .Values.authUri }} - - name: NBS_DBSERVER - value: {{ .Values.jdbc.dbserver }} - - name: NBS_DBUSER - value: {{ .Values.jdbc.username }} - - name: NBS_DBPASSWORD - value: {{ .Values.jdbc.password }} - - name: CN_SERVER_HOST - value: {{ .Values.ingressHost }} - - name: SPRING_PROFILES_ACTIVE - value: "{{ .Values.springBootProfile}}" diff --git a/charts/xml-hl7-parser-service/templates/hpa.yaml b/charts/xml-hl7-parser-service/templates/hpa.yaml deleted file mode 100644 index e47cab291..000000000 --- a/charts/xml-hl7-parser-service/templates/hpa.yaml +++ /dev/null @@ -1,28 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "xml-hl7-parser-service.fullname" . }} - labels: - {{- include "xml-hl7-parser-service.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "xml-hl7-parser-service.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} - {{- end }} - {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} - {{- end }} -{{- end }} diff --git a/charts/xml-hl7-parser-service/templates/service.yaml b/charts/xml-hl7-parser-service/templates/service.yaml deleted file mode 100644 index c025b8fb3..000000000 --- a/charts/xml-hl7-parser-service/templates/service.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "xml-hl7-parser-service.fullname" . }} - labels: - {{- include "xml-hl7-parser-service.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.port }} - name: http - - port: {{ .Values.service.httpsPort }} - targetPort: {{ .Values.service.port }} - name: https - selector: - {{- include "xml-hl7-parser-service.selectorLabels" . | nindent 4 }} diff --git a/charts/xml-hl7-parser-service/templates/serviceaccount.yaml b/charts/xml-hl7-parser-service/templates/serviceaccount.yaml deleted file mode 100644 index 36681e743..000000000 --- a/charts/xml-hl7-parser-service/templates/serviceaccount.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.serviceAccount.create -}} -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "xml-hl7-parser-service.serviceAccountName" . }} - labels: - {{- include "xml-hl7-parser-service.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -{{- end }} diff --git a/charts/xml-hl7-parser-service/templates/tests/test-connection.yaml b/charts/xml-hl7-parser-service/templates/tests/test-connection.yaml deleted file mode 100644 index 8f470df55..000000000 --- a/charts/xml-hl7-parser-service/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "xml-hl7-parser-service.fullname" . }}-test-connection" - labels: - {{- include "xml-hl7-parser-service.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "xml-hl7-parser-service.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never diff --git a/charts/xml-hl7-parser-service/values.yaml b/charts/xml-hl7-parser-service/values.yaml deleted file mode 100644 index 603168c44..000000000 --- a/charts/xml-hl7-parser-service/values.yaml +++ /dev/null @@ -1,57 +0,0 @@ -replicaCount: 1 - -env: "prod" - -authUri: "" - - -image: - repository: "quay.io/us-cdcgov/cdc-nbs-modernization/nnd-case-notification-service/xml-hl7-parser-service" - pullPolicy: IfNotPresent - tag: "v1.0.2" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "" - -serviceAccount: - create: true - annotations: {} - name: "" - -podAnnotations: - prometheus.io/scrape: "true" - prometheus.io/path: "/actuator/prometheus" - prometheus.io/port: "8098" - -podSecurityContext: {} - -securityContext: {} - -service: - type: ClusterIP - port: 8088 - httpsPort: 443 - - -resources: {} - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -ingressHost: "" - -# dbserver is passed in as an environment variable. It is just the database endpoint -jdbc: - dbserver: "" - username: "" - password: ""