diff --git a/config-as-code/environments/egov-demo-secrets.yaml b/config-as-code/environments/egov-demo-secrets.yaml index 8df16263e..0a00e48bd 100644 --- a/config-as-code/environments/egov-demo-secrets.yaml +++ b/config-as-code/environments/egov-demo-secrets.yaml @@ -9,8 +9,8 @@ cluster-configs: username: demo password: demo egov-filestore: # To work Filestore service add the IAM user details which has access on the filestore s3 bucket. - aws-key: aswedfghew - aws-secret-key: xdefghgdxc + aws-key: QUtJQVo0Vzc2NkJLUkFEVzJXNUw= + aws-secret-key: OFJwYWU2VFdPRzFtQ0NnSkdQMTExajJDUlZ4YWVzZWlWZUFxam9nbQ== egov-location: # To work Location service add your gmap key gmapskey: AIzaSyAQOd09-sdfegv egov-pg-service: # To work pg service add your respective bank details @@ -36,31 +36,31 @@ cluster-configs: git-sync: # To clone the config and mdms repos, Create github user and add your ssh private key below. This private should have access to config and mdms repo. ssh: | -----BEGIN RSA PRIVATE KEY----- - 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 -----END RSA PRIVATE KEY----- known-hosts: github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= kibana: # Add Kibana details diff --git a/config-as-code/environments/egov-demo.yaml b/config-as-code/environments/egov-demo.yaml index 86db71ed3..10e531e8a 100644 --- a/config-as-code/environments/egov-demo.yaml +++ b/config-as-code/environments/egov-demo.yaml @@ -100,8 +100,11 @@ cluster-configs: household: "http://household:8080/" individual: "http://individual:8080/" stock: "http://stock:8080/" + plan-service: "http://project:8080/" facility: "http://facility:8080/" service-request: "http://service-request:8080/" + census-service: "http://census-service.health:8080/" + employee: dashboard-url: "https://dashboard-pbuat.egovernments.org/s/w---s/app/kibana#/dashboard/4e687470-f3c7-11e8-8d09-b151e2b1cf8e?embed=true&_g=(refreshInterval%3A(pause%3A!f%2Cvalue%3A300000)%2Ctime%3A(from%3Anow-15m%2Cmode%3Aquick%2Cto%3Anow))" custom-js-injection: | @@ -257,7 +260,7 @@ egov-indexer: memory_limits: "768Mi" initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch egov-indexer-yaml-repo-path: "file:///work-dir/health-campaign-config/egov-indexer/error-queue.yml,file:///work-dir/health-campaign-config/egov-indexer/product-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/project-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/individual-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/household-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/project-task-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/stock-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/facility-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/project-staff-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/egov-error-queue-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/pgr-services.yml,file:///work-dir/health-campaign-config/egov-indexer/service-request-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/attendance-service-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/household-member-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/household-transformer-indexer.yml,file:///work-dir/health-campaign-config/egov-indexer/transformer-pgr-services.yml,file:///work-dir/health-campaign-config/egov-indexer/referral-management-indexer.yml" @@ -266,38 +269,38 @@ egov-persister: heap: '-Xmx256m -Xms256m' images: - egovio/egov-persister - persist-yml-path: "file:///work-dir/health-campaign-config/egov-persister/hrms-employee-persister.yml,file:///work-dir/health-campaign-config/egov-persister/product-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-persister.yml,file:///work-dir/health-campaign-config/egov-persister/individual-persister.yml,file:///work-dir/health-campaign-config/egov-persister/household-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-task-persister.yml,file:///work-dir/health-campaign-config/egov-persister/stock-persister.yml,file:///work-dir/health-campaign-config/egov-persister/facility-persister.yml,file:///work-dir/health-campaign-config/egov-persister/service-request-persister.yml,file:///work-dir/health-campaign-config/egov-persister/pgr-services-persister.yml,file:///work-dir/health-campaign-config/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/health-campaign-config/egov-persister/mdms-persister.yml,file:///work-dir/health-campaign-config/egov-persister/referral-management-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-factory-persister.yml,file:///work-dir/health-campaign-config/egov-persister/attendance-service-persister.yml,file:///work-dir/health-campaign-config/egov-persister/irs-persister.yml,file:///work-dir/health-campaign-config/egov-persister/plan-service-persister.yml,file:///work-dir/health-campaign-config/egov-persister/boundary-persister.yml" + persist-yml-path: "file:///work-dir/health-campaign-config/egov-persister/hrms-employee-persister.yml,file:///work-dir/health-campaign-config/egov-persister/product-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-persister.yml,file:///work-dir/health-campaign-config/egov-persister/individual-persister.yml,file:///work-dir/health-campaign-config/egov-persister/household-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-task-persister.yml,file:///work-dir/health-campaign-config/egov-persister/stock-persister.yml,file:///work-dir/health-campaign-config/egov-persister/facility-persister.yml,file:///work-dir/health-campaign-config/egov-persister/service-request-persister.yml,file:///work-dir/health-campaign-config/egov-persister/pgr-services-persister.yml,file:///work-dir/health-campaign-config/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/health-campaign-config/egov-persister/mdms-persister.yml,file:///work-dir/health-campaign-config/egov-persister/referral-management-persister.yml,file:///work-dir/health-campaign-config/egov-persister/project-factory-persister.yml,file:///work-dir/health-campaign-config/egov-persister/attendance-service-persister.yml,file:///work-dir/health-campaign-config/egov-persister/irs-persister.yml,file:///work-dir/health-campaign-config/egov-persister/boundary-persister.yml" initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch egov-data-uploader: initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch egov-searcher: search-yaml-path: "" initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch dashboard-analytics: config-schema-paths: "file:///work-dir/health-campaign-config/egov-dss-dashboards/dashboard-analytics/*.json" initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch dashboard-ingest: config-schema-paths: "file:///work-dir/health-campaign-config/egov-dss-dashboards/dashboard-ingest/*.json" initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" # reportinfra >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -307,14 +310,14 @@ report: spring-datasource-tomcat-max-active: 5 initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch report-locationsfile-path: "file:///work-dir/health-campaign-config/reports/reportFileLocationsv1.txt" pdf-service: initContainers: gitSync: - repo: "git@github.com:egovernments/health-campaign-config" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jagankumar-egov/health-campaign-config" ##### Change repo url with Your fork Repo url branch: "DEMO" ##### Change repo branch with Your fork Repo branch data-config-urls: "file:///work-dir/health-campaign-config/pdf-service/data-config/tradelicense-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/property-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/property-bill.json,file:///work-dir/health-campaign-config/pdf-service/data-config/tradelicense-bill.json,file:///work-dir/health-campaign-config/pdf-service/data-config/firenoc-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/pt-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/tl-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/consolidatedbill.json,file:///work-dir/health-campaign-config/pdf-service/data-config/consolidatedreceipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/tlapplication.json,file:///work-dir/health-campaign-config/pdf-service/data-config/passvehicle-certificate.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-consolidatedacknowlegment.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-consolidatedsewerageconnection.json,file:///work-dir/health-campaign-config/pdf-service/data-config/buildingpermit.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ptmutationcertificate.json,file:///work-dir/health-campaign-config/pdf-service/data-config/tlrenewalcertificate.json,file:///work-dir/health-campaign-config/pdf-service/data-config/bpa-revocation.json,file:///work-dir/health-campaign-config/pdf-service/data-config/buildingpermit-low.json,file:///work-dir/health-campaign-config/pdf-service/data-config/misc-receipt.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-applicationwater.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-sanctionletter.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-estimationnotice.json,file:///work-dir/health-campaign-config/pdf-service/data-config/ws-applicationsewerage.json,file:///work-dir/health-campaign-config/pdf-service/data-config/tlcertificate.json" format-config-urls: "file:///work-dir/health-campaign-config/pdf-service/format-config/tradelicense-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/property-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/property-bill.json,file:///work-dir/health-campaign-config/pdf-service/format-config/tradelicense-bill.json,file:///work-dir/health-campaign-config/pdf-service/format-config/firenoc-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/pt-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/tl-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/consolidatedbill.json,file:///work-dir/health-campaign-config/pdf-service/format-config/consolidatedreceipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/tlapplication.json,file:///work-dir/health-campaign-config/pdf-service/format-config/passvehicle-certificate.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-consolidatedacknowlegment.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-consolidatedsewerageconnection.json,file:///work-dir/health-campaign-config/pdf-service/format-config/buildingpermit.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ptmutationcertificate.json,file:///work-dir/health-campaign-config/pdf-service/format-config/tlrenewalcertificate.json,file:///work-dir/health-campaign-config/pdf-service/format-config/bpa-revocation.json,file:///work-dir/health-campaign-config/pdf-service/format-config/buildingpermit-low.json,file:///work-dir/health-campaign-config/pdf-service/format-config/misc-receipt.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-applicationwater.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-sanctionletter.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-estimationnotice.json,file:///work-dir/health-campaign-config/pdf-service/format-config/ws-applicationsewerage.json,file:///work-dir/health-campaign-config/pdf-service/format-config/tlcertificate.json" @@ -490,6 +493,9 @@ project-factory: splitBoundariesOn: 'ADMIN_DISTRITO' replicas: 1 namespace: 'egov' + maxDebugChar: '2000' + mdmsV2SearchEndpoint: 'mdms-v2/v2/_search' + mdmsV1SearchEndpoint: 'mdms-v2/v1/_search' # <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< kafka-config: diff --git a/config-as-code/helm/charts/health-services/project-factory/values.yaml b/config-as-code/helm/charts/health-services/project-factory/values.yaml index ecb5794eb..4beca303a 100644 --- a/config-as-code/helm/charts/health-services/project-factory/values.yaml +++ b/config-as-code/helm/charts/health-services/project-factory/values.yaml @@ -24,7 +24,7 @@ initContainers: # Container Configs image: repository: "project-factory" -replicas: "1" +replicas: "2" # Additional Container Envs env: | @@ -112,10 +112,24 @@ env: | configMapKeyRef: name: egov-service-host key: audit-service + - name: EGOV_PLAN_SERVICE_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: plan-service + - name: EGOV_CENSUS_HOST + valueFrom: + configMapKeyRef: + name: egov-service-host + key: census-service - name: CONTEXT_PATH value: "/project-factory" - name: FILE_STORE_SERVICE_END_POINT - value: filestore/v1/files + value: filestore/v1/files + - name: EGOV_MDMS_V2_SEARCH_ENDPOINT + value: {{ .Values.mdmsV2SearchEndpoint | default "mdms-v2/v2/_search" }} + - name: EGOV_MDMS_V1_SEARCH_ENDPOINT + value: {{ .Values.mdmsV1SearchEndpoint | default "egov-mdms-service/v1/_search" }} - name: EGOV_IDGEN_PATH value: egov-idgen/id/_generate - name: EGOV_MDMS_SCHEMA_PATH @@ -152,7 +166,15 @@ env: | value: facility/v1/bulk/_create - name: EGOV_HEALTH_INDIVIDUAL_SEARCH value: individual/v1/_search + - name: EGOV_PLAN_FACILITY_SEARCH + value: plan-service/plan/facility/_search + - name: EGOV_PLAN_FACILITY_CONFIG_SEARCH + value: plan-service/config/_search + - name: EGOV_CENSUS_SEARCH + value: census-service/_search + - name: EGOV_PLAN_SEARCH + value: plan-service/plan/_search - name: CMP_IDGEN_FORMAT value: CMP-[cy:yyyy-MM-dd]-[SEQ_EG_CMP_ID] @@ -234,24 +256,26 @@ env: | - name: LOCALE value: {{ .Values.defaultLocale | default "en_IN" }} - name: LOCALIZATION_MODULE - value: "rainmaker-hcm-admin-schemas" + value: "hcm-admin-schemas" - name: MODULE_NAME - value: "HCM-ADMIN-CONSOLE" - - name: FACILITY_SCHEMA_MASTER - value: "facilitySchema" - - name: USER_SCHEMA_MASTER - value: "userSchema" + value: "HCM-ADMIN-CONSOLE" + - name: LOCALIZATION_WAIT_TIME_IN_BOUNDARY_CREATION + value: "30000" + - name: LOCALIZATION_CHUNK_SIZE_FOR_BOUNDARY_CREATION + value: "2000" - name: APP_LOG_LEVEL value: {{ .Values.logLevel | default "info" }} - name: APP_MAX_DEBUG_CHAR value: "{{ .Values.maxDebugChar | default "500" }}" + - name: DEBUG + value: "{{ .Values.DEBUG | default "false" }}" - name: READ_ME_TAB - value: "Read Me" + value: "HCM_README_SHEETNAME" - name: USER_PASSWORD_AUTO_GENERATE - value: "true" + value: "false" - name: USER_DEFAULT_PASSWORD value: "eGov@123" - - name: NOT_CREATE_USER_IF_ALREADY_THERE + - name: MAP_USER_VIA_COMMON_PARENT value: "true" - name: CACHE_ENABLED value: "true" @@ -261,3 +285,14 @@ env: | value: "6379" - name: REDIS_HOST value: "redis.backbone" + + - name: AUTO_RETRY_IF_HTTP_ERROR + value: "socket hang up" + - name: ENABLE_DYNAMIC_TEMPLATE_FOR + value: {{ .Values.enableDynamicTemplate | default "" }} + - name: IS_CALL_GENERATE_WHEN_DELIVERY_CONDITIONS_DIFFER + value: {{ .Values.CallGenerateWhenDeliveryConditionsDiffer | default "false" | quote }} + - name: EXCLUDE_HIERARCHY_TYPE_FROM_BOUNDARY_CODES + value: {{ .Values.ExcludeHierarchyTypeFromBoundaryCodes | default "false" | quote }} + - name: EXCLUDE_BOUNDARY_NAME_AT_LAST_FROM_BOUNDARY_CODES + value: {{ .Values.ExcludeBoundaryTypeFromLastBoundaryCodes | default "false" | quote }} diff --git a/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.6.yaml b/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.6.yaml new file mode 100644 index 000000000..cce5fa863 --- /dev/null +++ b/config-as-code/product-release-charts/Health/dependancy_chart-health-demo-v1.6.yaml @@ -0,0 +1,105 @@ + +version: v1.6 +modules: + - name: backbone + services: + - kafka-kraft + - kafka-connect + - kafka-connect-restart-tasks + - elasticsearch-data + - elasticsearch-master + - kibana + - name: authn-authz + services: + - redis + - ingress-nginx + - cert-manager + - zuul:v1.3.1-96b24b0d72-39 + - name: core + dependencies: + - "backbone" + - "authn-authz" + - "frontend" + services: + - egovio/egov-accesscontrol:DIGIT-2.9-LTS-237578ce80-10 + - egovio/egov-enc-service-db:DIGIT-2.9-LTS-237578ce80-21 + - egovio/egov-localization-db:DIGIT-2.9-LTS-237578ce80-10 + - egovio/egov-idgen-db:DIGIT-2.9-LTS-07f47790b8-8 + - egovio/egov-filestore-db:DIGIT-2.9-LTS-237578ce80-14 + - egovio/egov-indexer-db:2.9.1-c781a2f714-65 + - egovio/egov-notification-mail:DIGIT-2.9-LTS-07f47790b8-5 + - egovio/egov-notification-sms:DIGIT-2.9-LTS-07f47790b8-7 + - egovio/egov-otp-db:DIGIT-2.9-LTS-07f47790b8-6 + - egovio/egov-persister:DIGIT-2.9-LTS-07f47790b8-8 + ## - egovio/egov-url-shortening:v1.1.2-1715164454-3 not used in health now + - egovio/egov-user-db:DIGIT-2.9-LTS-c33cfe45ab-19 + - egovio/user-otp:DIGIT-2.9-LTS-07f47790b8-9 + - egovio/egov-workflow-v2-db:2.9.1-80b58dc788-15 + - egovio/audit-service-db:DIGIT-2.9-LTS-07f47790b8-12 + - egovio/error-handler:master-impel-dump-5022b7acff-1 + - egovio/playground:2.0 + - egovio/mdms-v2:MDMS-v2-2.9LTS-837232ac67-71 + - egovio/boundary-service-db:v1.0.0-063968adc7-18 + - name: business + dependencies: + - "core" + services: + - egovio/egov-hrms-db:master-flyway-imageupdate-60353d5c64-20 + - name: frontend + dependencies: + - "business" + services: + - egovio/digit-ui:health-dashboard-digit-ui-921afc69c7-758 + - egovio/health-ui:health-dashboard-product-fb65c5f500-759 + - name: m_pgr #PGR + dependencies: + - "core" + - "business" + services: + - egovio/pgr-services-db:v1.1.7-00a7accbda-19 + - name: dss #dss + dependencies: + - "frontend" + - "core" + - "business" + services: + - dashboard-analytics:analytics-es8-auth-8f6d1faeb0-50 + - egovio/dashboard-ingest:v1.1.4-72f8a8f87b-10 + - egovio/dashboard-analytics:analytics-es8-auth-09e437f9f6-67 + - egovio/dss-dashboard:v1.8.0-0d70d60e63-53 + - name: Other + dependencies: + - "core" + - "business" + services: + ## - egovio/egov-user-event:v1.2.0-c1e1e8ce24-21 not used currently in health + - name: m_health + dependencies: + - "backbone" + - "authn-authz" + - "core" + - "business" + - "dss" + - "Other" + - "frontend" + - "m_hcmconsole" + services: + - egovio/facility-db:v1.1.2-00a7accbda-14 + - egovio/product-db:v1.1.0-00a7accbda-31 + - egovio/individual-db:v1.1.6-a0e714254c-12 + - egovio/transformer:HDDF-1277-149f70deb7-302 + - egovio/stock-db:v1.1.3-a0e714254c-31 + - egovio/household-db:v1.1.4-a0e714254c-30 + - egovio/project-db:v1.1.5-a0e714254c-13 + - egovio/referralmanagement-db:v1.0.3-a0e714254c-42 + - egovio/service-request:service-additional-field-24c971f354-35 + - egovio/health-attendance-db:v1.0.2-30824c427-11 + - egovio/service-request-db:v1.0.1-a0e714254c-18 + - name: m_hcmconsole + dependencies: + - "backbone" + - "authn-authz" + - "core" + services: + - egovio/project-factory:v0.3.0-c9f5d73e13-233 + - egovio/workbench-ui:v0.3.0-b3c48dc663-701 diff --git a/deploy-as-code/deployer/digit_installer.go b/deploy-as-code/deployer/digit_installer.go index 0f446dc1d..e7a6f87ed 100644 --- a/deploy-as-code/deployer/digit_installer.go +++ b/deploy-as-code/deployer/digit_installer.go @@ -93,7 +93,7 @@ func main() { //var version string = "" //version, _ = sel(versionfiles, "Which version of the product would like to install, Select below") //if version != "" { - argFile := releaseChartDir + product + "/dependancy_chart-" + "health-demo-v1.5" + ".yaml" + argFile := releaseChartDir + product + "/dependancy_chart-" + "health-demo-v1.6" + ".yaml" // Decode the yaml file and assigning the values to a map chartFile, err := ioutil.ReadFile(argFile) diff --git a/infra-as-code/terraform/sample-aws/input.yaml b/infra-as-code/terraform/sample-aws/input.yaml index 6808d3276..ca49211ee 100644 --- a/infra-as-code/terraform/sample-aws/input.yaml +++ b/infra-as-code/terraform/sample-aws/input.yaml @@ -1,26 +1,26 @@ # Replace with the name which you want to give to your EKS cluster # Cluster name can have only lowercase alphanumeric characters and hyphens # For example: "digit-demo" -cluster_name: "testhealth-k8supgrade" +cluster_name: "console-k8supgrade" # Replace with ssh key name you want -ssh_key_name: "testhealth-k8supgrade-ssh-key" +ssh_key_name: "console-k8supgrade-ssh-key" # Replace with public key which you want to add in your EC2 machines # ssh key which you want to add in your EC2 machines public_ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHcOtwON5v3csYdki9DW1n2BkC2GmzeD86rTkCKSu9GWQOw8PdGabMfppvvjYlmOLlu+WzhM6+eHUXhtS6FaMert71oHUh/mvzb3KC4VJ1ZhpZXMyvbqV2RoOyrseUqwShaTfaH+BypFBaZm52tP1gzfAzSY68UWiQnUXhiNBBfjHhFbfnehEDeN0VZSiH1L27n8Ng2S6xLwZ8ovCOBukJuQ9Q0c5LqV4Nu6YYSERE0qMIDHIM7qvDWMsv8WOe32uBrUW99Tp9+Y0EAnylfS/FvnEh0zT1h5cRjoXYOOOQ0b4eR8qBbY4Zwod2ZKZ8mfzvkUci3qAp4AfLEWYkUe9x" # Name you want to give to your Database # DB name must contain only alphanumeric characters -db_name: "testhealthdb" +db_name: "consoledb" # Replace with DB username you want # DB user name must contain only alphanumeric characters -db_username: "testhealth" +db_username: "consoleuser" # Replace with Domain name you want for your web applications -domain_name: "test-health.digit.org" +domain_name: "hcm-console.digit.org" # Replace with the name you want to give to your S3 bucket which is used to store the terraform states -terraform_state_bucket_name: "testhealth-k8supgrade-digit-buckets" +terraform_state_bucket_name: "console-k8supgrade-digit-buckets" diff --git a/infra-as-code/terraform/sample-aws/main.tf b/infra-as-code/terraform/sample-aws/main.tf index da2abc331..d93b308bd 100644 --- a/infra-as-code/terraform/sample-aws/main.tf +++ b/infra-as-code/terraform/sample-aws/main.tf @@ -24,7 +24,7 @@ module "db" { vpc_security_group_ids = ["${module.network.rds_db_sg_id}"] availability_zone = "${element(var.availability_zones, 0)}" instance_class = "db.t3.medium" ## postgres db instance type - engine_version = "11.22" ## postgres version + engine_version = "15.7" ## postgres version storage_type = "gp2" storage_gb = "10" ## postgres disk size backup_retention_days = "7"