From 44b8a150b777c2eae5822f7c1e4c92ec3eaa250b Mon Sep 17 00:00:00 2001 From: "Nastassia Rabeichykava (EPAM)" Date: Thu, 24 Mar 2022 13:10:23 +0400 Subject: [PATCH 1/3] GONRG-4556: modify helm for unit to onprem --- helm/osdu-infra-onprem/Chart.yaml | 8 ++++++++ helm/osdu-infra-onprem/values.yaml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/helm/osdu-infra-onprem/Chart.yaml b/helm/osdu-infra-onprem/Chart.yaml index 4d4b0cb0..d6410751 100644 --- a/helm/osdu-infra-onprem/Chart.yaml +++ b/helm/osdu-infra-onprem/Chart.yaml @@ -113,3 +113,11 @@ dependencies: version: 0.1.0 repository: https://community.opengroup.org/api/v4/projects/221/packages/helm/stable condition: gcp-partition-configmap.enabled + - name: gcp-unit-configmap + version: 0.1.0 + repository: https://community.opengroup.org/api/v4/projects/5/packages/helm/stable + condition: gcp-unit-configmap.enabled + - name: gcp-unit-deploy + version: 0.1.0 + repository: https://community.opengroup.org/api/v4/projects/5/packages/helm/stable + condition: gcp-unit-deploy.enabled diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml index 44b52585..4a97e7b3 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -387,3 +387,33 @@ partitionBootstrap: app_name: "partition" # --- Partition values --- # + +# --- Unit values --- # + +gcp-unit-configmap: + enabled: true + data: + log_level: "INFO" + entitlement_url: "http://entitlements/api/entitlements/v2/" + conf: + configmap: "unit-config" + app_name: "unit-conversion" + + +gcp-unit-deploy: + enabled: true + data: + requests_cpu: "0.1" + requests_memory: "256M" + limits_cpu: "1" + limits_memory: "1G" + serviceAccountName: "unit-k8s" + image: "gcr.io/osdu-anthos/os-unit-anthos:2" + imagePullPolicy: "IfNotPresent" + + conf: + configmap: "unit-config" + app_name: "unit" + on_prem_enabled: true + +# --- End of Unit values --- # -- GitLab From 2d4110e0d7e3a72f06b383accb428472967d062f Mon Sep 17 00:00:00 2001 From: "Nastassia Rabeichykava (EPAM)" Date: Fri, 25 Mar 2022 13:01:31 +0400 Subject: [PATCH 2/3] GONRG-4556: modify helm for unit to onprem --- helm/osdu-infra-onprem/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml index 4a97e7b3..287827ad 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -397,7 +397,7 @@ gcp-unit-configmap: entitlement_url: "http://entitlements/api/entitlements/v2/" conf: configmap: "unit-config" - app_name: "unit-conversion" + app_name: "unit" gcp-unit-deploy: -- GitLab From f65db7ea260803956d5b64a2052cfb87b6e18d7a Mon Sep 17 00:00:00 2001 From: "Nastassia Rabeichykava (EPAM)" Date: Fri, 25 Mar 2022 13:23:09 +0400 Subject: [PATCH 3/3] GONRG-4556: modify helm for unit to onprem --- helm/osdu-infra-onprem/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/osdu-infra-onprem/values.yaml b/helm/osdu-infra-onprem/values.yaml index 287827ad..4de23e82 100644 --- a/helm/osdu-infra-onprem/values.yaml +++ b/helm/osdu-infra-onprem/values.yaml @@ -317,7 +317,7 @@ gcp-crs-conversion-deploy: limits_cpu: "1" limits_memory: "1G" serviceAccountName: "crs-conversion-k8s" - image: "gcr.io/osdu-anthos/crs-conversion:onprem2" + image: "community.opengroup.org:5555/osdu/platform/system/reference/crs-conversion-service/osdu-gcp" imagePullPolicy: "IfNotPresent" conf: @@ -408,7 +408,7 @@ gcp-unit-deploy: limits_cpu: "1" limits_memory: "1G" serviceAccountName: "unit-k8s" - image: "gcr.io/osdu-anthos/os-unit-anthos:2" + image: "community.opengroup.org:5555/osdu/platform/system/reference/unit-service/osdu-gcp" imagePullPolicy: "IfNotPresent" conf: -- GitLab