#0 fix: update image tags for GA release (#126)

* #0 fix: update image tags for GA release * #0 fix: add conflict handling for system settings
Sanketika-Obsrv · Dec 26, 2023 · 7a2afae · 7a2afae
1 parent 3043905
commit 7a2afae
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 15 deletions.
diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
@@ -50,7 +50,7 @@ variable "dataset_api_container_registry" {
 variable "dataset_api_image_tag" {
   type        = string
   description = "Dataset api image tag."
-  default     = "develop-ga"
+  default     = "1.0.0-GA"
 }
 
 variable "flink_container_registry" {
@@ -62,7 +62,7 @@ variable "flink_container_registry" {
 variable "flink_image_tag" {
    type        = string
    description = "Flink kubernetes service name."
-   default     = "develop-ga"
+   default     = "1.0.0-GA"
 }
 
 variable "web_console_configs" {
@@ -83,7 +83,7 @@ variable "web_console_configs" {
 variable "web_console_image_tag" {
   type        = string
   description = "web console image tag."
-  default = "develop-ga"
+  default = "1.0.0-GA"
 }
 
 variable "web_console_image_repository" {
@@ -125,5 +125,5 @@ variable "merged_pipeline_enabled" {
 variable "command_service_image_tag" {
   type        = string
   description = "CommandService image tag."
-  default     = "develop-ga"
+  default     = "1.0.0-GA"
 }
diff --git a/terraform/modules/helm/command_service/command-service-helm-chart/values.yaml b/terraform/modules/helm/command_service/command-service-helm-chart/values.yaml
@@ -1,7 +1,7 @@
 http_port: 8000
 image: 
   repository: sanketikahub/flink-command-service
-  tag: 1.0.0
+  tag: 1.0.0-GA
   pullPolicy: "IfNotPresent"
   imagePullSecrets: ""
 cpu_requests: 0.1

diff --git a/terraform/modules/helm/dataset_api/dataset-api-helm-chart/values.yaml b/terraform/modules/helm/dataset_api/dataset-api-helm-chart/values.yaml
@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   registry: "sanketikahub"
   repository: "obsrv-api-service"
-  image_tag: 1.0.0
+  image_tag: 1.0.0-GA
   imagePullSecrets: ""
 cpu_requests: 0.5
 cpu_limits: 0.5

diff --git a/terraform/modules/helm/dataset_api/variables.tf b/terraform/modules/helm/dataset_api/variables.tf
@@ -84,7 +84,7 @@ variable "dataset_api_image_name" {
 variable "dataset_api_image_tag" {
   type        = string
   description = "Dataset api image tag."
-  default     = "1.0.0"
+  default     = "1.0.0-GA"
 }
 
 variable "dataset_api_sa_annotations" {

diff --git a/terraform/modules/helm/flink/flink-helm-chart/values.yaml b/terraform/modules/helm/flink/flink-helm-chart/values.yaml
@@ -3,7 +3,7 @@ imagepullsecrets: ""
 image:
   registry: sanketikahub
   repository: merged-pipeline
-  tag: release-0.5.0_RC23
+  tag: 1.0.0-GA
 serviceMonitor:
   enabled: false
 replicaCount: 1
@@ -484,4 +484,4 @@ serviceAccount:
   annotations: {}
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
-  name: ""
+  name: ""
diff --git a/terraform/modules/helm/flink/variables.tf b/terraform/modules/helm/flink/variables.tf
@@ -84,7 +84,7 @@ variable "flink_container_registry" {
 variable "flink_image_tag" {
   type        = string
   description = "Flink image tag."
-  default     = "1.1.0"
+  default     = "1.0.0-GA"
 }
 
 variable "flink_checkpoint_store_type" {

diff --git a/...gration/postgresql-migration-helm-chart/migration/03_obsrv/V2__create_system_settings.sql b/...gration/postgresql-migration-helm-chart/migration/03_obsrv/V2__create_system_settings.sql
@@ -13,7 +13,7 @@ INSERT INTO system_settings VALUES
    ('encryptionSecretKey', '{{ .Values.system_settings.encryption_key }}', 'SYSTEM', 'string', now(), now(), 'Data Encryption Secret Key'),
    ('defaultDatasetId', '{{ .Values.system_settings.default_dataset_id }}', 'SYSTEM', 'string', now(), now(), 'Default Dataset ID'),
    ('maxEventSize', '{{ .Values.system_settings.max_event_size }}', 'SYSTEM', 'long', now(), now(), 'Maximum Event Size (per event)'),
-   ('defaultDedupPeriodInSeconds', '{{ .Values.system_settings.dedup_period }}', 'SYSTEM', 'int', now(), now(), 'Default Dedup Period (in seconds)');
+   ('defaultDedupPeriodInSeconds', '{{ .Values.system_settings.dedup_period }}', 'SYSTEM', 'int', now(), now(), 'Default Dedup Period (in seconds)')  ON CONFLICT DO NOTHING;
 
 GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO obsrv;
 GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO obsrv;
diff --git a/terraform/modules/helm/secor/secor-helm-chart/values.yaml b/terraform/modules/helm/secor/secor-helm-chart/values.yaml
@@ -16,7 +16,7 @@ image_repository: "sanketikahub/secor"
 region: "" # region name to be provided for ex: "us-east-2"
 pullPolicy: "IfNotPresent"
 jvm_memory: 1024m
-image_tag: "0.29.16-java-11-gs" # TODO - Update the right version of secor image
+image_tag: "1.0.0-GA" # TODO - Update the right version of secor image
 timezone: "UTC"
 secor_jobs:
   ingest-backup:

diff --git a/terraform/modules/helm/secor/variables.tf b/terraform/modules/helm/secor/variables.tf
@@ -17,7 +17,7 @@ variable "secor_release_name" {
 variable "secor_image_tag" {
   type        = string
   description = "secor image version"
-  default     = "deveop-ga"
+  default     = "1.0.0-GA"
 }
 
 variable "jobs" {

diff --git a/terraform/modules/helm/web_console/variables.tf b/terraform/modules/helm/web_console/variables.tf
@@ -52,7 +52,7 @@ variable "web_console_image_repository" {
 variable "web_console_image_tag" {
   type        = string
   description = "web console image tag."
-  default     = "1.0.0"
+  default     = "1.0.0-GA"
 }
 
 variable "web_console_image_name" {

diff --git a/terraform/modules/helm/web_console/web-console-helm-chart/values.yaml b/terraform/modules/helm/web_console/web-console-helm-chart/values.yaml
@@ -7,7 +7,7 @@ memory_limits: 1024Mi
 image:
   repository: sanketikahub
   image_name: sb-obsrv-web-console
-  tag: "1.0.0"
+  tag: "1.0.0-GA"
   pullPolicy: "IfNotPresent"
 ENV: development
 PORT: 3000