From ed03967f4bacd88d1d54b6aec0af8332f6081626 Mon Sep 17 00:00:00 2001 From: Manuel Rafeli Date: Mon, 13 May 2024 17:15:41 +0200 Subject: [PATCH] chore: Use Container App name as url when calling a container app (#489) --- helm/.helmignore | 23 ---- helm/Chart.yaml | 24 ---- helm/pnpg/.helmignore | 23 ---- helm/pnpg/Chart.yaml | 24 ---- helm/pnpg/templates/NOTES.txt | 22 ---- helm/pnpg/templates/_helpers.tpl | 51 -------- helm/pnpg/templates/configmaps.yaml | 12 -- helm/pnpg/templates/deployment.yaml | 112 ----------------- helm/pnpg/templates/hpa.yaml | 29 ----- helm/pnpg/templates/ingress.yaml | 62 ---------- helm/pnpg/templates/service.yaml | 16 --- .../pnpg/templates/tests/test-connection.yaml | 15 --- helm/pnpg/values-dev.yaml | 29 ----- helm/pnpg/values-prod.yaml | 29 ----- helm/pnpg/values-uat.yaml | 30 ----- helm/pnpg/values.yaml | 83 ------------- helm/templates/NOTES.txt | 22 ---- helm/templates/_helpers.tpl | 51 -------- helm/templates/configmaps.yaml | 12 -- helm/templates/deployment.yaml | 114 ------------------ helm/templates/hpa.yaml | 29 ----- helm/templates/ingress.yaml | 62 ---------- helm/templates/pdb.yaml | 12 -- helm/templates/service.yaml | 16 --- helm/templates/tests/test-connection.yaml | 15 --- helm/values-dev.yaml | 42 ------- helm/values-prod.yaml | 45 ------- helm/values-uat.yaml | 40 ------ helm/values.yaml | 91 -------------- .../env/dev-pnpg/terraform.tfvars | 6 +- infra/container_apps/env/dev/terraform.tfvars | 6 +- .../env/prod-pnpg/terraform.tfvars | 6 +- .../container_apps/env/prod/terraform.tfvars | 6 +- .../env/uat-pnpg/terraform.tfvars | 6 +- infra/container_apps/env/uat/terraform.tfvars | 6 +- 35 files changed, 18 insertions(+), 1153 deletions(-) delete mode 100644 helm/.helmignore delete mode 100644 helm/Chart.yaml delete mode 100644 helm/pnpg/.helmignore delete mode 100644 helm/pnpg/Chart.yaml delete mode 100644 helm/pnpg/templates/NOTES.txt delete mode 100644 helm/pnpg/templates/_helpers.tpl delete mode 100644 helm/pnpg/templates/configmaps.yaml delete mode 100644 helm/pnpg/templates/deployment.yaml delete mode 100644 helm/pnpg/templates/hpa.yaml delete mode 100644 helm/pnpg/templates/ingress.yaml delete mode 100644 helm/pnpg/templates/service.yaml delete mode 100644 helm/pnpg/templates/tests/test-connection.yaml delete mode 100644 helm/pnpg/values-dev.yaml delete mode 100644 helm/pnpg/values-prod.yaml delete mode 100644 helm/pnpg/values-uat.yaml delete mode 100644 helm/pnpg/values.yaml delete mode 100644 helm/templates/NOTES.txt delete mode 100644 helm/templates/_helpers.tpl delete mode 100644 helm/templates/configmaps.yaml delete mode 100644 helm/templates/deployment.yaml delete mode 100644 helm/templates/hpa.yaml delete mode 100644 helm/templates/ingress.yaml delete mode 100644 helm/templates/pdb.yaml delete mode 100644 helm/templates/service.yaml delete mode 100644 helm/templates/tests/test-connection.yaml delete mode 100644 helm/values-dev.yaml delete mode 100644 helm/values-prod.yaml delete mode 100644 helm/values-uat.yaml delete mode 100644 helm/values.yaml diff --git a/helm/.helmignore b/helm/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/helm/.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/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index 1e62c452f..000000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: selfcare-ms-core -description: A Helm chart for Kubernetes - -# 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.0 - -# 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: "0.0.1-SNAPSHOT" diff --git a/helm/pnpg/.helmignore b/helm/pnpg/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/helm/pnpg/.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/helm/pnpg/Chart.yaml b/helm/pnpg/Chart.yaml deleted file mode 100644 index 1e62c452f..000000000 --- a/helm/pnpg/Chart.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: v2 -name: selfcare-ms-core -description: A Helm chart for Kubernetes - -# 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.0 - -# 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: "0.0.1-SNAPSHOT" diff --git a/helm/pnpg/templates/NOTES.txt b/helm/pnpg/templates/NOTES.txt deleted file mode 100644 index 029b97730..000000000 --- a/helm/pnpg/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Values.namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "this.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Values.namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Values.namespace }} svc -w {{ include "this.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Values.namespace }} {{ include "this.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Values.namespace }} -l "app.kubernetes.io/name={{ include "this.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Values.namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Values.namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/helm/pnpg/templates/_helpers.tpl b/helm/pnpg/templates/_helpers.tpl deleted file mode 100644 index 129958ef9..000000000 --- a/helm/pnpg/templates/_helpers.tpl +++ /dev/null @@ -1,51 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "this.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 "this.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 "this.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "this.labels" -}} -helm.sh/chart: {{ include "this.chart" . }} -{{ include "this.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "this.selectorLabels" -}} -app.kubernetes.io/name: {{ include "this.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} diff --git a/helm/pnpg/templates/configmaps.yaml b/helm/pnpg/templates/configmaps.yaml deleted file mode 100644 index fd6a82722..000000000 --- a/helm/pnpg/templates/configmaps.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} -data: - {{- with .Values.config }} - {{- toYaml . | nindent 2 }} - {{- end }} - {{- with .Values.configEnvSpecific }} - {{- toYaml . | nindent 2 }} - {{- end }} diff --git a/helm/pnpg/templates/deployment.yaml b/helm/pnpg/templates/deployment.yaml deleted file mode 100644 index 9ebf2d255..000000000 --- a/helm/pnpg/templates/deployment.yaml +++ /dev/null @@ -1,112 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "this.selectorLabels" . | nindent 6 }} - template: - metadata: - annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmaps.yaml") . | sha256sum }} - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "this.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - serviceAccount: in-cluster-app - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - envFrom: - - secretRef: - name: application-insights - - secretRef: - name: common-secrets - - secretRef: - name: mongo-credentials - - secretRef: - name: aruba-sign-service-secrets - - secretRef: - name: contracts-storage - - secretRef: - name: event-secrets - - secretRef: - name: mail - - configMapRef: - name: jwt - - configMapRef: - name: aruba-sign-service - - secretRef: - name: uservice-party-process - - configMapRef: - name: selfcare-core - - configMapRef: - name: inner-service-url - - configMapRef: - name: common - - configMapRef: - name: {{ include "this.fullname" . }} - ports: - - name: http - containerPort: {{ .Values.containers.portNumber }} - protocol: TCP - livenessProbe: - httpGet: - path: /actuator/health/liveness - port: 8080 - scheme: HTTP - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 5 - readinessProbe: - httpGet: - path: /actuator/health/readiness - port: 8080 - scheme: HTTP - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - startupProbe: - httpGet: - path: /actuator/health - port: 8080 - scheme: HTTP - initialDelaySeconds: 20 - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 30 - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/helm/pnpg/templates/hpa.yaml b/helm/pnpg/templates/hpa.yaml deleted file mode 100644 index 33e329098..000000000 --- a/helm/pnpg/templates/hpa.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "this.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/helm/pnpg/templates/ingress.yaml b/helm/pnpg/templates/ingress.yaml deleted file mode 100644 index 7336dd8e3..000000000 --- a/helm/pnpg/templates/ingress.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "this.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/helm/pnpg/templates/service.yaml b/helm/pnpg/templates/service.yaml deleted file mode 100644 index 815d50492..000000000 --- a/helm/pnpg/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP - name: http - selector: - {{- include "this.selectorLabels" . | nindent 4 }} diff --git a/helm/pnpg/templates/tests/test-connection.yaml b/helm/pnpg/templates/tests/test-connection.yaml deleted file mode 100644 index 0b56fbfe3..000000000 --- a/helm/pnpg/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "this.fullname" . }}-test-connection" - labels: - {{- include "this.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "this.fullname" . }}:{{ .Values.service.port }}/actuator/health/liveness'] - restartPolicy: Never diff --git a/helm/pnpg/values-dev.yaml b/helm/pnpg/values-dev.yaml deleted file mode 100644 index c269df85d..000000000 --- a/helm/pnpg/values-dev.yaml +++ /dev/null @@ -1,29 +0,0 @@ -replicaCount: 0 - -image: - repository: selcdcommonacr.azurecr.io/selfcaremscore - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://dev.selfcare.pagopa.it,http://localhost:3000" - tls: - - hosts: - - dev01.pnpg.internal.dev.selfcare.pagopa.it - secretName: dev01-pnpg-internal-dev-selfcare-pagopa-it - hosts: - - host: "dev01.pnpg.internal.dev.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -autoscaling: - enabled: false - minReplicas: 0 - maxReplicas: 0 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "DEBUG" diff --git a/helm/pnpg/values-prod.yaml b/helm/pnpg/values-prod.yaml deleted file mode 100644 index db2962f71..000000000 --- a/helm/pnpg/values-prod.yaml +++ /dev/null @@ -1,29 +0,0 @@ -image: - repository: selcpcommonacr.azurecr.io/selfcaremscore - pullPolicy: Always # TODO change me in IfNotPresent when each build will have a different tag - tag: 1.0-SNAPSHOT - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://imprese.notifichedigitali.it,https://api-pnpg.selfcare.pagopa.it,https://selfcare.pagopa.it" - tls: - - hosts: - - prod01.pnpg.internal.selfcare.pagopa.it - secretName: prod01-pnpg-internal-selfcare-pagopa-it - hosts: - - host: "prod01.pnpg.internal.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "INFO" diff --git a/helm/pnpg/values-uat.yaml b/helm/pnpg/values-uat.yaml deleted file mode 100644 index 82ec3dd8c..000000000 --- a/helm/pnpg/values-uat.yaml +++ /dev/null @@ -1,30 +0,0 @@ -replicaCount: 0 - -image: - repository: selcucommonacr.azurecr.io/selfcaremscore - tag: 1.0-SNAPSHOT - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://uat.selfcare.pagopa.it,http://localhost:3000" - tls: - - hosts: - - uat01.pnpg.internal.uat.selfcare.pagopa.it - secretName: uat01-pnpg-internal-uat-selfcare-pagopa-it - hosts: - - host: "uat01.pnpg.internal.uat.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -autoscaling: - enabled: false - minReplicas: 0 - maxReplicas: 0 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "DEBUG" diff --git a/helm/pnpg/values.yaml b/helm/pnpg/values.yaml deleted file mode 100644 index 179a7d9d4..000000000 --- a/helm/pnpg/values.yaml +++ /dev/null @@ -1,83 +0,0 @@ -# Default values for selfcare-ms-core. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -namespace: pnpg - -replicaCount: 2 - -image: - repository: selcdcommonacr.azurecr.io/selfcaremscore - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "ms-core" - -containers: - portNumber: 8080 - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 8080 - targetPort: 8080 - -ingress: - enabled: true - className: "" - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-headers: "*" - nginx.ingress.kubernetes.io/cors-allow-origin: "https://selfcare.pagopa.it" - - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -config: - APPLICATIONINSIGHTS_ROLE_NAME: "ms-core" \ No newline at end of file diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt deleted file mode 100644 index 029b97730..000000000 --- a/helm/templates/NOTES.txt +++ /dev/null @@ -1,22 +0,0 @@ -1. Get the application URL by running these commands: -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Values.namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "this.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Values.namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Values.namespace }} svc -w {{ include "this.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Values.namespace }} {{ include "this.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Values.namespace }} -l "app.kubernetes.io/name={{ include "this.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Values.namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Values.namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl deleted file mode 100644 index 129958ef9..000000000 --- a/helm/templates/_helpers.tpl +++ /dev/null @@ -1,51 +0,0 @@ -{{/* -Expand the name of the chart. -*/}} -{{- define "this.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 "this.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 "this.chart" -}} -{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} -{{- end }} - -{{/* -Common labels -*/}} -{{- define "this.labels" -}} -helm.sh/chart: {{ include "this.chart" . }} -{{ include "this.selectorLabels" . }} -{{- if .Chart.AppVersion }} -app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} -{{- end }} -app.kubernetes.io/managed-by: {{ .Release.Service }} -{{- end }} - -{{/* -Selector labels -*/}} -{{- define "this.selectorLabels" -}} -app.kubernetes.io/name: {{ include "this.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} -{{- end }} diff --git a/helm/templates/configmaps.yaml b/helm/templates/configmaps.yaml deleted file mode 100644 index fd6a82722..000000000 --- a/helm/templates/configmaps.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} -data: - {{- with .Values.config }} - {{- toYaml . | nindent 2 }} - {{- end }} - {{- with .Values.configEnvSpecific }} - {{- toYaml . | nindent 2 }} - {{- end }} diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml deleted file mode 100644 index 1304219f8..000000000 --- a/helm/templates/deployment.yaml +++ /dev/null @@ -1,114 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - {{- if not .Values.autoscaling.enabled }} - replicas: {{ .Values.replicaCount }} - {{- end }} - selector: - matchLabels: - {{- include "this.selectorLabels" . | nindent 6 }} - template: - metadata: - annotations: - checksum/config: {{ include (print $.Template.BasePath "/configmaps.yaml") . | sha256sum }} - {{- with .Values.podAnnotations }} - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - {{- include "this.selectorLabels" . | nindent 8 }} - spec: - {{- with .Values.imagePullSecrets }} - imagePullSecrets: - {{- toYaml . | nindent 8 }} - {{- end }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - serviceAccount: in-cluster-app - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - envFrom: - - secretRef: - name: application-insights - - secretRef: - name: common-secrets - - secretRef: - name: mongo-credentials - - secretRef: - name: aruba-sign-service-secrets - - secretRef: - name: contracts-storage - - secretRef: - name: event-secrets - - secretRef: - name: mail - - secretRef: - name: geotaxonomy-secrets - - configMapRef: - name: jwt - - configMapRef: - name: aruba-sign-service - - secretRef: - name: uservice-party-process - - configMapRef: - name: selfcare-core - - configMapRef: - name: inner-service-url - - configMapRef: - name: common - - configMapRef: - name: {{ include "this.fullname" . }} - ports: - - name: http - containerPort: {{ .Values.containers.portNumber }} - protocol: TCP - livenessProbe: - httpGet: - path: /actuator/health/liveness - port: 8080 - scheme: HTTP - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 5 - readinessProbe: - httpGet: - path: /actuator/health/readiness - port: 8080 - scheme: HTTP - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 3 - startupProbe: - httpGet: - path: /actuator/health - port: 8080 - scheme: HTTP - initialDelaySeconds: 20 - timeoutSeconds: 5 - periodSeconds: 10 - successThreshold: 1 - failureThreshold: 30 - resources: - {{- toYaml .Values.resources | nindent 12 }} - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} diff --git a/helm/templates/hpa.yaml b/helm/templates/hpa.yaml deleted file mode 100644 index 33e329098..000000000 --- a/helm/templates/hpa.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ include "this.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/helm/templates/ingress.yaml b/helm/templates/ingress.yaml deleted file mode 100644 index 7336dd8e3..000000000 --- a/helm/templates/ingress.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "this.fullname" . -}} -{{- $svcPort := .Values.service.port -}} -{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} - {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} - {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} - {{- end }} -{{- end }} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1 -{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -apiVersion: networking.k8s.io/v1beta1 -{{- else -}} -apiVersion: extensions/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ $fullName }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} - {{- with .Values.ingress.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} - ingressClassName: {{ .Values.ingress.className }} - {{- end }} - {{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} - {{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ .host | quote }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} - pathType: {{ .pathType }} - {{- end }} - backend: - {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} - service: - name: {{ $fullName }} - port: - number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/helm/templates/pdb.yaml b/helm/templates/pdb.yaml deleted file mode 100644 index fead2ea4b..000000000 --- a/helm/templates/pdb.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if .Values.pdb.enabled }} -apiVersion: policy/v1 -kind: PodDisruptionBudget -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} -spec: - minAvailable: {{ .Values.pdb.minAvailable }} - selector: - matchLabels: - {{- include "this.selectorLabels" . | nindent 6 }} -{{- end }} diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml deleted file mode 100644 index 815d50492..000000000 --- a/helm/templates/service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: {{ include "this.fullname" . }} - namespace: {{ .Values.namespace }} - labels: - {{- include "this.labels" . | nindent 4 }} -spec: - type: {{ .Values.service.type }} - ports: - - port: {{ .Values.service.port }} - targetPort: {{ .Values.service.targetPort }} - protocol: TCP - name: http - selector: - {{- include "this.selectorLabels" . | nindent 4 }} diff --git a/helm/templates/tests/test-connection.yaml b/helm/templates/tests/test-connection.yaml deleted file mode 100644 index 0b56fbfe3..000000000 --- a/helm/templates/tests/test-connection.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "this.fullname" . }}-test-connection" - labels: - {{- include "this.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "this.fullname" . }}:{{ .Values.service.port }}/actuator/health/liveness'] - restartPolicy: Never diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml deleted file mode 100644 index d6c18a4ac..000000000 --- a/helm/values-dev.yaml +++ /dev/null @@ -1,42 +0,0 @@ -replicaCount: 0 - -image: - repository: selcdacr.azurecr.io/selfcaremscore - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://dev.selfcare.pagopa.it,http://localhost:3000" - tls: - - hosts: - - selc.internal.dev.selfcare.pagopa.it - secretName: selc-internal-dev-selfcare-pagopa-it - hosts: - - host: "selc.internal.dev.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -resources: - requests: - cpu: 500m - memory: 700M - limits: - cpu: 1600m - memory: 900M - -autoscaling: - enabled: false - minReplicas: 0 - maxReplicas: 0 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -pdb: - enabled: true - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "DEBUG" - CORE_USER_EVENT_SERVICE_TYPE: "send" - CORE_CONTRACT_EVENT_SERVICE_TYPE: "send" diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml deleted file mode 100644 index 5989aac6b..000000000 --- a/helm/values-prod.yaml +++ /dev/null @@ -1,45 +0,0 @@ -replicaCount: 3 - -image: - repository: selcpacr.azurecr.io/selfcaremscore - pullPolicy: Always # TODO change me in IfNotPresent when each build will have a different tag - tag: 1.0-SNAPSHOT - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://selfcare.pagopa.it,https://api.platform.pagopa.it" - tls: - - hosts: - - selc.internal.selfcare.pagopa.it - secretName: selc-internal-selfcare-pagopa-it - hosts: - - host: "selc.internal.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -resources: - requests: - cpu: 600m - memory: 900M - limits: - cpu: 1600m - memory: 1200M - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -pdb: - enabled: true - minAvailable: 2 - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "INFO" - CORE_USER_EVENT_SERVICE_TYPE: "send" - CORE_CONTRACT_EVENT_SERVICE_TYPE: "send" diff --git a/helm/values-uat.yaml b/helm/values-uat.yaml deleted file mode 100644 index f17f4f011..000000000 --- a/helm/values-uat.yaml +++ /dev/null @@ -1,40 +0,0 @@ -replicaCount: 0 - -image: - repository: selcuacr.azurecr.io/selfcaremscore - tag: 1.0-SNAPSHOT - -ingress: - annotations: - nginx.ingress.kubernetes.io/cors-allow-origin: "https://uat.selfcare.pagopa.it,http://localhost:3000" - tls: - - hosts: - - selc.internal.uat.selfcare.pagopa.it - secretName: selc-internal-uat-selfcare-pagopa-it - hosts: - - host: "selc.internal.uat.selfcare.pagopa.it" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - -resources: - requests: - cpu: 500m - memory: 700M - limits: - cpu: 1600m - memory: 900M - -autoscaling: - enabled: false - minReplicas: 0 - maxReplicas: 0 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -configEnvSpecific: - JAVA_TOOL_OPTIONS: "-javaagent:/applicationinsights-agent.jar" - APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL: "OFF" - EXTERNAL_API_LOG_LEVEL: "DEBUG" - CORE_USER_EVENT_SERVICE_TYPE: "send" - CORE_CONTRACT_EVENT_SERVICE_TYPE: "send" diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index c74c66d7f..000000000 --- a/helm/values.yaml +++ /dev/null @@ -1,91 +0,0 @@ -# Default values for selfcare-ms-core. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -namespace: selc - -replicaCount: 2 - -image: - repository: selcdacr.azurecr.io/selfcaremscore - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "latest" - -imagePullSecrets: [] -nameOverride: "" -fullnameOverride: "ms-core" - -containers: - portNumber: 8080 - -podAnnotations: {} - -podSecurityContext: {} - # fsGroup: 2000 - -securityContext: {} - # capabilities: - # drop: - # - ALL - # readOnlyRootFilesystem: true - # runAsNonRoot: true - # runAsUser: 1000 - -service: - type: ClusterIP - port: 8080 - targetPort: 8080 - -ingress: - enabled: true - className: "" - annotations: - kubernetes.io/ingress.class: "nginx" - nginx.ingress.kubernetes.io/rewrite-target: "/$1" - nginx.ingress.kubernetes.io/ssl-redirect: "false" - nginx.ingress.kubernetes.io/use-regex: "true" - nginx.ingress.kubernetes.io/enable-cors: "true" - nginx.ingress.kubernetes.io/cors-allow-headers: "*" - nginx.ingress.kubernetes.io/cors-allow-origin: "https://selfcare.pagopa.it" - hosts: - - host: "" - paths: - - path: /ms-core/v1/(.*) - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - -resources: {} - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - # limits: - # cpu: 100m - # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi - -autoscaling: - enabled: false - minReplicas: 1 - maxReplicas: 100 - targetCPUUtilizationPercentage: 80 - # targetMemoryUtilizationPercentage: 80 - -pdb: - enabled: false - minAvailable: 1 - -nodeSelector: {} - -tolerations: [] - -affinity: {} - -config: - APPLICATIONINSIGHTS_ROLE_NAME: "ms-core" diff --git a/infra/container_apps/env/dev-pnpg/terraform.tfvars b/infra/container_apps/env/dev-pnpg/terraform.tfvars index 6d0fe6aa4..2e0317299 100644 --- a/infra/container_apps/env/dev-pnpg/terraform.tfvars +++ b/infra/container_apps/env/dev-pnpg/terraform.tfvars @@ -168,11 +168,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-d-pnpg-notification-mngr-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io" + value = "http://selc-d-pnpg-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-d-pnpg-party-reg-proxy-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io" + value = "http://selc-d-pnpg-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -180,7 +180,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-d-pnpg-user-ms-ca.victoriousfield-e39534b8.westeurope.azurecontainerapps.io" + value = "http://selc-d-pnpg-user-ms-ca" } ] diff --git a/infra/container_apps/env/dev/terraform.tfvars b/infra/container_apps/env/dev/terraform.tfvars index 8a7b4318f..bf0dc578c 100644 --- a/infra/container_apps/env/dev/terraform.tfvars +++ b/infra/container_apps/env/dev/terraform.tfvars @@ -188,11 +188,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-d-notification-mngr-ca.politewater-9af33050.westeurope.azurecontainerapps.io" + value = "http://selc-d-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-d-party-reg-proxy-ca.politewater-9af33050.westeurope.azurecontainerapps.io" + value = "http://selc-d-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -200,7 +200,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-d-user-ms-ca.politewater-9af33050.westeurope.azurecontainerapps.io" + value = "http://selc-d-user-ms-ca" } ] diff --git a/infra/container_apps/env/prod-pnpg/terraform.tfvars b/infra/container_apps/env/prod-pnpg/terraform.tfvars index 7d1452ef6..5d62c6122 100644 --- a/infra/container_apps/env/prod-pnpg/terraform.tfvars +++ b/infra/container_apps/env/prod-pnpg/terraform.tfvars @@ -163,11 +163,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-p-pnpg-notification-mngr-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io" + value = "http://selc-p-pnpg-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-p-pnpg-party-reg-proxy-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io" + value = "http://selc-p-pnpg-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -175,7 +175,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-p-pnpg-user-ms-ca.calmmoss-0be48755.westeurope.azurecontainerapps.io" + value = "http://selc-p-pnpg-user-ms-ca" }, { name = "PRODUCT_STORAGE_CONTAINER" diff --git a/infra/container_apps/env/prod/terraform.tfvars b/infra/container_apps/env/prod/terraform.tfvars index fdd60287c..0c45df018 100644 --- a/infra/container_apps/env/prod/terraform.tfvars +++ b/infra/container_apps/env/prod/terraform.tfvars @@ -176,11 +176,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-p-notification-mngr-ca.greensand-62fc96da.westeurope.azurecontainerapps.io" + value = "http://selc-p-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-p-party-reg-proxy-ca.greensand-62fc96da.westeurope.azurecontainerapps.io" + value = "http://selc-p-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -188,7 +188,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-p-user-ms-ca.greensand-62fc96da.westeurope.azurecontainerapps.io" + value = "http://selc-p-user-ms-ca" }, { name = "PRODUCT_STORAGE_CONTAINER" diff --git a/infra/container_apps/env/uat-pnpg/terraform.tfvars b/infra/container_apps/env/uat-pnpg/terraform.tfvars index 3d7c7424c..a5ad2892a 100644 --- a/infra/container_apps/env/uat-pnpg/terraform.tfvars +++ b/infra/container_apps/env/uat-pnpg/terraform.tfvars @@ -156,11 +156,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-u-pnpg-notification-mngr-ca.orangeground-0bd2d4dc.westeurope.azurecontainerapps.io" + value = "http://selc-u-pnpg-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-pnpg-party-reg-proxy-ca.orangeground-0bd2d4dc.westeurope.azurecontainerapps.io" + value = "http://selc-u-pnpg-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -168,7 +168,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-u-pnpg-user-ms-ca.orangeground-0bd2d4dc.westeurope.azurecontainerapps.io" + value = "http://selc-u-pnpg-user-ms-ca" }, { name = "PRODUCT_STORAGE_CONTAINER" diff --git a/infra/container_apps/env/uat/terraform.tfvars b/infra/container_apps/env/uat/terraform.tfvars index c5b07719c..c3861ae52 100644 --- a/infra/container_apps/env/uat/terraform.tfvars +++ b/infra/container_apps/env/uat/terraform.tfvars @@ -167,11 +167,11 @@ app_settings = [ }, { name = "MS_NOTIFICATION_MANAGER_URL" - value = "https://selc-u-notification-mngr-ca.proudglacier-20652b81.westeurope.azurecontainerapps.io" + value = "http://selc-u-notification-mngr-ca" }, { name = "USERVICE_PARTY_REGISTRY_PROXY_URL" - value = "https://selc-u-party-reg-proxy-ca.proudglacier-20652b81.westeurope.azurecontainerapps.io" + value = "http://selc-u-party-reg-proxy-ca" }, { name = "USERVICE_USER_REGISTRY_URL" @@ -179,7 +179,7 @@ app_settings = [ }, { name = "SELFCARE_USER_URL" - value = "https://selc-u-user-ms-ca.proudglacier-20652b81.westeurope.azurecontainerapps.io" + value = "http://selc-u-user-ms-ca" }, { name = "PRODUCT_STORAGE_CONTAINER"