From b8a15606056da241412dd4c09fb997244948bdc3 Mon Sep 17 00:00:00 2001 From: Lautaro Gonzalez Date: Tue, 20 Jul 2021 01:31:33 -0300 Subject: [PATCH 1/2] add basic configuration --- configure.sh | 38 ++++++++-------- deployment/api-gateway/deployment.yaml | 4 +- deployment/basic-ui/deployment.yaml | 4 +- .../evaluations-service/deployment.yaml | 10 ++--- deployment/executor-service/deployment.yaml | 4 +- deployment/kafka/kafka.yaml | 44 +++++++++---------- deployment/lti-app/deployment.yaml | 4 +- deployment/lti-service/deployment.yaml | 10 ++--- deployment/playground-service/deployment.yaml | 10 ++--- deployment/service-registry/statefulset.yaml | 4 +- deployment/users-service/deployment.yaml | 12 ++--- deployment/zookeeper-kafka/zookeeper.yaml | 2 +- 12 files changed, 72 insertions(+), 74 deletions(-) diff --git a/configure.sh b/configure.sh index 2d4656f..f23aa6a 100644 --- a/configure.sh +++ b/configure.sh @@ -1,30 +1,30 @@ #!/bin/bash set -e -# Install tiller -echo "Installing tiller" -kubectl create serviceaccount tiller \ - -n kube-system -kubectl create clusterrolebinding tiller \ - --clusterrole=cluster-admin \ - --serviceaccount=kube-system:tiller -helm init --service-account tiller - -# Wait some time till tiller starts -echo "Sleeping 15 seconds till tiller starts" -sleep 15 +# # Install tiller +# echo "Installing tiller" +# kubectl create serviceaccount tiller \ +# -n kube-system +# kubectl create clusterrolebinding tiller \ +# --clusterrole=cluster-admin \ +# --serviceaccount=kube-system:tiller +# helm init --service-account tiller + +# # Wait some time till tiller starts +# echo "Sleeping 15 seconds till tiller starts" +# sleep 15 # Install the Postgres Operator echo "Installing the postgres operator" POSTGRES_OPERATOR_PATH=$HOME/opt/zalando-postgres-operator POSTGRES_OPERATOR_TAR_GZ=$POSTGRES_OPERATOR_PATH/zalando-postgres-operator.tar.gz mkdir -p $POSTGRES_OPERATOR_PATH -curl https://github.com/zalando/postgres-operator/archive/v1.2.0.tar.gz -sL --output $POSTGRES_OPERATOR_TAR_GZ +curl https://github.com/zalando/postgres-operator/archive/v1.6.3.tar.gz -sL --output $POSTGRES_OPERATOR_TAR_GZ tar -xzvf $POSTGRES_OPERATOR_TAR_GZ -C $POSTGRES_OPERATOR_PATH rm $POSTGRES_OPERATOR_TAR_GZ helm install \ - --name zalando-postgres-operator \ - $POSTGRES_OPERATOR_PATH/postgres-operator-1.2.0/charts/postgres-operator + zalando-postgres-operator \ + $POSTGRES_OPERATOR_PATH/postgres-operator-1.6.3/charts/postgres-operator # Add Banzai's and Jetstack helm repositories echo "Adding needed repositories to install zookeeper and kafka operators" @@ -34,24 +34,24 @@ helm repo add jetstack https://charts.jetstack.io # Install the Zookeeper Operator echo "Installing the zookeeper operator" helm install \ - --name banzai-zookeeper-operator \ + banzai-zookeeper-operator \ banzaicloud-stable/zookeeper-operator # Install the Cert Manager echo "Installing the cert-manager operator (needed by the kafka operator)" kubectl apply --validate=false -f https://raw.githubusercontent.com/jetstack/cert-manager/release-0.10/deploy/manifests/00-crds.yaml helm install \ - --name cert-manager \ + cert-manager \ --version v0.10.1 \ jetstack/cert-manager -# Wait some time till cert manager stuff is available +# # Wait some time till cert manager stuff is available echo "Sleeping 60 seconds till cert manager stuff is available" sleep 60 # Install the Kafka Operator echo "Installing the kafka operator" helm install \ - --name banzai-kafka-operator \ + banzai-kafka-operator \ --version 0.2.4 \ banzaicloud-stable/kafka-operator diff --git a/deployment/api-gateway/deployment.yaml b/deployment/api-gateway/deployment.yaml index 78a68cb..3a8109a 100644 --- a/deployment/api-gateway/deployment.yaml +++ b/deployment/api-gateway/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: api-gateway spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: api-gateway @@ -18,7 +18,7 @@ spec: image: itbacep/api-gateway ports: - containerPort: 80 - resources: + resources: requests: cpu: "100m" memory: "512Mi" diff --git a/deployment/basic-ui/deployment.yaml b/deployment/basic-ui/deployment.yaml index 1e98555..c6e7bb3 100644 --- a/deployment/basic-ui/deployment.yaml +++ b/deployment/basic-ui/deployment.yaml @@ -18,7 +18,7 @@ spec: image: itbacep/basic-ui ports: - containerPort: 8000 - resources: + resources: requests: cpu: "200m" memory: "1Gi" @@ -27,4 +27,4 @@ spec: memory: "2Gi" env: - name: API_HOST - value: https://api.cep.bellotapps.com + value: https://api.rattarchy.xyz diff --git a/deployment/evaluations-service/deployment.yaml b/deployment/evaluations-service/deployment.yaml index 83f104c..5916791 100644 --- a/deployment/evaluations-service/deployment.yaml +++ b/deployment/evaluations-service/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: evaluations-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: evaluations-service @@ -18,7 +18,7 @@ spec: image: itbacep/evaluations-service ports: - containerPort: 8000 - resources: + resources: requests: cpu: "100m" memory: "512Mi" @@ -40,13 +40,13 @@ spec: - name: SPRING_DATASOURCE_USERNAME valueFrom: secretKeyRef: - name: evaluations-service.evaluations-service-postgres-cluster.credentials + name: evaluations-service.evaluations-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: username - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: - name: evaluations-service.evaluations-service-postgres-cluster.credentials + name: evaluations-service.evaluations-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: password - + - name: SPRING_DATASOURCE_URL value: jdbc:postgresql://evaluations-service-postgres-cluster:5432/evaluationsservice diff --git a/deployment/executor-service/deployment.yaml b/deployment/executor-service/deployment.yaml index e907b5b..f67b41b 100644 --- a/deployment/executor-service/deployment.yaml +++ b/deployment/executor-service/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: executor-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: executor-service @@ -18,7 +18,7 @@ spec: image: itbacep/executor-service ports: - containerPort: 8010 - resources: + resources: requests: cpu: "200m" memory: "512Mi" diff --git a/deployment/kafka/kafka.yaml b/deployment/kafka/kafka.yaml index 8b4846b..a3f97e6 100644 --- a/deployment/kafka/kafka.yaml +++ b/deployment/kafka/kafka.yaml @@ -34,26 +34,26 @@ spec: requests: cpu: "0.1" memory: "512Mi" - - id: 1 - brokerConfigGroup: "default" - brokerConfig: - resourceRequirements: - limits: - cpu: "0.3" - memory: "3Gi" - requests: - cpu: "0.1" - memory: "512Mi" - - id: 2 - brokerConfigGroup: "default" - brokerConfig: - resourceRequirements: - limits: - cpu: "0.3" - memory: "3Gi" - requests: - cpu: "0.1" - memory: "512Mi" + # - id: 1 + # brokerConfigGroup: "default" + # brokerConfig: + # resourceRequirements: + # limits: + # cpu: "0.3" + # memory: "3Gi" + # requests: + # cpu: "0.1" + # memory: "512Mi" + # - id: 2 + # brokerConfigGroup: "default" + # brokerConfig: + # resourceRequirements: + # limits: + # cpu: "0.3" + # memory: "3Gi" + # requests: + # cpu: "0.1" + # memory: "512Mi" rollingUpgradeConfig: failureThreshold: 1 listenersConfig: @@ -85,7 +85,7 @@ spec: } clusterConfig: | { - "min.insync.replicas": 3 + "min.insync.replicas": 1 } config: | # Copyright 2017 LinkedIn Corp. Licensed under the BSD 2-Clause License (the "License"). See License in the project root for license information. @@ -272,5 +272,3 @@ spec: webserver.accesslog.path=access.log # HTTP Request Log retention days webserver.accesslog.retention.days=14 - - \ No newline at end of file diff --git a/deployment/lti-app/deployment.yaml b/deployment/lti-app/deployment.yaml index 2158e32..1fa6f2b 100644 --- a/deployment/lti-app/deployment.yaml +++ b/deployment/lti-app/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: lti-app spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: lti-app @@ -18,7 +18,7 @@ spec: image: itbacep/lti-app ports: - containerPort: 8000 - resources: + resources: requests: cpu: "100m" memory: "512Mi" diff --git a/deployment/lti-service/deployment.yaml b/deployment/lti-service/deployment.yaml index f68cb97..7d6b387 100644 --- a/deployment/lti-service/deployment.yaml +++ b/deployment/lti-service/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: lti-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: lti-service @@ -18,7 +18,7 @@ spec: image: itbacep/lti-service ports: - containerPort: 8000 - resources: + resources: requests: cpu: "100m" memory: "512Mi" @@ -43,13 +43,13 @@ spec: - name: SPRING_DATASOURCE_USERNAME valueFrom: secretKeyRef: - name: lti-service.lti-service-postgres-cluster.credentials + name: lti-service.lti-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: username - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: - name: lti-service.lti-service-postgres-cluster.credentials + name: lti-service.lti-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: password - + - name: SPRING_DATASOURCE_URL value: jdbc:postgresql://lti-service-postgres-cluster:5432/ltiservice diff --git a/deployment/playground-service/deployment.yaml b/deployment/playground-service/deployment.yaml index d32fcda..0a4070e 100644 --- a/deployment/playground-service/deployment.yaml +++ b/deployment/playground-service/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: playground-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: playground-service @@ -18,7 +18,7 @@ spec: image: itbacep/playground-service ports: - containerPort: 8000 - resources: + resources: requests: cpu: "100m" memory: "512Mi" @@ -40,13 +40,13 @@ spec: - name: SPRING_DATASOURCE_USERNAME valueFrom: secretKeyRef: - name: playground-service.playground-service-postgres-cluster.credentials + name: playground-service.playground-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: username - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: - name: playground-service.playground-service-postgres-cluster.credentials + name: playground-service.playground-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: password - + - name: SPRING_DATASOURCE_URL value: jdbc:postgresql://playground-service-postgres-cluster:5432/playgroundservice diff --git a/deployment/service-registry/statefulset.yaml b/deployment/service-registry/statefulset.yaml index 2c81455..2ecc493 100644 --- a/deployment/service-registry/statefulset.yaml +++ b/deployment/service-registry/statefulset.yaml @@ -4,7 +4,7 @@ metadata: name: service-registry spec: serviceName: service-registry - replicas: 2 + replicas: 1 selector: matchLabels: app: service-registry @@ -18,7 +18,7 @@ spec: image: itbacep/service-registry ports: - containerPort: 8761 - resources: + resources: requests: cpu: "10m" memory: "512Mi" diff --git a/deployment/users-service/deployment.yaml b/deployment/users-service/deployment.yaml index e11ac14..86479ed 100644 --- a/deployment/users-service/deployment.yaml +++ b/deployment/users-service/deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: name: users-service spec: - replicas: 2 + replicas: 1 selector: matchLabels: app: users-service @@ -18,7 +18,7 @@ spec: image: itbacep/users-service ports: - containerPort: 8000 - resources: + resources: requests: cpu: "100m" memory: "512Mi" @@ -40,7 +40,7 @@ spec: value: prod - name: SPRING_ZIPKIN_BASEURL value: http://zipkin:9411/ - + - name: USERSSERVICE_FIRSTUSER_USERNAME valueFrom: configMapKeyRef: @@ -55,13 +55,13 @@ spec: - name: SPRING_DATASOURCE_USERNAME valueFrom: secretKeyRef: - name: users-service.users-service-postgres-cluster.credentials + name: users-service.users-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: username - name: SPRING_DATASOURCE_PASSWORD valueFrom: secretKeyRef: - name: users-service.users-service-postgres-cluster.credentials + name: users-service.users-service-postgres-cluster.credentials.postgresql.acid.zalan.do key: password - + - name: SPRING_DATASOURCE_URL value: jdbc:postgresql://users-service-postgres-cluster:5432/usersservice diff --git a/deployment/zookeeper-kafka/zookeeper.yaml b/deployment/zookeeper-kafka/zookeeper.yaml index bf9858d..0d2aca1 100644 --- a/deployment/zookeeper-kafka/zookeeper.yaml +++ b/deployment/zookeeper-kafka/zookeeper.yaml @@ -3,4 +3,4 @@ kind: "ZookeeperCluster" metadata: name: zookeeper-kafka spec: - replicas: 5 + replicas: 1 From 1eb9523967a1df38a690429902aec59f888eb58d Mon Sep 17 00:00:00 2001 From: Lautaro Gonzalez Date: Tue, 20 Jul 2021 01:34:59 -0300 Subject: [PATCH 2/2] decrease number of instances --- deployment/evaluations-service-postgres/postgres.yaml | 3 +-- deployment/lti-service-postgres/postgres.yaml | 3 +-- deployment/playground-service-postgres/postgres.yaml | 3 +-- deployment/users-service-postgres/postgres.yaml | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/deployment/evaluations-service-postgres/postgres.yaml b/deployment/evaluations-service-postgres/postgres.yaml index 27ef716..d41d358 100644 --- a/deployment/evaluations-service-postgres/postgres.yaml +++ b/deployment/evaluations-service-postgres/postgres.yaml @@ -6,7 +6,7 @@ spec: teamId: "evaluations-service" volume: size: 1Gi - numberOfInstances: 3 + numberOfInstances: 1 enableMasterLoadBalancer: false enableReplicaLoadBalancer: false users: @@ -25,4 +25,3 @@ spec: limits: cpu: 100m memory: "1Gi" - diff --git a/deployment/lti-service-postgres/postgres.yaml b/deployment/lti-service-postgres/postgres.yaml index 5481db6..df6c81c 100644 --- a/deployment/lti-service-postgres/postgres.yaml +++ b/deployment/lti-service-postgres/postgres.yaml @@ -6,7 +6,7 @@ spec: teamId: "lti-service" volume: size: 1Gi - numberOfInstances: 3 + numberOfInstances: 1 enableMasterLoadBalancer: false enableReplicaLoadBalancer: false users: @@ -25,4 +25,3 @@ spec: limits: cpu: 100m memory: "1Gi" - diff --git a/deployment/playground-service-postgres/postgres.yaml b/deployment/playground-service-postgres/postgres.yaml index b459faf..f8f8e3e 100644 --- a/deployment/playground-service-postgres/postgres.yaml +++ b/deployment/playground-service-postgres/postgres.yaml @@ -6,7 +6,7 @@ spec: teamId: "playground-service" volume: size: 1Gi - numberOfInstances: 3 + numberOfInstances: 1 enableMasterLoadBalancer: false enableReplicaLoadBalancer: false users: @@ -25,4 +25,3 @@ spec: limits: cpu: 100m memory: "1Gi" - diff --git a/deployment/users-service-postgres/postgres.yaml b/deployment/users-service-postgres/postgres.yaml index adb9e42..9e1edcf 100644 --- a/deployment/users-service-postgres/postgres.yaml +++ b/deployment/users-service-postgres/postgres.yaml @@ -6,7 +6,7 @@ spec: teamId: "users-service" volume: size: 1Gi - numberOfInstances: 3 + numberOfInstances: 1 enableMasterLoadBalancer: false enableReplicaLoadBalancer: false users: @@ -25,4 +25,3 @@ spec: limits: cpu: 100m memory: "1Gi" -