From 1a56057d48100d455d32200400e8cb09b66a0ab8 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Mon, 10 Jul 2023 16:16:40 +0200 Subject: [PATCH 01/11] PTFE-544: kustomize runner manager --- manifests/base/deployment.yaml | 59 +++ manifests/base/kustomization.yaml | 26 ++ manifests/base/redis.yaml | 512 +++++++++++++++++++++++ manifests/base/runner-manager-auth.env | 5 + manifests/base/runner-manager-config.env | 2 + manifests/base/service.yaml | 17 + manifests/base/settings.yaml | 21 + 7 files changed, 642 insertions(+) create mode 100644 manifests/base/deployment.yaml create mode 100644 manifests/base/kustomization.yaml create mode 100644 manifests/base/redis.yaml create mode 100644 manifests/base/runner-manager-auth.env create mode 100644 manifests/base/runner-manager-config.env create mode 100644 manifests/base/service.yaml create mode 100644 manifests/base/settings.yaml diff --git a/manifests/base/deployment.yaml b/manifests/base/deployment.yaml new file mode 100644 index 00000000..e30f6644 --- /dev/null +++ b/manifests/base/deployment.yaml @@ -0,0 +1,59 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: runner-manager + labels: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager +spec: + selector: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager + template: + metadata: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager + spec: + serviceAccountName: default + containers: + - args: + - 'srcs.web.app:app' + - '--host' + - '--port' + - '80' + command: + - uvicorn + env: + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + key: redis-password + name: redis + - name: SETTING_FILE + value: /app/config/settings.yml + envFrom: + - configMapRef: + name: runner-manager-config + - secretRef: + name: runner-manager-auth + image: 'ghcr.io/scality/runner-manager:0.1.0' + imagePullPolicy: IfNotPresent + name: runner-manager + ports: + - containerPort: 80 + name: http + resources: + limits: + cpu: 250m + memory: 1Gi + requests: + cpu: 250m + memory: 1Gi + securityContext: {} + volumeMounts: + - mountPath: /app/config + name: config + volumes: + - configMap: + name: runner-manager-settings + name: config diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml new file mode 100644 index 00000000..de2249da --- /dev/null +++ b/manifests/base/kustomization.yaml @@ -0,0 +1,26 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +configMapGenerator: +- name: runner-manager-settings + files: + - settings.yaml +- name: runner-manager-config + envs: + - runner-manager-config.env + +secretGenerator: + - name: runner-manager-auth + envs: + - runner-manager-auth.env + +images: + - name: runner-manager + newName: ghcr.io/scality/runner-manager + newTag: '0.1.0' + +resources: + - service.yaml + - deployment.yaml + - redis.yaml \ No newline at end of file diff --git a/manifests/base/redis.yaml b/manifests/base/redis.yaml new file mode 100644 index 00000000..d3aafd73 --- /dev/null +++ b/manifests/base/redis.yaml @@ -0,0 +1,512 @@ +--- +# Source: redis/templates/secret.yaml +apiVersion: v1 +kind: Secret +metadata: + name: redis + labels: + app: redis + chart: redis-11.3.4 + release: "redis" + heritage: "Helm" +type: Opaque +data: + redis-password: "bzlyM1NwbWZtYQ==" +--- +# Source: redis/templates/configmap-scripts.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: redis-scripts + + labels: + app: redis + chart: redis-11.3.4 + heritage: Helm + release: redis +data: + start-master.sh: | + #!/bin/bash + useradd redis + chown -R redis /data + if [[ -n $REDIS_PASSWORD_FILE ]]; then + password_aux=`cat ${REDIS_PASSWORD_FILE}` + export REDIS_PASSWORD=$password_aux + fi + if [[ ! -f /opt/bitnami/redis/etc/master.conf ]];then + cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf + fi + if [[ ! -f /opt/bitnami/redis/etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + ARGS=("--port" "${REDIS_PORT}") + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_PASSWORD}") + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") + exec /run.sh "${ARGS[@]}" + start-slave.sh: | + #!/bin/bash + useradd redis + chown -R redis /data + if [[ -n $REDIS_PASSWORD_FILE ]]; then + password_aux=`cat ${REDIS_PASSWORD_FILE}` + export REDIS_PASSWORD=$password_aux + fi + if [[ -n $REDIS_MASTER_PASSWORD_FILE ]]; then + password_aux=`cat ${REDIS_MASTER_PASSWORD_FILE}` + export REDIS_MASTER_PASSWORD=$password_aux + fi + if [[ ! -f /opt/bitnami/redis/etc/replica.conf ]];then + cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf + fi + if [[ ! -f /opt/bitnami/redis/etc/redis.conf ]];then + cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf + fi + ARGS=("--port" "${REDIS_PORT}") + ARGS+=("--slaveof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") + ARGS+=("--requirepass" "${REDIS_PASSWORD}") + ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") + ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") + ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") + exec /run.sh "${ARGS[@]}" +--- +# Source: redis/templates/configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: redis + + labels: + app: redis + chart: redis-11.3.4 + heritage: Helm + release: redis +data: + redis.conf: |- + # User-supplied configuration: + # Enable AOF https://redis.io/topics/persistence#append-only-file + appendonly yes + # Disable RDB persistence, AOF persistence already enabled. + save "" + master.conf: |- + dir /data + rename-command FLUSHDB "" + rename-command FLUSHALL "" + replica.conf: |- + dir /data + slave-read-only yes + rename-command FLUSHDB "" + rename-command FLUSHALL "" +--- +# Source: redis/templates/health-configmap.yaml +apiVersion: v1 +kind: ConfigMap +metadata: + name: redis-health + labels: + app: redis + chart: redis-11.3.4 + heritage: Helm + release: redis +data: + ping_readiness_local.sh: |- + #!/bin/bash + no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) + response=$( + timeout -s 3 $1 \ + redis-cli \ + -a $REDIS_PASSWORD $no_auth_warning \ + -h localhost \ + -p $REDIS_PORT \ + ping + ) + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_local.sh: |- + #!/bin/bash + no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) + response=$( + timeout -s 3 $1 \ + redis-cli \ + -a $REDIS_PASSWORD $no_auth_warning \ + -h localhost \ + -p $REDIS_PORT \ + ping + ) + if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then + echo "$response" + exit 1 + fi + ping_readiness_master.sh: |- + #!/bin/bash + no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) + response=$( + timeout -s 3 $1 \ + redis-cli \ + -a $REDIS_MASTER_PASSWORD $no_auth_warning \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ + ping + ) + if [ "$response" != "PONG" ]; then + echo "$response" + exit 1 + fi + ping_liveness_master.sh: |- + #!/bin/bash + no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) + response=$( + timeout -s 3 $1 \ + redis-cli \ + -a $REDIS_MASTER_PASSWORD $no_auth_warning \ + -h $REDIS_MASTER_HOST \ + -p $REDIS_MASTER_PORT_NUMBER \ + ping + ) + if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then + echo "$response" + exit 1 + fi + ping_readiness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? + "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? + exit $exit_status + ping_liveness_local_and_master.sh: |- + script_dir="$(dirname "$0")" + exit_status=0 + "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? + "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? + exit $exit_status +--- +# Source: redis/templates/headless-svc.yaml +apiVersion: v1 +kind: Service +metadata: + name: redis-headless + labels: + app: redis + chart: redis-11.3.4 + release: redis + heritage: Helm +spec: + type: ClusterIP + clusterIP: None + ports: + - name: redis + port: 6379 + targetPort: redis + selector: + app: redis + release: redis +--- +# Source: redis/templates/redis-master-svc.yaml +apiVersion: v1 +kind: Service +metadata: + name: redis-master + labels: + app: redis + chart: redis-11.3.4 + release: redis + heritage: Helm +spec: + type: ClusterIP + ports: + - name: redis + port: 6379 + targetPort: redis + selector: + app: redis + release: redis + role: master +--- +# Source: redis/templates/redis-slave-svc.yaml +apiVersion: v1 +kind: Service +metadata: + name: redis-slave + + labels: + app: redis + chart: redis-11.3.4 + release: redis + heritage: Helm +spec: + type: ClusterIP + ports: + - name: redis + port: 6379 + targetPort: redis + selector: + app: redis + release: redis + role: slave +--- +# Source: redis/templates/redis-master-statefulset.yaml +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: redis-master + labels: + app: redis + chart: redis-11.3.4 + release: redis + heritage: Helm +spec: + selector: + matchLabels: + app: redis + release: redis + role: master + serviceName: redis-headless + template: + metadata: + labels: + app: redis + chart: redis-11.3.4 + release: redis + role: master + annotations: + checksum/health: 58a2c99b230d98ed70d50958f63d162afe3000bbb8d7293aa7bf87efeab3627c + checksum/configmap: 7795d086a1ff86d46b63a301b19775464f5e9ced47d38ab4db4bb4267168e4db + checksum/secret: 8923aeed42db66b2ba64abf234c770356e26f260100585e0a4e2e5070d69f69f + spec: + + securityContext: + fsGroup: 1001 + serviceAccountName: default + containers: + - name: redis + image: docker.io/bitnami/redis:6.0.9-debian-10-r0 + imagePullPolicy: "IfNotPresent" + securityContext: + runAsUser: 1001 + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/start-master.sh + env: + - name: REDIS_REPLICATION_MODE + value: master + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: redis + key: redis-password + - name: REDIS_TLS_ENABLED + value: "no" + - name: REDIS_PORT + value: "6379" + ports: + - name: redis + containerPort: 6379 + livenessProbe: + initialDelaySeconds: 5 + periodSeconds: 5 + # One second longer than command timeout should prevent generation of zombie processes. + timeoutSeconds: 6 + successThreshold: 1 + failureThreshold: 5 + exec: + command: + - sh + - -c + - /health/ping_liveness_local.sh 5 + readinessProbe: + initialDelaySeconds: 5 + periodSeconds: 5 + timeoutSeconds: 2 + successThreshold: 1 + failureThreshold: 5 + exec: + command: + - sh + - -c + - /health/ping_readiness_local.sh 1 + resources: + null + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + - name: redis-data + mountPath: /data + subPath: + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc/ + volumes: + - name: start-scripts + configMap: + name: redis-scripts + defaultMode: 0755 + - name: health + configMap: + name: redis-health + defaultMode: 0755 + - name: config + configMap: + name: redis + - name: redis-tmp-conf + emptyDir: {} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: + app: redis + release: redis + heritage: Helm + component: master + spec: + accessModes: + - "ReadWriteOnce" + resources: + requests: + storage: "8Gi" + + selector: + updateStrategy: + type: RollingUpdate +--- +# Source: redis/templates/redis-slave-statefulset.yaml +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: redis-slave + labels: + app: redis + chart: redis-11.3.4 + release: redis + heritage: Helm +spec: + replicas: 2 + serviceName: redis-headless + selector: + matchLabels: + app: redis + release: redis + role: slave + template: + metadata: + labels: + app: redis + release: redis + chart: redis-11.3.4 + role: slave + annotations: + checksum/health: 58a2c99b230d98ed70d50958f63d162afe3000bbb8d7293aa7bf87efeab3627c + checksum/configmap: 7795d086a1ff86d46b63a301b19775464f5e9ced47d38ab4db4bb4267168e4db + checksum/secret: 9592b081a54c3854a6f2e3774269701d1d1bbb67ae73291b0c747973d1ddc562 + spec: + + securityContext: + fsGroup: 1001 + serviceAccountName: default + containers: + - name: redis + image: docker.io/bitnami/redis:6.0.9-debian-10-r0 + imagePullPolicy: "IfNotPresent" + securityContext: + runAsUser: 1001 + command: + - /bin/bash + - -c + - /opt/bitnami/scripts/start-scripts/start-slave.sh + env: + - name: REDIS_REPLICATION_MODE + value: slave + - name: REDIS_MASTER_HOST + value: redis-master-0.redis-headless.technicaltest.svc.cluster.local + - name: REDIS_MASTER_PORT_NUMBER + value: "6379" + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: redis + key: redis-password + - name: REDIS_MASTER_PASSWORD + valueFrom: + secretKeyRef: + name: redis + key: redis-password + - name: REDIS_TLS_ENABLED + value: "no" + - name: REDIS_PORT + value: "6379" + ports: + - name: redis + containerPort: 6379 + livenessProbe: + initialDelaySeconds: 30 + periodSeconds: 10 + timeoutSeconds: 6 + successThreshold: 1 + failureThreshold: 5 + exec: + command: + - sh + - -c + - /health/ping_liveness_local_and_master.sh 5 + readinessProbe: + initialDelaySeconds: 5 + periodSeconds: 10 + timeoutSeconds: 11 + successThreshold: 1 + failureThreshold: 5 + exec: + command: + - sh + - -c + - /health/ping_readiness_local_and_master.sh 10 + resources: + null + volumeMounts: + - name: start-scripts + mountPath: /opt/bitnami/scripts/start-scripts + - name: health + mountPath: /health + - name: redis-data + mountPath: /data + - name: config + mountPath: /opt/bitnami/redis/mounted-etc + - name: redis-tmp-conf + mountPath: /opt/bitnami/redis/etc + volumes: + - name: start-scripts + configMap: + name: redis-scripts + defaultMode: 0755 + - name: health + configMap: + name: redis-health + defaultMode: 0755 + - name: config + configMap: + name: redis + - name: redis-tmp-conf + emptyDir: {} + volumeClaimTemplates: + - metadata: + name: redis-data + labels: + app: redis + release: redis + heritage: Helm + component: slave + spec: + accessModes: + - "ReadWriteOnce" + resources: + requests: + storage: "8Gi" + + selector: + updateStrategy: + type: RollingUpdate diff --git a/manifests/base/runner-manager-auth.env b/manifests/base/runner-manager-auth.env new file mode 100644 index 00000000..b4ed4b6a --- /dev/null +++ b/manifests/base/runner-manager-auth.env @@ -0,0 +1,5 @@ +AWS_ACCESS_KEY_ID=aws_key_id +AWS_SECRET_ACCESS_KEY=aws_secret_key +GITHUB_TOKEN='github_token' +REDHAT_USERNAME=redhat_username' +REDHAT_PASSWORD='redhat_password' \ No newline at end of file diff --git a/manifests/base/runner-manager-config.env b/manifests/base/runner-manager-config.env new file mode 100644 index 00000000..e13c0d5a --- /dev/null +++ b/manifests/base/runner-manager-config.env @@ -0,0 +1,2 @@ +AWS_DEFAULT_REGION=us-west-2 +GITHUB_ORGANIZATION=myorganisation diff --git a/manifests/base/service.yaml b/manifests/base/service.yaml new file mode 100644 index 00000000..7e3e05fc --- /dev/null +++ b/manifests/base/service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + name: runner-manager + labels: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager +spec: + type: ClusterIP + ports: + - port: 80 + targetPort: http + protocol: TCP + name: runner-manager + selector: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager diff --git a/manifests/base/settings.yaml b/manifests/base/settings.yaml new file mode 100644 index 00000000..d4165d63 --- /dev/null +++ b/manifests/base/settings.yaml @@ -0,0 +1,21 @@ +# GitHub +github_organization: my_organisation +allowed_ssh_keys: "" + +# Cloud connection name +cloud_name: gcloud +# Cloud config, it will change depending on your cloud +cloud_config: {} +python_config: "" +runner_pool: [] + +extra_runner_timer: + hours: 0 + minutes: 10 +timeout_runner_timer: + hours: 0 + minutes: 15 +redis: + host: redis-master + port: 6379 + From 3d065140527db01c3d9cbe5cd314304770d38164 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Mon, 10 Jul 2023 17:13:53 +0200 Subject: [PATCH 02/11] PTFE-544: added the env file for redis --- manifests/base/kustomization.yaml | 3 +++ manifests/base/redis.env | 2 ++ manifests/base/redis.yaml | 14 -------------- manifests/base/runner-manager-auth.env | 4 +--- manifests/base/settings.yaml | 1 - 5 files changed, 6 insertions(+), 18 deletions(-) create mode 100644 manifests/base/redis.env diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index de2249da..80dd9faa 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -14,6 +14,9 @@ secretGenerator: - name: runner-manager-auth envs: - runner-manager-auth.env + - name: redis + envs: + - redis.env images: - name: runner-manager diff --git a/manifests/base/redis.env b/manifests/base/redis.env new file mode 100644 index 00000000..5b127d7d --- /dev/null +++ b/manifests/base/redis.env @@ -0,0 +1,2 @@ +# change the password +redis-password='redis_password' diff --git a/manifests/base/redis.yaml b/manifests/base/redis.yaml index d3aafd73..db1a2dc3 100644 --- a/manifests/base/redis.yaml +++ b/manifests/base/redis.yaml @@ -1,18 +1,4 @@ --- -# Source: redis/templates/secret.yaml -apiVersion: v1 -kind: Secret -metadata: - name: redis - labels: - app: redis - chart: redis-11.3.4 - release: "redis" - heritage: "Helm" -type: Opaque -data: - redis-password: "bzlyM1NwbWZtYQ==" ---- # Source: redis/templates/configmap-scripts.yaml apiVersion: v1 kind: ConfigMap diff --git a/manifests/base/runner-manager-auth.env b/manifests/base/runner-manager-auth.env index b4ed4b6a..61bc2a4f 100644 --- a/manifests/base/runner-manager-auth.env +++ b/manifests/base/runner-manager-auth.env @@ -1,5 +1,3 @@ -AWS_ACCESS_KEY_ID=aws_key_id -AWS_SECRET_ACCESS_KEY=aws_secret_key GITHUB_TOKEN='github_token' REDHAT_USERNAME=redhat_username' -REDHAT_PASSWORD='redhat_password' \ No newline at end of file +REDHAT_PASSWORD='redhat_password' diff --git a/manifests/base/settings.yaml b/manifests/base/settings.yaml index d4165d63..66e532ed 100644 --- a/manifests/base/settings.yaml +++ b/manifests/base/settings.yaml @@ -18,4 +18,3 @@ timeout_runner_timer: redis: host: redis-master port: 6379 - From c4b947b3fff6b9318fd15a76de1297b629fd0a5e Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Tue, 11 Jul 2023 14:31:20 +0200 Subject: [PATCH 03/11] PTFE-544: restructured base file --- manifests/base/redis.yaml | 498 ------------------ manifests/base/redis/kustomization.yaml | 18 + .../{redis.env => redis/redis-secrets.env} | 0 manifests/base/redis/redis.yaml | 58 ++ .../base/{ => runner-manager}/deployment.yaml | 14 +- .../{ => runner-manager}/kustomization.yaml | 16 +- .../runner-manager-config.env | 0 .../runner-manager-secrets.env} | 0 .../base/{ => runner-manager}/service.yaml | 0 .../base/{ => runner-manager}/settings.yaml | 0 manifests/kustomization.yaml | 7 + 11 files changed, 95 insertions(+), 516 deletions(-) delete mode 100644 manifests/base/redis.yaml create mode 100644 manifests/base/redis/kustomization.yaml rename manifests/base/{redis.env => redis/redis-secrets.env} (100%) create mode 100644 manifests/base/redis/redis.yaml rename manifests/base/{ => runner-manager}/deployment.yaml (77%) rename manifests/base/{ => runner-manager}/kustomization.yaml (63%) rename manifests/base/{ => runner-manager}/runner-manager-config.env (100%) rename manifests/base/{runner-manager-auth.env => runner-manager/runner-manager-secrets.env} (100%) rename manifests/base/{ => runner-manager}/service.yaml (100%) rename manifests/base/{ => runner-manager}/settings.yaml (100%) create mode 100644 manifests/kustomization.yaml diff --git a/manifests/base/redis.yaml b/manifests/base/redis.yaml deleted file mode 100644 index db1a2dc3..00000000 --- a/manifests/base/redis.yaml +++ /dev/null @@ -1,498 +0,0 @@ ---- -# Source: redis/templates/configmap-scripts.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: redis-scripts - - labels: - app: redis - chart: redis-11.3.4 - heritage: Helm - release: redis -data: - start-master.sh: | - #!/bin/bash - useradd redis - chown -R redis /data - if [[ -n $REDIS_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_PASSWORD_FILE}` - export REDIS_PASSWORD=$password_aux - fi - if [[ ! -f /opt/bitnami/redis/etc/master.conf ]];then - cp /opt/bitnami/redis/mounted-etc/master.conf /opt/bitnami/redis/etc/master.conf - fi - if [[ ! -f /opt/bitnami/redis/etc/redis.conf ]];then - cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf - fi - ARGS=("--port" "${REDIS_PORT}") - ARGS+=("--requirepass" "${REDIS_PASSWORD}") - ARGS+=("--masterauth" "${REDIS_PASSWORD}") - ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") - ARGS+=("--include" "/opt/bitnami/redis/etc/master.conf") - exec /run.sh "${ARGS[@]}" - start-slave.sh: | - #!/bin/bash - useradd redis - chown -R redis /data - if [[ -n $REDIS_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_PASSWORD_FILE}` - export REDIS_PASSWORD=$password_aux - fi - if [[ -n $REDIS_MASTER_PASSWORD_FILE ]]; then - password_aux=`cat ${REDIS_MASTER_PASSWORD_FILE}` - export REDIS_MASTER_PASSWORD=$password_aux - fi - if [[ ! -f /opt/bitnami/redis/etc/replica.conf ]];then - cp /opt/bitnami/redis/mounted-etc/replica.conf /opt/bitnami/redis/etc/replica.conf - fi - if [[ ! -f /opt/bitnami/redis/etc/redis.conf ]];then - cp /opt/bitnami/redis/mounted-etc/redis.conf /opt/bitnami/redis/etc/redis.conf - fi - ARGS=("--port" "${REDIS_PORT}") - ARGS+=("--slaveof" "${REDIS_MASTER_HOST}" "${REDIS_MASTER_PORT_NUMBER}") - ARGS+=("--requirepass" "${REDIS_PASSWORD}") - ARGS+=("--masterauth" "${REDIS_MASTER_PASSWORD}") - ARGS+=("--include" "/opt/bitnami/redis/etc/redis.conf") - ARGS+=("--include" "/opt/bitnami/redis/etc/replica.conf") - exec /run.sh "${ARGS[@]}" ---- -# Source: redis/templates/configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: redis - - labels: - app: redis - chart: redis-11.3.4 - heritage: Helm - release: redis -data: - redis.conf: |- - # User-supplied configuration: - # Enable AOF https://redis.io/topics/persistence#append-only-file - appendonly yes - # Disable RDB persistence, AOF persistence already enabled. - save "" - master.conf: |- - dir /data - rename-command FLUSHDB "" - rename-command FLUSHALL "" - replica.conf: |- - dir /data - slave-read-only yes - rename-command FLUSHDB "" - rename-command FLUSHALL "" ---- -# Source: redis/templates/health-configmap.yaml -apiVersion: v1 -kind: ConfigMap -metadata: - name: redis-health - labels: - app: redis - chart: redis-11.3.4 - heritage: Helm - release: redis -data: - ping_readiness_local.sh: |- - #!/bin/bash - no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) - response=$( - timeout -s 3 $1 \ - redis-cli \ - -a $REDIS_PASSWORD $no_auth_warning \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - ping_liveness_local.sh: |- - #!/bin/bash - no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) - response=$( - timeout -s 3 $1 \ - redis-cli \ - -a $REDIS_PASSWORD $no_auth_warning \ - -h localhost \ - -p $REDIS_PORT \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_readiness_master.sh: |- - #!/bin/bash - no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) - response=$( - timeout -s 3 $1 \ - redis-cli \ - -a $REDIS_MASTER_PASSWORD $no_auth_warning \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ]; then - echo "$response" - exit 1 - fi - ping_liveness_master.sh: |- - #!/bin/bash - no_auth_warning=$([[ "$(redis-cli --version)" =~ (redis-cli 5.*) ]] && echo --no-auth-warning) - response=$( - timeout -s 3 $1 \ - redis-cli \ - -a $REDIS_MASTER_PASSWORD $no_auth_warning \ - -h $REDIS_MASTER_HOST \ - -p $REDIS_MASTER_PORT_NUMBER \ - ping - ) - if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then - echo "$response" - exit 1 - fi - ping_readiness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_readiness_local.sh" $1 || exit_status=$? - "$script_dir/ping_readiness_master.sh" $1 || exit_status=$? - exit $exit_status - ping_liveness_local_and_master.sh: |- - script_dir="$(dirname "$0")" - exit_status=0 - "$script_dir/ping_liveness_local.sh" $1 || exit_status=$? - "$script_dir/ping_liveness_master.sh" $1 || exit_status=$? - exit $exit_status ---- -# Source: redis/templates/headless-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: redis-headless - labels: - app: redis - chart: redis-11.3.4 - release: redis - heritage: Helm -spec: - type: ClusterIP - clusterIP: None - ports: - - name: redis - port: 6379 - targetPort: redis - selector: - app: redis - release: redis ---- -# Source: redis/templates/redis-master-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - app: redis - chart: redis-11.3.4 - release: redis - heritage: Helm -spec: - type: ClusterIP - ports: - - name: redis - port: 6379 - targetPort: redis - selector: - app: redis - release: redis - role: master ---- -# Source: redis/templates/redis-slave-svc.yaml -apiVersion: v1 -kind: Service -metadata: - name: redis-slave - - labels: - app: redis - chart: redis-11.3.4 - release: redis - heritage: Helm -spec: - type: ClusterIP - ports: - - name: redis - port: 6379 - targetPort: redis - selector: - app: redis - release: redis - role: slave ---- -# Source: redis/templates/redis-master-statefulset.yaml -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: redis-master - labels: - app: redis - chart: redis-11.3.4 - release: redis - heritage: Helm -spec: - selector: - matchLabels: - app: redis - release: redis - role: master - serviceName: redis-headless - template: - metadata: - labels: - app: redis - chart: redis-11.3.4 - release: redis - role: master - annotations: - checksum/health: 58a2c99b230d98ed70d50958f63d162afe3000bbb8d7293aa7bf87efeab3627c - checksum/configmap: 7795d086a1ff86d46b63a301b19775464f5e9ced47d38ab4db4bb4267168e4db - checksum/secret: 8923aeed42db66b2ba64abf234c770356e26f260100585e0a4e2e5070d69f69f - spec: - - securityContext: - fsGroup: 1001 - serviceAccountName: default - containers: - - name: redis - image: docker.io/bitnami/redis:6.0.9-debian-10-r0 - imagePullPolicy: "IfNotPresent" - securityContext: - runAsUser: 1001 - command: - - /bin/bash - - -c - - /opt/bitnami/scripts/start-scripts/start-master.sh - env: - - name: REDIS_REPLICATION_MODE - value: master - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis - key: redis-password - - name: REDIS_TLS_ENABLED - value: "no" - - name: REDIS_PORT - value: "6379" - ports: - - name: redis - containerPort: 6379 - livenessProbe: - initialDelaySeconds: 5 - periodSeconds: 5 - # One second longer than command timeout should prevent generation of zombie processes. - timeoutSeconds: 6 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_liveness_local.sh 5 - readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 5 - timeoutSeconds: 2 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_readiness_local.sh 1 - resources: - null - volumeMounts: - - name: start-scripts - mountPath: /opt/bitnami/scripts/start-scripts - - name: health - mountPath: /health - - name: redis-data - mountPath: /data - subPath: - - name: config - mountPath: /opt/bitnami/redis/mounted-etc - - name: redis-tmp-conf - mountPath: /opt/bitnami/redis/etc/ - volumes: - - name: start-scripts - configMap: - name: redis-scripts - defaultMode: 0755 - - name: health - configMap: - name: redis-health - defaultMode: 0755 - - name: config - configMap: - name: redis - - name: redis-tmp-conf - emptyDir: {} - volumeClaimTemplates: - - metadata: - name: redis-data - labels: - app: redis - release: redis - heritage: Helm - component: master - spec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: "8Gi" - - selector: - updateStrategy: - type: RollingUpdate ---- -# Source: redis/templates/redis-slave-statefulset.yaml -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: redis-slave - labels: - app: redis - chart: redis-11.3.4 - release: redis - heritage: Helm -spec: - replicas: 2 - serviceName: redis-headless - selector: - matchLabels: - app: redis - release: redis - role: slave - template: - metadata: - labels: - app: redis - release: redis - chart: redis-11.3.4 - role: slave - annotations: - checksum/health: 58a2c99b230d98ed70d50958f63d162afe3000bbb8d7293aa7bf87efeab3627c - checksum/configmap: 7795d086a1ff86d46b63a301b19775464f5e9ced47d38ab4db4bb4267168e4db - checksum/secret: 9592b081a54c3854a6f2e3774269701d1d1bbb67ae73291b0c747973d1ddc562 - spec: - - securityContext: - fsGroup: 1001 - serviceAccountName: default - containers: - - name: redis - image: docker.io/bitnami/redis:6.0.9-debian-10-r0 - imagePullPolicy: "IfNotPresent" - securityContext: - runAsUser: 1001 - command: - - /bin/bash - - -c - - /opt/bitnami/scripts/start-scripts/start-slave.sh - env: - - name: REDIS_REPLICATION_MODE - value: slave - - name: REDIS_MASTER_HOST - value: redis-master-0.redis-headless.technicaltest.svc.cluster.local - - name: REDIS_MASTER_PORT_NUMBER - value: "6379" - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis - key: redis-password - - name: REDIS_MASTER_PASSWORD - valueFrom: - secretKeyRef: - name: redis - key: redis-password - - name: REDIS_TLS_ENABLED - value: "no" - - name: REDIS_PORT - value: "6379" - ports: - - name: redis - containerPort: 6379 - livenessProbe: - initialDelaySeconds: 30 - periodSeconds: 10 - timeoutSeconds: 6 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_liveness_local_and_master.sh 5 - readinessProbe: - initialDelaySeconds: 5 - periodSeconds: 10 - timeoutSeconds: 11 - successThreshold: 1 - failureThreshold: 5 - exec: - command: - - sh - - -c - - /health/ping_readiness_local_and_master.sh 10 - resources: - null - volumeMounts: - - name: start-scripts - mountPath: /opt/bitnami/scripts/start-scripts - - name: health - mountPath: /health - - name: redis-data - mountPath: /data - - name: config - mountPath: /opt/bitnami/redis/mounted-etc - - name: redis-tmp-conf - mountPath: /opt/bitnami/redis/etc - volumes: - - name: start-scripts - configMap: - name: redis-scripts - defaultMode: 0755 - - name: health - configMap: - name: redis-health - defaultMode: 0755 - - name: config - configMap: - name: redis - - name: redis-tmp-conf - emptyDir: {} - volumeClaimTemplates: - - metadata: - name: redis-data - labels: - app: redis - release: redis - heritage: Helm - component: slave - spec: - accessModes: - - "ReadWriteOnce" - resources: - requests: - storage: "8Gi" - - selector: - updateStrategy: - type: RollingUpdate diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml new file mode 100644 index 00000000..80264831 --- /dev/null +++ b/manifests/base/redis/kustomization.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +secretGenerator: + - name: redis-secrets + envs: + - redis-secrets.env + +commonLabels: + app.kubernetes.io/instance: redis + app.kubernetes.io/name: redis +images: + - name: redis + newName: redis + newTag: 6.0.20 +resources: + - redis.yaml diff --git a/manifests/base/redis.env b/manifests/base/redis/redis-secrets.env similarity index 100% rename from manifests/base/redis.env rename to manifests/base/redis/redis-secrets.env diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml new file mode 100644 index 00000000..1cd478d4 --- /dev/null +++ b/manifests/base/redis/redis.yaml @@ -0,0 +1,58 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: redis +spec: + serviceName: redis + replicas: 1 + selector: + matchLabels: {} + template: + metadata: {} + spec: + containers: + - name: redis + image: "redis:6.0.20" + ports: + - containerPort: 6379 + env: + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + key: redis-password + name: redis-secrets + volumeMounts: + - name: redis-data + mountPath: /data + volumeClaimTemplates: + - metadata: + name: redis-data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi +--- +apiVersion: v1 +kind: Service +metadata: + name: redis +spec: + selector: {} + ports: + - protocol: TCP + port: 6379 + targetPort: 6379 +--- +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: redis-pvc +spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: 8Gi \ No newline at end of file diff --git a/manifests/base/deployment.yaml b/manifests/base/runner-manager/deployment.yaml similarity index 77% rename from manifests/base/deployment.yaml rename to manifests/base/runner-manager/deployment.yaml index e30f6644..183d5961 100644 --- a/manifests/base/deployment.yaml +++ b/manifests/base/runner-manager/deployment.yaml @@ -2,17 +2,11 @@ apiVersion: apps/v1 kind: Deployment metadata: name: runner-manager - labels: - app.kubernetes.io/name: runner-manager - app.kubernetes.io/instance: runner-manager + labels: {} spec: - selector: - app.kubernetes.io/name: runner-manager - app.kubernetes.io/instance: runner-manager + selector: {} template: - metadata: - app.kubernetes.io/name: runner-manager - app.kubernetes.io/instance: runner-manager + metadata: {} spec: serviceAccountName: default containers: @@ -36,7 +30,7 @@ spec: name: runner-manager-config - secretRef: name: runner-manager-auth - image: 'ghcr.io/scality/runner-manager:0.1.0' + image: 'ghcr.io/scality/runner-manager:0.6.3' imagePullPolicy: IfNotPresent name: runner-manager ports: diff --git a/manifests/base/kustomization.yaml b/manifests/base/runner-manager/kustomization.yaml similarity index 63% rename from manifests/base/kustomization.yaml rename to manifests/base/runner-manager/kustomization.yaml index 80dd9faa..37a0ac32 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/runner-manager/kustomization.yaml @@ -11,19 +11,19 @@ configMapGenerator: - runner-manager-config.env secretGenerator: - - name: runner-manager-auth + - name: runner-manager-secrets envs: - - runner-manager-auth.env - - name: redis - envs: - - redis.env + - runner-manager-secrets.env + +commonLabels: + app.kubernetes.io/name: runner-manager + app.kubernetes.io/instance: runner-manager images: - name: runner-manager newName: ghcr.io/scality/runner-manager - newTag: '0.1.0' + newTag: '0.6.3' resources: - service.yaml - - deployment.yaml - - redis.yaml \ No newline at end of file + - deployment.yaml \ No newline at end of file diff --git a/manifests/base/runner-manager-config.env b/manifests/base/runner-manager/runner-manager-config.env similarity index 100% rename from manifests/base/runner-manager-config.env rename to manifests/base/runner-manager/runner-manager-config.env diff --git a/manifests/base/runner-manager-auth.env b/manifests/base/runner-manager/runner-manager-secrets.env similarity index 100% rename from manifests/base/runner-manager-auth.env rename to manifests/base/runner-manager/runner-manager-secrets.env diff --git a/manifests/base/service.yaml b/manifests/base/runner-manager/service.yaml similarity index 100% rename from manifests/base/service.yaml rename to manifests/base/runner-manager/service.yaml diff --git a/manifests/base/settings.yaml b/manifests/base/runner-manager/settings.yaml similarity index 100% rename from manifests/base/settings.yaml rename to manifests/base/runner-manager/settings.yaml diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml new file mode 100644 index 00000000..06c8d7af --- /dev/null +++ b/manifests/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - base/runner-manager + - base/redis From 0ef9f610e5ce1f58c36620dddc1700832051c7ad Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara <72503671+Abubakarr99@users.noreply.github.com> Date: Tue, 11 Jul 2023 15:14:54 +0200 Subject: [PATCH 04/11] PTFE-544: removed labels from recources --- manifests/base/redis/redis.yaml | 3 ++- manifests/base/runner-manager/deployment.yaml | 2 +- manifests/base/runner-manager/kustomization.yaml | 3 ++- manifests/base/runner-manager/service.yaml | 8 ++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml index 1cd478d4..39f272f2 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/redis.yaml @@ -55,4 +55,5 @@ spec: - ReadWriteOnce resources: requests: - storage: 8Gi \ No newline at end of file + storage: 8Gi + \ No newline at end of file diff --git a/manifests/base/runner-manager/deployment.yaml b/manifests/base/runner-manager/deployment.yaml index 183d5961..906ee6f6 100644 --- a/manifests/base/runner-manager/deployment.yaml +++ b/manifests/base/runner-manager/deployment.yaml @@ -29,7 +29,7 @@ spec: - configMapRef: name: runner-manager-config - secretRef: - name: runner-manager-auth + name: runner-manager-secrets image: 'ghcr.io/scality/runner-manager:0.6.3' imagePullPolicy: IfNotPresent name: runner-manager diff --git a/manifests/base/runner-manager/kustomization.yaml b/manifests/base/runner-manager/kustomization.yaml index 37a0ac32..dbe8f3b1 100644 --- a/manifests/base/runner-manager/kustomization.yaml +++ b/manifests/base/runner-manager/kustomization.yaml @@ -26,4 +26,5 @@ images: resources: - service.yaml - - deployment.yaml \ No newline at end of file + - deployment.yaml + \ No newline at end of file diff --git a/manifests/base/runner-manager/service.yaml b/manifests/base/runner-manager/service.yaml index 7e3e05fc..ebdc5d3d 100644 --- a/manifests/base/runner-manager/service.yaml +++ b/manifests/base/runner-manager/service.yaml @@ -2,9 +2,7 @@ apiVersion: v1 kind: Service metadata: name: runner-manager - labels: - app.kubernetes.io/name: runner-manager - app.kubernetes.io/instance: runner-manager + labels: {} spec: type: ClusterIP ports: @@ -12,6 +10,4 @@ spec: targetPort: http protocol: TCP name: runner-manager - selector: - app.kubernetes.io/name: runner-manager - app.kubernetes.io/instance: runner-manager + selector: {} From 427fcad003b01575e6b62d31049b99dbc24e3a0b Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Wed, 12 Jul 2023 14:39:52 +0200 Subject: [PATCH 05/11] PTFE-544: kustomize redis database --- manifests/base/redis/kustomization.yaml | 2 ++ manifests/base/redis/redis-secrets.env | 2 +- manifests/base/redis/redis.yaml | 13 +------------ manifests/base/runner-manager/deployment.yaml | 13 +++++++------ manifests/base/runner-manager/kustomization.yaml | 3 ++- manifests/base/runner-manager/settings.yaml | 2 +- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml index 80264831..0935773e 100644 --- a/manifests/base/redis/kustomization.yaml +++ b/manifests/base/redis/kustomization.yaml @@ -10,6 +10,8 @@ secretGenerator: commonLabels: app.kubernetes.io/instance: redis app.kubernetes.io/name: redis + app.kubernetes.io/component: database + app.kubernetes.io/part-of: runner-manager images: - name: redis newName: redis diff --git a/manifests/base/redis/redis-secrets.env b/manifests/base/redis/redis-secrets.env index 5b127d7d..e830170d 100644 --- a/manifests/base/redis/redis-secrets.env +++ b/manifests/base/redis/redis-secrets.env @@ -1,2 +1,2 @@ # change the password -redis-password='redis_password' +REDIS_PASSWORD='redis_password' diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml index 1cd478d4..2fcdfb00 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/redis.yaml @@ -20,7 +20,7 @@ spec: - name: REDIS_PASSWORD valueFrom: secretKeyRef: - key: redis-password + key: REDIS_PASSWORD name: redis-secrets volumeMounts: - name: redis-data @@ -45,14 +45,3 @@ spec: - protocol: TCP port: 6379 targetPort: 6379 ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: redis-pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 8Gi \ No newline at end of file diff --git a/manifests/base/runner-manager/deployment.yaml b/manifests/base/runner-manager/deployment.yaml index 183d5961..ff43cbaf 100644 --- a/manifests/base/runner-manager/deployment.yaml +++ b/manifests/base/runner-manager/deployment.yaml @@ -13,6 +13,7 @@ spec: - args: - 'srcs.web.app:app' - '--host' + - 0.0.0.0 - '--port' - '80' command: @@ -21,15 +22,15 @@ spec: - name: REDIS_PASSWORD valueFrom: secretKeyRef: - key: redis-password - name: redis + key: REDIS_PASSWORD + name: redis-secrets - name: SETTING_FILE - value: /app/config/settings.yml + value: /app/config/settings.yaml envFrom: - configMapRef: name: runner-manager-config - secretRef: - name: runner-manager-auth + name: runner-manager-secrets image: 'ghcr.io/scality/runner-manager:0.6.3' imagePullPolicy: IfNotPresent name: runner-manager @@ -48,6 +49,6 @@ spec: - mountPath: /app/config name: config volumes: - - configMap: + - name: config + configMap: name: runner-manager-settings - name: config diff --git a/manifests/base/runner-manager/kustomization.yaml b/manifests/base/runner-manager/kustomization.yaml index 37a0ac32..515bb25c 100644 --- a/manifests/base/runner-manager/kustomization.yaml +++ b/manifests/base/runner-manager/kustomization.yaml @@ -18,6 +18,7 @@ secretGenerator: commonLabels: app.kubernetes.io/name: runner-manager app.kubernetes.io/instance: runner-manager + app.kubernetes.io/version: "0.6.3" images: - name: runner-manager @@ -26,4 +27,4 @@ images: resources: - service.yaml - - deployment.yaml \ No newline at end of file + - deployment.yaml diff --git a/manifests/base/runner-manager/settings.yaml b/manifests/base/runner-manager/settings.yaml index 66e532ed..62c0d37e 100644 --- a/manifests/base/runner-manager/settings.yaml +++ b/manifests/base/runner-manager/settings.yaml @@ -6,7 +6,7 @@ allowed_ssh_keys: "" cloud_name: gcloud # Cloud config, it will change depending on your cloud cloud_config: {} -python_config: "" +python_config: srcs.settings.settings_local runner_pool: [] extra_runner_timer: From 9775ae8c355caa473a27ef733e0a410a1690e986 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Wed, 12 Jul 2023 17:27:21 +0200 Subject: [PATCH 06/11] PTFE-544: corrected redis deployment --- manifests/base/redis/kustomization.yaml | 4 ++-- manifests/base/redis/redis.yaml | 5 +++-- manifests/base/runner-manager/settings.yaml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml index 0935773e..7abad1d3 100644 --- a/manifests/base/redis/kustomization.yaml +++ b/manifests/base/redis/kustomization.yaml @@ -14,7 +14,7 @@ commonLabels: app.kubernetes.io/part-of: runner-manager images: - name: redis - newName: redis - newTag: 6.0.20 + newName: bitnami/redis + newTag: 7.0.12-debian-11-r1 resources: - redis.yaml diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml index 13d2f623..74528289 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/redis.yaml @@ -11,6 +11,8 @@ spec: template: metadata: {} spec: + securityContext: + fsGroup: 1001 containers: - name: redis image: "redis:6.0.20" @@ -24,7 +26,7 @@ spec: name: redis-secrets volumeMounts: - name: redis-data - mountPath: /data + mountPath: /bitnami/redis/data volumeClaimTemplates: - metadata: name: redis-data @@ -45,4 +47,3 @@ spec: - protocol: TCP port: 6379 targetPort: 6379 - diff --git a/manifests/base/runner-manager/settings.yaml b/manifests/base/runner-manager/settings.yaml index 62c0d37e..c7ac533b 100644 --- a/manifests/base/runner-manager/settings.yaml +++ b/manifests/base/runner-manager/settings.yaml @@ -16,5 +16,5 @@ timeout_runner_timer: hours: 0 minutes: 15 redis: - host: redis-master + host: redis port: 6379 From 89a811b09ac5ca29bc962a7bb43886eaf41d6ee6 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Wed, 12 Jul 2023 17:28:58 +0200 Subject: [PATCH 07/11] PTFE-544: changed redis image --- manifests/base/redis/redis.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml index 74528289..158ba5b7 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/redis.yaml @@ -15,7 +15,7 @@ spec: fsGroup: 1001 containers: - name: redis - image: "redis:6.0.20" + image: "bitnami/redis:7.0.12-debian-11-r1" ports: - containerPort: 6379 env: From 4030278f62916495a49abdfb34b143d446387bb5 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Wed, 12 Jul 2023 17:49:31 +0200 Subject: [PATCH 08/11] PTFE-544: removed empty metadata tags --- manifests/base/redis/redis.yaml | 4 ---- manifests/base/runner-manager/deployment.yaml | 3 --- 2 files changed, 7 deletions(-) diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/redis.yaml index 158ba5b7..8673734c 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/redis.yaml @@ -6,10 +6,7 @@ metadata: spec: serviceName: redis replicas: 1 - selector: - matchLabels: {} template: - metadata: {} spec: securityContext: fsGroup: 1001 @@ -42,7 +39,6 @@ kind: Service metadata: name: redis spec: - selector: {} ports: - protocol: TCP port: 6379 diff --git a/manifests/base/runner-manager/deployment.yaml b/manifests/base/runner-manager/deployment.yaml index ff43cbaf..eb0fe256 100644 --- a/manifests/base/runner-manager/deployment.yaml +++ b/manifests/base/runner-manager/deployment.yaml @@ -2,11 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: runner-manager - labels: {} spec: - selector: {} template: - metadata: {} spec: serviceAccountName: default containers: From 8b0610d39402ee01b945ecc54bbae5e7066ffff2 Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Thu, 13 Jul 2023 14:39:51 +0200 Subject: [PATCH 09/11] PTFE-544: reorganise kustomize files --- manifests/base/kustomization.yaml | 7 +++++++ manifests/base/redis/kustomization.yaml | 3 ++- manifests/base/redis/service.yaml | 10 ++++++++++ manifests/base/redis/{redis.yaml => statefulset.yaml} | 10 ---------- manifests/kustomization.yaml | 3 +-- 5 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 manifests/base/kustomization.yaml create mode 100644 manifests/base/redis/service.yaml rename manifests/base/redis/{redis.yaml => statefulset.yaml} (84%) diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml new file mode 100644 index 00000000..31c26ee1 --- /dev/null +++ b/manifests/base/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - runner-manager + - redis \ No newline at end of file diff --git a/manifests/base/redis/kustomization.yaml b/manifests/base/redis/kustomization.yaml index 7abad1d3..6d90ee2a 100644 --- a/manifests/base/redis/kustomization.yaml +++ b/manifests/base/redis/kustomization.yaml @@ -17,4 +17,5 @@ images: newName: bitnami/redis newTag: 7.0.12-debian-11-r1 resources: - - redis.yaml + - statefulset.yaml + - service.yaml diff --git a/manifests/base/redis/service.yaml b/manifests/base/redis/service.yaml new file mode 100644 index 00000000..35bd404e --- /dev/null +++ b/manifests/base/redis/service.yaml @@ -0,0 +1,10 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: redis +spec: + ports: + - protocol: TCP + port: 6379 + targetPort: 6379 diff --git a/manifests/base/redis/redis.yaml b/manifests/base/redis/statefulset.yaml similarity index 84% rename from manifests/base/redis/redis.yaml rename to manifests/base/redis/statefulset.yaml index 8673734c..606340e7 100644 --- a/manifests/base/redis/redis.yaml +++ b/manifests/base/redis/statefulset.yaml @@ -33,13 +33,3 @@ spec: resources: requests: storage: 8Gi ---- -apiVersion: v1 -kind: Service -metadata: - name: redis -spec: - ports: - - protocol: TCP - port: 6379 - targetPort: 6379 diff --git a/manifests/kustomization.yaml b/manifests/kustomization.yaml index 06c8d7af..5d2d02d3 100644 --- a/manifests/kustomization.yaml +++ b/manifests/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - base/runner-manager - - base/redis + - base From 9e2c18620df5e7d5b48c46a678644d016074a43d Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara Date: Thu, 13 Jul 2023 14:42:31 +0200 Subject: [PATCH 10/11] added new line --- manifests/base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 31c26ee1..a2c28b13 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -4,4 +4,4 @@ kind: Kustomization resources: - runner-manager - - redis \ No newline at end of file + - redis From 92155ec8db79c6741743e38e0a9491f747fc5cda Mon Sep 17 00:00:00 2001 From: Abubakarr Kamara <72503671+Abubakarr99@users.noreply.github.com> Date: Thu, 13 Jul 2023 14:43:53 +0200 Subject: [PATCH 11/11] Update manifests/base/kustomization.yaml --- manifests/base/kustomization.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 31c26ee1..2e45520f 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -4,4 +4,5 @@ kind: Kustomization resources: - runner-manager - - redis \ No newline at end of file + - redis + \ No newline at end of file