diff --git a/config-as-code/environments/upyog-demo-secrets.yaml b/config-as-code/environments/upyog-demo-secrets.yaml index 7fd6e76..0a4c7eb 100644 --- a/config-as-code/environments/upyog-demo-secrets.yaml +++ b/config-as-code/environments/upyog-demo-secrets.yaml @@ -6,13 +6,13 @@ cluster-configs: flywayUsername: flywayPassword: demo123456 # must be more than 8 characters egov-notification-sms: # To work sms notification service add the sms provider details - username: demo - password: demo + username: intense + password: In10s123 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 egov-location: # To work Location service add your gmap key - gmapskey: AIzaSyAQOd09-sdfegv + gmapskey: AIzaSyCzXo-KfcNpTy6EK4SVQHMFFnMdkT6JzxM egov-pg-service: # To work pg service add your respective bank details axis-merchant-id: demo axis-merchant-secret-key: demo @@ -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/upyog-demo.yaml b/config-as-code/environments/upyog-demo.yaml index 9c33965..36e5c79 100644 --- a/config-as-code/environments/upyog-demo.yaml +++ b/config-as-code/environments/upyog-demo.yaml @@ -19,8 +19,8 @@ cluster-configs: domain: ## Add your Domain Name egov-services-fqdn-name: https:/// ## Add your Domain Name - egov-state-level-tenant-id: "pg" - s3-assets-bucket: "(pg-egov-assets|egov-playground-assets)" + egov-state-level-tenant-id: "ap" + s3-assets-bucket: "digittest01" es-host: "elasticsearch-data-v1.es-cluster" es-indexer-host: "http://elasticsearch-data-v1.es-cluster:9200/" flyway-locations: "filesystem:/flyway/sql,filesystem:/flyway/seed,filesystem:/flyway/qa" @@ -149,20 +149,20 @@ employee: sub_filter.conf: " sub_filter '' ' - + ';" digit-ui: custom-js-injection: | sub_filter.conf: " sub_filter '' ' - + ';" citizen: custom-js-injection: | sub_filter.conf: " sub_filter '' ' - + ';" egov-filestore: volume: /opt/eGov/filestore @@ -174,7 +174,7 @@ egov-filestore: allowed-file-formats-map: "{jpg:{'image/jpg','image/jpeg'},jpeg:{'image/jpeg','image/jpg'},png:{'image/png'},pdf:{'application/pdf'},odt:{'application/vnd.oasis.opendocument.text'},ods:{'application/vnd.oasis.opendocument.spreadsheet'},docx:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},doc:{'application/x-tika-msoffice','application/x-tika-ooxml','application/vnd.oasis.opendocument.text','application/msword'},dxf:{'text/plain','application/dxf','application/octet-stream','image/vnd.dxf','image/vnd.dxf; format=ascii','image/vnd.dxf; format=binary','image/vnd.dxb'},csv:{'text/plain'},txt:{'text/plain'},xlsx:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel'},xls:{'application/x-tika-ooxml','application/x-tika-msoffice','application/vnd.ms-excel'}}" allowed-file-formats: "jpg,jpeg,png,doc,docx,pdf,odt,ods,text,dxf,xls,xlsx" filestore-url-validity: 3600 - fixed-bucketname: filestore bucket name ## Add filestore bucket name + fixed-bucketname: digittest01 ## Add filestore bucket name egov-idgen: idformat-from-mdms: "true" @@ -182,12 +182,12 @@ egov-idgen: autocreate-new-seq: "true" egov-notification-sms: - sms-provider-url: "sms provider url" ## Add sms provider url + sms-provider-url: "https://api.smscountry.com/SMSCwebservice_bulk.aspx?" ## Add sms provider url sms.provider.class: "Generic" sms.provider.contentType: "application/x-www-form-urlencoded" - sms-config-map: "{'User':'$username', 'passwd': '$password', 'sid':'$senderid', 'mobilenumber':'$mobileno', 'message':'$message', 'mtype':'N', 'DR':'N', 'smsservicetype':'singlemsg'}" - sms-gateway-to-use: "sms provider name" ## Add sms provider name - sms-sender: "sms sender" ## Add sms sender + sms-config-map: "{'User':'$username', 'passwd': '$password', 'sid':'ITLCBS', 'mobilenumber':'$mobileno', 'message':'$message', 'mtype':'N', 'DR':'N', 'smsservicetype':'singlemsg'}" + sms-gateway-to-use: "SMSCountry" ## Add sms provider name + sms-sender: "ITLCBS" ## Add sms sender sms-sender-requesttype: "GET" sms-custom-config: "true" sms-extra-req-params: "mtype=N&DR=Y" @@ -269,8 +269,8 @@ egov-mdms-service: mdms-path: "/work-dir/upyog-mdms-data/data" initContainers: gitSync: - repo: "git@github.com:upyog/upyog-mdms-data" ##### Change repo url with Your fork Repo url - branch: "2.1" ##### Change repo branch with Your fork Repo branch + repo: "git@github.com:jnan1234/upyog-mdms-data" ##### Change repo url with Your fork Repo url + branch: "master" ##### Change repo branch with Your fork Repo branch mdms-folder: "upyog-mdms-data" masters-config-url: "file:///work-dir/upyog-mdms-data/master-config.json" java-args: -Dspring.profiles.active=monitoring @@ -280,8 +280,8 @@ egov-indexer: memory_limits: "768Mi" initContainers: gitSync: - repo: "git@github.com:upyog/upyog-configs" ##### Change repo url with Your fork Repo url - branch: "2.1" ##### Change repo branch with Your fork Repo branch + repo: "git@github.com:jnan1234/upyog-configs" ##### Change repo url with Your fork Repo url + branch: "master" ##### Change repo branch with Your fork Repo branch egov-indexer-yaml-repo-path: "file:///work-dir/upyog-configs/configs/egov-indexer/billingservices-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/collection-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/egov-telemetry-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/egov-uploader-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/error-queue.yml,file:///work-dir/upyog-configs/configs/egov-indexer/finance-rolloutadotpion-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/payment-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/rainmaker-pgr-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/rainmaker-pt-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/rainmaker-tl-indexer.yml,file:///work-dir/upyog-configs/configs/egov-indexer/chatbot-telemetry.yaml" egov-persister: @@ -291,8 +291,8 @@ egov-persister: persist-yml-path: "file:///work-dir/upyog-configs/configs/egov-persister/pgr-services-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/pt-mutation-calculator-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/apportion-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/billing-services-persist.yml,file:///work-dir/upyog-configs/configs/egov-persister/egf-bill.yaml,file:///work-dir/upyog-configs/configs/egov-persister/egov-user-event-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/egov-workflow-v2-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/firenoc_persiter.yaml,file:///work-dir/upyog-configs/configs/egov-persister/hrms-employee-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/pdf-generator.yml,file:///work-dir/upyog-configs/configs/egov-persister/pg-service-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/pgr.v3.yml,file:///work-dir/upyog-configs/configs/egov-persister/property-services.yml,file:///work-dir/upyog-configs/configs/egov-persister/pt-calculator-v2-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/pt-drafts.yml,file:///work-dir/upyog-configs/configs/egov-persister/pt-persist.yml,file:///work-dir/upyog-configs/configs/egov-persister/tl-billing-slab-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/tl-calculation-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/uploader-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/collection-migration-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/property-services-registry.yml,file:///work-dir/upyog-configs/configs/egov-persister/tradelicense.yml,file:///work-dir/upyog-configs/configs/egov-persister/sewerage-persist.yml,file:///work-dir/upyog-configs/configs/egov-persister/water-persist.yml,file:///work-dir/upyog-configs/configs/egov-persister/water-meter.yml,file:///work-dir/upyog-configs/configs/egov-persister/bpa-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/assessment-persister.yml,file:///work-dir/upyog-configs/configs/egov-persister/chatbot.yml" initContainers: gitSync: - repo: "git@github.com:upyog/upyog-configs" ##### Change repo url with Your fork Repo url - branch: "2.1" ##### Change repo branch with Your fork Repo branch + repo: "git@github.com:jnan1234/upyog-configs" ##### Change repo url with Your fork Repo url + branch: "master" ##### Change repo branch with Your fork Repo branch pgr-services: memory_limits: 512Mi @@ -300,28 +300,28 @@ pgr-services: egov-data-uploader: initContainers: gitSync: - repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jnan1234/configs" ##### Change repo url with Your fork Repo url branch: "UAT" ##### Change repo branch with Your fork Repo branch egov-searcher: search-yaml-path: "file:///work-dir/upyog-configs/configs/egov-searcher/rainmaker-pgr-v2.yml,file:///work-dir/upyog-configs/configs/egov-searcher/weekly-impact-emailer-searcher.yml,file:///work-dir/upyog-configs/configs/egov-searcher/PTDemandBasedSearcher.yml,file:///work-dir/upyog-configs/configs/egov-searcher/bill-genie.yml,file:///work-dir/upyog-configs/configs/egov-searcher/rainmaker-tl.yml,file:///work-dir/upyog-configs/configs/egov-searcher/localitySearcher.yml" initContainers: gitSync: - repo: "git@github.com:upyog/upyog-configs" ##### Change repo url with Your fork Repo url - branch: "2.1" ##### Change repo branch with Your fork Repo branch + repo: "git@github.com:jnan1234/upyog-configs" ##### Change repo url with Your fork Repo url + branch: "master" ##### Change repo branch with Your fork Repo branch dashboard-analytics: config-schema-paths: "file:///work-dir/configs/egov-dss-dashboards/dashboard-analytics/*.json" initContainers: gitSync: - repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jnan1234/configs" ##### Change repo url with Your fork Repo url branch: "UAT" ##### Change repo branch with Your fork Repo branch dashboard-ingest: config-schema-paths: "file:///work-dir/configs/egov-dss-dashboards/dashboard-ingest/*.json" initContainers: gitSync: - repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jnan1234/configs" ##### Change repo url with Your fork Repo url branch: "UAT" ##### Change repo branch with Your fork Repo branch # reportinfra >>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -342,14 +342,14 @@ report: spring-datasource-tomcat-max-active: 5 initContainers: gitSync: - repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jnan1234/configs" ##### Change repo url with Your fork Repo url branch: "UAT" ##### Change repo branch with Your fork Repo branch report-locationsfile-path: "file:///work-dir/configs/reports/reportFileLocationsv1.txt" pdf-service: initContainers: gitSync: - repo: "git@github.com:egovernments/configs" ##### Change repo url with Your fork Repo url + repo: "git@github.com:jnan1234/configs" ##### Change repo url with Your fork Repo url branch: "UAT" ##### Change repo branch with Your fork Repo branch data-config-urls: "file:///work-dir/configs/pdf-service/data-config/tradelicense-receipt.json,file:///work-dir/configs/pdf-service/data-config/property-receipt.json,file:///work-dir/configs/pdf-service/data-config/property-bill.json,file:///work-dir/configs/pdf-service/data-config/tradelicense-bill.json,file:///work-dir/configs/pdf-service/data-config/firenoc-receipt.json,file:///work-dir/configs/pdf-service/data-config/pt-receipt.json,file:///work-dir/configs/pdf-service/data-config/tl-receipt.json,file:///work-dir/configs/pdf-service/data-config/consolidatedbill.json,file:///work-dir/configs/pdf-service/data-config/consolidatedreceipt.json,file:///work-dir/configs/pdf-service/data-config/tlapplication.json,file:///work-dir/configs/pdf-service/data-config/passvehicle-certificate.json,file:///work-dir/configs/pdf-service/data-config/ws-consolidatedacknowlegment.json,file:///work-dir/configs/pdf-service/data-config/ws-consolidatedsewerageconnection.json,file:///work-dir/configs/pdf-service/data-config/buildingpermit.json,file:///work-dir/configs/pdf-service/data-config/ptmutationcertificate.json,file:///work-dir/configs/pdf-service/data-config/tlrenewalcertificate.json,file:///work-dir/configs/pdf-service/data-config/bpa-revocation.json,file:///work-dir/configs/pdf-service/data-config/buildingpermit-low.json,file:///work-dir/configs/pdf-service/data-config/misc-receipt.json,file:///work-dir/configs/pdf-service/data-config/ws-applicationwater.json,file:///work-dir/configs/pdf-service/data-config/ws-sanctionletter.json,file:///work-dir/configs/pdf-service/data-config/ws-estimationnotice.json,file:///work-dir/configs/pdf-service/data-config/ws-applicationsewerage.json,file:///work-dir/configs/pdf-service/data-config/tlcertificate.json" format-config-urls: "file:///work-dir/configs/pdf-service/format-config/tradelicense-receipt.json,file:///work-dir/configs/pdf-service/format-config/property-receipt.json,file:///work-dir/configs/pdf-service/format-config/property-bill.json,file:///work-dir/configs/pdf-service/format-config/tradelicense-bill.json,file:///work-dir/configs/pdf-service/format-config/firenoc-receipt.json,file:///work-dir/configs/pdf-service/format-config/pt-receipt.json,file:///work-dir/configs/pdf-service/format-config/tl-receipt.json,file:///work-dir/configs/pdf-service/format-config/consolidatedbill.json,file:///work-dir/configs/pdf-service/format-config/consolidatedreceipt.json,file:///work-dir/configs/pdf-service/format-config/tlapplication.json,file:///work-dir/configs/pdf-service/format-config/passvehicle-certificate.json,file:///work-dir/configs/pdf-service/format-config/ws-consolidatedacknowlegment.json,file:///work-dir/configs/pdf-service/format-config/ws-consolidatedsewerageconnection.json,file:///work-dir/configs/pdf-service/format-config/buildingpermit.json,file:///work-dir/configs/pdf-service/format-config/ptmutationcertificate.json,file:///work-dir/configs/pdf-service/format-config/tlrenewalcertificate.json,file:///work-dir/configs/pdf-service/format-config/bpa-revocation.json,file:///work-dir/configs/pdf-service/format-config/buildingpermit-low.json,file:///work-dir/configs/pdf-service/format-config/misc-receipt.json,file:///work-dir/configs/pdf-service/format-config/ws-applicationwater.json,file:///work-dir/configs/pdf-service/format-config/ws-sanctionletter.json,file:///work-dir/configs/pdf-service/format-config/ws-estimationnotice.json,file:///work-dir/configs/pdf-service/format-config/ws-applicationsewerage.json,file:///work-dir/configs/pdf-service/format-config/tlcertificate.json" diff --git a/infra-as-code/terraform/modules/kubernetes/aws/eks-cluster/outputs.tf b/infra-as-code/terraform/modules/kubernetes/aws/eks-cluster/outputs.tf index 450807c..f5e0a75 100644 --- a/infra-as-code/terraform/modules/kubernetes/aws/eks-cluster/outputs.tf +++ b/infra-as-code/terraform/modules/kubernetes/aws/eks-cluster/outputs.tf @@ -25,7 +25,7 @@ users: - name: aws user: exec: - apiVersion: client.authentication.k8s.io/v1alpha1 + apiVersion: client.authentication.k8s.io/v1beta1 command: aws-iam-authenticator args: - "token" @@ -44,4 +44,4 @@ output "eks_cluster" { output "cluster_security_group_id" { value = "${aws_eks_cluster.cluster.vpc_config[0].worker_security_group_id}" -} \ No newline at end of file +} diff --git a/infra-as-code/terraform/modules/kubernetes/aws/network/main.tf b/infra-as-code/terraform/modules/kubernetes/aws/network/main.tf index e6ad7b8..1ea5169 100644 --- a/infra-as-code/terraform/modules/kubernetes/aws/network/main.tf +++ b/infra-as-code/terraform/modules/kubernetes/aws/network/main.tf @@ -92,7 +92,7 @@ resource "aws_route_table_association" "public" { resource "aws_eip" "eip" { vpc = true - depends_on = ["aws_internet_gateway.internet_gateway"] + depends_on = [aws_internet_gateway.internet_gateway] tags = "${ tomap({ @@ -106,9 +106,10 @@ resource "aws_eip" "eip" { resource "aws_nat_gateway" "nat" { allocation_id = "${aws_eip.eip.id}" + #allocation_id = "eipalloc-04169e7acd1f66ccd" subnet_id = "${element(aws_subnet.public_subnet.*.id, 0)}" - depends_on = ["aws_internet_gateway.internet_gateway"] + depends_on = [aws_internet_gateway.internet_gateway] tags = "${ tomap({ @@ -154,4 +155,4 @@ resource "aws_security_group" "rds_db_sg" { "Name" = "db-${var.cluster_name}" }) }" -} \ No newline at end of file +} diff --git a/infra-as-code/terraform/sample-aws/input.yaml b/infra-as-code/terraform/sample-aws/input.yaml index baeeb03..1644c17 100644 --- a/infra-as-code/terraform/sample-aws/input.yaml +++ b/infra-as-code/terraform/sample-aws/input.yaml @@ -1,13 +1,13 @@ # 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: "upyog-demo" -cluster_name: "demo" +cluster_name: "digitdemo" # Replace with ssh key name you want ssh_key_name: "demo-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 zxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxyzxy" +public_ssh_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCWtM9dn8gU+v/oqIfJDqBr5H6IaWVTSclmsS2CVCmT0fu2fx3EAgDAP3Uvxtvg6tg4QS1jO+EZOPzjveXU1yfmr8o8LII2KsujxIbCnNWDzQYFQOoY58hmJjsXHdkuFYhozY61VQ7zPsLGyaqHuGDH2YVetXivCv/B/D+SYP2ZBYT/iDU2lfUiMcw559kXP5G94TJvgbuKnrVvUBCwbkEyamORjkAd7FCOt13uFuB8MXNjOYGWnkUfp7nEe0z3iyE/67rJx9/EEsEdSBwc5jRptxgdnYds7bdqOOmFbGNxulwBeirz6l1DNjtkzwEkOf88zVTIv4qyFVQ3ijvy8sIR jnanendra9@gmail.com" # Name you want to give to your Database # DB name must contain only alphanumeric characters @@ -18,9 +18,9 @@ db_name: "demo" db_username: "demo" # Replace with Domain name you want for your web applications -domain_name: "demo.upyog.org" +domain_name: "digit.intense.in" # Replace with the name you want to give to your S3 bucket which is used to store the terraform state -terraform_state_bucket_name: "upyog-terraform" +terraform_state_bucket_name: "digitintense001" diff --git a/infra-as-code/terraform/sample-aws/script.sh b/infra-as-code/terraform/sample-aws/script.sh new file mode 100644 index 0000000..86cd5d6 --- /dev/null +++ b/infra-as-code/terraform/sample-aws/script.sh @@ -0,0 +1,18 @@ +go run ../scripts/init.go +sleep 5 +cd remote-state +terraform init +sleep 2 +terraform apply -auto-approve +sleep 5 +cd .. +sleep 5 +terraform init +sleep 10 +terraform apply -auto-approve +sleep 10 +terraform output -json | go run ../scripts/envYAMLUpdater.go +sleep 5 +cd ../../../deploy-as-code/deployer +sleep 2 +go run upyog_installer.go