Skip to content

Commit

Permalink
B4f onboarding (#62)
Browse files Browse the repository at this point in the history
* added onboarding-backend

* added TODO to remember to remove product from ingress

Co-authored-by: anttorre <[email protected]>
  • Loading branch information
antonioT90 and anttorre authored Dec 2, 2021
1 parent 7790355 commit c79787b
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 0 deletions.
14 changes: 14 additions & 0 deletions src/k8s/selc_configmaps.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ resource "kubernetes_config_map" "inner-service-url" {
data = {
HUB_SPID_LOGIN_URL = "http://hub-spid-login-ms:8080"
B4F_DASHBOARD_URL = "http://b4f-dashboard:8080"
B4F_ONBOARDING_URL = "http://b4f-onboarding:8080"
MS_PRODUCT_URL = "http://ms-product:8080"
USERVICE_PARTY_PROCESS_URL = "https://selc-d-apim.azure-api.net/party-process/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-process:8088/pdnd-interop-uservice-party-process/0.1"
USERVICE_PARTY_MANAGEMENT_URL = "https://selc-d-apim.azure-api.net/party-management/v1" // TODO when mock not more required "http://pdnd-interop-uservice-party-management:8088/pdnd-interop-uservice-party-management/0.1"
Expand Down Expand Up @@ -94,6 +95,19 @@ resource "kubernetes_config_map" "b4f-dashboard" {
)
}

resource "kubernetes_config_map" "b4f-onboarding" {
metadata {
name = "b4f-onboarding"
namespace = kubernetes_namespace.selc.metadata[0].name
}

data = merge({
JWT_TOKEN_PUBLIC_KEY = module.key_vault_secrets_query.values["jwt-public-key"].value
},
var.configmaps_b4f-onboarding
)
}

resource "kubernetes_config_map" "uservice-attribute-registry-management" {
metadata {
name = "uservice-attribute-registry-management"
Expand Down
8 changes: 8 additions & 0 deletions src/k8s/selc_ingress.tf
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ resource "kubernetes_ingress" "selc_ingress" {
}

path {
backend {
service_name = "b4f-onboarding"
service_port = var.default_service_port
}
path = "/onboarding/v1/(.*)"
}

path { // TODO remove me
backend {
service_name = "ms-product"
service_port = var.default_service_port
Expand Down
6 changes: 6 additions & 0 deletions src/k8s/subscriptions/DEV-SelfCare/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ configmaps_b4f-dashboard = {
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_b4f-onboarding = {
JAVA_TOOL_OPTIONS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_ROLE_NAME = "b4f-onboarding"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_uservice-attribute-registry-management = {
JAVA_OPTS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
Expand Down
6 changes: 6 additions & 0 deletions src/k8s/subscriptions/PROD-SelfCare/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ configmaps_b4f-dashboard = {
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_b4f-onboarding = {
JAVA_TOOL_OPTIONS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_ROLE_NAME = "b4f-onboarding"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_uservice-attribute-registry-management = {
JAVA_OPTS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
Expand Down
6 changes: 6 additions & 0 deletions src/k8s/subscriptions/UAT-SelfCare/terraform.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ configmaps_b4f-dashboard = {
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_b4f-onboarding = {
JAVA_TOOL_OPTIONS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_ROLE_NAME = "b4f-onboarding"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
}

configmaps_uservice-attribute-registry-management = {
JAVA_OPTS = "-javaagent:/applicationinsights-agent.jar"
APPLICATIONINSIGHTS_INSTRUMENTATION_LOGGING_LEVEL = "OFF"
Expand Down
4 changes: 4 additions & 0 deletions src/k8s/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ variable "configmaps_b4f-dashboard" {
type = map(string)
}

variable "configmaps_b4f-onboarding" {
type = map(string)
}

variable "configmaps_uservice-attribute-registry-management" {
type = map(string)
}
Expand Down

0 comments on commit c79787b

Please sign in to comment.