diff --git a/ckan/.gitignore b/ckan/.gitignore deleted file mode 100644 index f3097ab1..00000000 --- a/ckan/.gitignore +++ /dev/null @@ -1 +0,0 @@ -password diff --git a/ckan/ansible.cfg b/ckan/ansible.cfg deleted file mode 100644 index 9a6d470d..00000000 --- a/ckan/ansible.cfg +++ /dev/null @@ -1,8 +0,0 @@ -[defaults] -inventory = ./hosts -host_key_checking = False -private_key_file= ~/.ssh/id_rsa -ansible_python_interpreter=/usr/local/bin/python3 - -# [privilege_escalation] -# become_ask_pass = True diff --git a/ckan/ckan-playbook.yml b/ckan/ckan-playbook.yml deleted file mode 100644 index c07804b2..00000000 --- a/ckan/ckan-playbook.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Install ckan - hosts: localhost-py3 - gather_facts: false - connection: local - roles: - - ckan diff --git a/ckan/dev-values.enc b/ckan/dev-values.enc deleted file mode 100644 index d9a8148f..00000000 --- a/ckan/dev-values.enc +++ /dev/null @@ -1,18 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -37666264643162626238643662636662373365306466336664343033333235336432333038646165 -3965393965383263316235633962373436303037323133330a313739353937613861656237356665 -36333032613636313466393931303963336363653363656566316233636537623639343066356535 -3866303664613264330a633137623139313935363666656231666536623338376531303066333263 -38386533306339346534653835303931623839333864323332323134343565336565383962313539 -37656264363433613865643938323636313264613138333761333665383439636562653231613335 -34343039323437663735653737616430336436303533343133363835336639366338346666623439 -31653466363538613637373965656138643438323133633133323165613564393565646537356432 -32643561373032366339616337643061323030373461613134393065656333613835623664306163 -37633962663933336466646237643633336435363765643466353762646130383934323265333662 -64383735643035343237333133313633393965656666353662663838373765636639386339363033 -65623938326234393464666238646230326337356230623166373530623430626139346265316433 -32616637363237333034323538616333636437323332623631623236623734356437306535306637 -31343237613938663065323661326433623031373965383366616164363035306531303134313335 -35313530633635346561636531346562316137613562353962333166643361356639356336626666 -65323437636535613734353336626133656632336563383062636238316530663832633666656332 -65666264633566666632653638316139373530626433383831333066616132303630 diff --git a/ckan/hosts b/ckan/hosts deleted file mode 100644 index 8baaed3e..00000000 --- a/ckan/hosts +++ /dev/null @@ -1 +0,0 @@ -localhost-py3 ansible_host=localhost ansible_python_interpreter=/usr/local/bin/python3 diff --git a/ckan/roles/ckan/files/ckan-database-endpoint.yaml b/ckan/roles/ckan/files/ckan-database-endpoint.yaml deleted file mode 100644 index 09014497..00000000 --- a/ckan/roles/ckan/files/ckan-database-endpoint.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Endpoints -metadata: - name: ckan-postgres -subsets: - - addresses: - - ip: 159.65.107.222 - ports: - - port: 25060 \ No newline at end of file diff --git a/ckan/roles/ckan/files/ckan-database-service.yaml b/ckan/roles/ckan/files/ckan-database-service.yaml deleted file mode 100644 index dd031317..00000000 --- a/ckan/roles/ckan/files/ckan-database-service.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ckan-postgres -spec: - ports: - - protocol: TCP - port: 5432 - targetPort: 25060 \ No newline at end of file diff --git a/ckan/roles/ckan/files/values.yaml b/ckan/roles/ckan/files/values.yaml deleted file mode 100644 index 607039f0..00000000 --- a/ckan/roles/ckan/files/values.yaml +++ /dev/null @@ -1,78 +0,0 @@ -postgresql: - enabled: false - pgPass: {{ ckanDbPassword }} - -nodeAffinity: &nodeAffinity - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: doks.digitalocean.com/node-pool - operator: In - values: - - cloud-services-node-pool - -ckan: - siteUrl: {{ ckanSiteUrl }} - sysadminPassword: {{ ckanAdminPassword }} - siteTitle: "Greenstand CKAN" - extraEnv: - - name: CKAN_MAX_UPLOAD_SIZE_MB - value: "1024" - psql: - initialize: true - masterUser: {{ ckanDbUser }} - masterPassword: {{ ckanDbPassword }} - masterDatabase: ckan - db: - ckanDbUrl: {{ ckanDbHost }} - ckanDbName: ckan - ckanDbUser: {{ ckanDbUser }} - ckanDbPassword: {{ ckanDbPassword }} - datastore: - RwDbUrl: {{ ckanDbHost }} - RwDbName: ckan_datastore - RwDbUser: {{ ckanDbUser }} - RwDbPassword: {{ ckanDbPassword }} - RoDbUrl: {{ ckanDbHost }} - RoDbName: ckan_datastore - RoDbUser: {{ ckanDbUser }} - RoDbPassword: {{ ckanDbPassword }} - smtp: - server: {{ smtpServer }} - user: {{ smtpUser }} - password: {{ smtpPassword }} - mailFrom: {{ smtpUser }} - -redis: - master: - affinity: - nodeAffinity: *nodeAffinity - -solr: - affinity: - nodeAffinity: *nodeAffinity - zookeeper: - affinity: - nodeAffinity: *nodeAffinity - -affinity: - nodeAffinity: *nodeAffinity - -datapusher: - affinity: - nodeAffinity: *nodeAffinity - -imagePullSecrets: - - name: docker-greenstand-secret - -service: - type: LoadBalancer - port: 5000 - -resources: - limits: - cpu: 1 - memory: 1Gi - requests: - cpu: 100m - memory: 512Mi \ No newline at end of file diff --git a/ckan/roles/ckan/tasks/main.yaml b/ckan/roles/ckan/tasks/main.yaml deleted file mode 100644 index 2675b5df..00000000 --- a/ckan/roles/ckan/tasks/main.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- name: Add keitaro-charts repository - tags: [ckan] - community.kubernetes.helm_repository: - name: keitaro-charts - repo_url: https://keitaro-charts.storage.googleapis.com - -- name: Create headless service to connect to ckan database - community.kubernetes.k8s: - state: present - namespace: ckan - src: "{{ role_path }}/files/ckan-database-service.yaml" - -- name: Create endpoint to external ckan database - community.kubernetes.k8s: - state: present - namespace: ckan - src: "{{ role_path }}/files/ckan-database-endpoint.yaml" - -- name: Install ckan - tags: [ckan] - community.kubernetes.helm: - name: ckan - chart_ref: keitaro-charts/ckan - chart_version: 1.0.2 - release_namespace: ckan - create_namespace: true - values: "{{ lookup('template','files/values.yaml') | from_yaml }}" \ No newline at end of file diff --git a/rabbitmq/deployment/base/definition.yaml b/rabbitmq/deployment/base/definition.yaml index 3828114e..80fa65c3 100644 --- a/rabbitmq/deployment/base/definition.yaml +++ b/rabbitmq/deployment/base/definition.yaml @@ -6,8 +6,8 @@ spec: replicas: 3 resources: #these are the defaults requests: - cpu: 1000m - memory: 2Gi + cpu: 300m + memory: 400Mi limits: cpu: 1000m memory: 2Gi diff --git a/solr/cleanup_clusterroles.sh b/solr/cleanup_clusterroles.sh deleted file mode 100755 index 0af24945..00000000 --- a/solr/cleanup_clusterroles.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -kubectl delete clusterrole solr-operator-role solr-operator-zookeeper-operator -kubectl delete clusterrolebinding solr-operator-rolebinding solr-operator-zookeeper-operator diff --git a/solr/dev/backend.tf b/solr/dev/backend.tf deleted file mode 100644 index d2ee0d83..00000000 --- a/solr/dev/backend.tf +++ /dev/null @@ -1,17 +0,0 @@ - -terraform { - # DigitalOcean uses the S3 spec. - backend "s3" { - bucket = "treetracker-dev-terraform" - key = "terraform-solr.tfstate" - endpoint = "https://sfo2.digitaloceanspaces.com" - # DO uses the S3 format - # eu-west-1 is used to pass TF validation - # Region is ACTUALLY sfo2 on DO - region = "eu-west-1" - # Deactivate a few checks as TF will attempt these against AWS - skip_credentials_validation = true - skip_metadata_api_check = true - skip_region_validation = true - } -} diff --git a/solr/dev/main.tf b/solr/dev/main.tf deleted file mode 100644 index 42d13f7e..00000000 --- a/solr/dev/main.tf +++ /dev/null @@ -1,4 +0,0 @@ -module "solr" { - source = "../solr_chart" - cluster_name = "dev-k8s-treetracker" -} diff --git a/solr/dev/provider.tf b/solr/dev/provider.tf deleted file mode 100644 index 1f4b1a98..00000000 --- a/solr/dev/provider.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_providers { - digitalocean = { - source = "digitalocean/digitalocean" - version = "2.28.1" - } - kubernetes = "2.16.1" - helm = "2.8.0" - } -} diff --git a/solr/prod/backend.tf b/solr/prod/backend.tf deleted file mode 100644 index b113cddc..00000000 --- a/solr/prod/backend.tf +++ /dev/null @@ -1,17 +0,0 @@ - -terraform { - # DigitalOcean uses the S3 spec. - backend "s3" { - bucket = "treetracker-test-terraform" - key = "terraform-solr.tfstate" - endpoint = "https://sfo2.digitaloceanspaces.com" - # DO uses the S3 format - # eu-west-1 is used to pass TF validation - # Region is ACTUALLY sfo2 on DO - region = "eu-west-1" - # Deactivate a few checks as TF will attempt these against AWS - skip_credentials_validation = true - skip_metadata_api_check = true - skip_region_validation = true - } -} diff --git a/solr/prod/main.tf b/solr/prod/main.tf deleted file mode 100644 index 1cbfbea8..00000000 --- a/solr/prod/main.tf +++ /dev/null @@ -1,4 +0,0 @@ -module "solr" { - source = "../solr_chart" - cluster_name = "prod-k8s-treetracker" -} diff --git a/solr/prod/provider.tf b/solr/prod/provider.tf deleted file mode 100644 index 1f4b1a98..00000000 --- a/solr/prod/provider.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_providers { - digitalocean = { - source = "digitalocean/digitalocean" - version = "2.28.1" - } - kubernetes = "2.16.1" - helm = "2.8.0" - } -} diff --git a/solr/solr_chart/main.tf b/solr/solr_chart/main.tf deleted file mode 100644 index 54044afe..00000000 --- a/solr/solr_chart/main.tf +++ /dev/null @@ -1,49 +0,0 @@ -data "digitalocean_kubernetes_cluster" "dev" { - name = var.cluster_name -} - -provider "helm" { - kubernetes { - host = data.digitalocean_kubernetes_cluster.dev.endpoint - token = data.digitalocean_kubernetes_cluster.dev.kube_config[0].token - cluster_ca_certificate = base64decode( - data.digitalocean_kubernetes_cluster.dev.kube_config[0].cluster_ca_certificate - ) - } -} - -locals { - solr_version = "0.7.0" -} -resource "helm_release" "solr_operator" { - name = "solr-operator" - repository = "https://solr.apache.org/charts" - chart = "solr-operator" - version = local.solr_version - namespace = "solr" - create_namespace = true - - - values = [ - "${file("${path.module}/solr-operator-values.yaml")}", - var.solr_operator_values_file - ] - -} - - -resource "helm_release" "solr" { - name = "solr" - repository = "https://solr.apache.org/charts" - chart = "solr" - version = local.solr_version - namespace = "solr" - create_namespace = true - - - values = [ - "${file("${path.module}/solr-values.yaml")}", - var.solr_values_file - ] - -} diff --git a/solr/solr_chart/provider.tf b/solr/solr_chart/provider.tf deleted file mode 100644 index 1f4b1a98..00000000 --- a/solr/solr_chart/provider.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_providers { - digitalocean = { - source = "digitalocean/digitalocean" - version = "2.28.1" - } - kubernetes = "2.16.1" - helm = "2.8.0" - } -} diff --git a/solr/solr_chart/solr-operator-values.yaml b/solr/solr_chart/solr-operator-values.yaml deleted file mode 100644 index 3c1fddd7..00000000 --- a/solr/solr_chart/solr-operator-values.yaml +++ /dev/null @@ -1,3 +0,0 @@ -zookeeper-operator: - crd: - create: true diff --git a/solr/solr_chart/solr-values.yaml b/solr/solr_chart/solr-values.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/solr/solr_chart/variables.tf b/solr/solr_chart/variables.tf deleted file mode 100644 index 3b612437..00000000 --- a/solr/solr_chart/variables.tf +++ /dev/null @@ -1,13 +0,0 @@ -variable "cluster_name" { - type = string -} - -variable "solr_operator_values_file" { - type = string - default = "" -} - -variable "solr_values_file" { - type = string - default = "" -} diff --git a/solr/test/backend.tf b/solr/test/backend.tf deleted file mode 100644 index b113cddc..00000000 --- a/solr/test/backend.tf +++ /dev/null @@ -1,17 +0,0 @@ - -terraform { - # DigitalOcean uses the S3 spec. - backend "s3" { - bucket = "treetracker-test-terraform" - key = "terraform-solr.tfstate" - endpoint = "https://sfo2.digitaloceanspaces.com" - # DO uses the S3 format - # eu-west-1 is used to pass TF validation - # Region is ACTUALLY sfo2 on DO - region = "eu-west-1" - # Deactivate a few checks as TF will attempt these against AWS - skip_credentials_validation = true - skip_metadata_api_check = true - skip_region_validation = true - } -} diff --git a/solr/test/main.tf b/solr/test/main.tf deleted file mode 100644 index 1b7e0284..00000000 --- a/solr/test/main.tf +++ /dev/null @@ -1,4 +0,0 @@ -module "solr" { - source = "../solr_chart" - cluster_name = "test-k8s-treetracker" -} diff --git a/solr/test/provider.tf b/solr/test/provider.tf deleted file mode 100644 index 1f4b1a98..00000000 --- a/solr/test/provider.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_providers { - digitalocean = { - source = "digitalocean/digitalocean" - version = "2.28.1" - } - kubernetes = "2.16.1" - helm = "2.8.0" - } -}