Update: tf for notification

helm/osdu-gc-baremetal/Chart.yaml

@@ -107,12 +107,6 @@ dependencies:
     repository: oci://community.opengroup.org:5555/osdu/platform/security-and-compliance/legal/core-helm
     condition: core_legal_deploy.enabled
     alias: core_legal_deploy
-  ## Notification
-  - name: gc-notification-deploy
-    version: 0.0.7-latest
-    repository: oci://community.opengroup.org:5555/osdu/platform/system/notification/gc-helm
-    condition: gc_notification_deploy.enabled
-    alias: gc_notification_deploy
   ## Search
   - name: gc-search-deploy
     version: 0.0.7-latest

helm/osdu-gc-baremetal/values.yaml

@@ -359,11 +359,6 @@ gc_dataset_deploy:
     postgresSecretName: "dataset-postgres-secret"
 # --- End of Dataset values --- #
 
-# --- Notification values --- #
-gc_notification_deploy:
-  enabled: true
-# --- End of Notification values --- #
-
 # --- File values --- #
 gc_file_deploy:
   enabled: true

modules/osdu_k8s/files/templates/values.tpl

@@ -79,13 +79,6 @@ gc_dataset_deploy:
     logLevel: ${log_level}
 # --- End of Dataset values --- #
 
-# --- Notification values --- #
-gc_notification_deploy:
-  conf:
-    replicas: ${replicas}
-    logLevel: ${log_level}
-# --- End of Notification values --- #
-
 # --- File values --- #
 gc_file_deploy:
   conf:

modules/osdu_k8s/helm_notification.tf

+/**
+*  Copyright 2024 Google LLC
+*  Copyright 2024 EPAM
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+
+resource "helm_release" "notification" {
+  # FIXME: Update depends_on when all services are ready
+  depends_on = [helm_release.partition]
+  name            = "notification"
+  repository      = "oci://${var.repository}/osdu/platform/system/notification/gc-helm"
+  chart           = "gc-notification-deploy"
+  version         = var.notification_svc_version
+  namespace       = var.services_namespace
+  recreate_pods   = true
+  timeout         = 1800
+  upgrade_install = var.upgrade
+
+  set {
+    name  = "global.domain"
+    value = var.ingress_domain
+ }
+  set {
+    name  = "global.tier"
+    value = var.tier
+  }
+  set {
+    name  = "global.autoscaling"
+    value = var.autoscaling
+  }
+  set {
+    name  = "conf.replicas"
+    value = local.service_replicas
+  }
+  set {
+    name  = "conf.logLevel"
+    value = local.log_level
+  }
+}

modules/osdu_k8s/inputs_versions.tf

@@ -83,7 +83,13 @@ variable "eds_svc_version" {
 }
 
 variable "entitlements_svc_version" {
-  description = "Version of the eds service"
+  description = "Version of the entitlements service"
+  type        = string
+  default     = "0.0.7-latest"
+}
+
+variable "notification_svc_version" {
+  description = "Version of the notification service"
   type        = string
   default     = "0.0.7-latest"
 }