Merge branch 'refactor/rm-update' into 'master'

refactor/rm-update See merge request devops/k8s-deployments!88
4 years ago · b487aedd0d
7 changed files with 17 additions and 15 deletions
--- a/01_onsite/01_dev/bioplus/deployment.yaml
+++ b/01_onsite/01_dev/bioplus/deployment.yaml
@ -62,9 +62,11 @@ data:
  DJANGO_DB_PASSWORD: "bioplus-wagtail"
  DJANGO_DB_HOST: "postgres-lb"
  DJANGO_DB_PORT: "5432"
-  SECRET_KEY: "5vp8SGRsqe6PybgDdVbBAfMJGmI1yyQK"
-  STAGING_URL: "http://localhost:8000/wagtail-transfer/"
-  PRODUCTION_URL: "http://bioplus-dev.k3s.semapp.lan/wagtail-transfer/"
+  DEFAULT_FILE_STORAGE: "storages.backends.s3boto3.S3Boto3Storage"
+  AWS_STORAGE_BUCKET_NAME: "bioplus"
+  AWS_ACCESS_KEY_ID: "bioplus"
+  AWS_SECRET_ACCESS_KEY: "Semapp123456!"
+  AWS_S3_ENDPOINT_URL: "http://minio-api-dev.semapp.lan"


 ---
--- a/01_onsite/01_dev/rm/deployment.yaml
+++ b/01_onsite/01_dev/rm/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "512Mi"
@ -42,7 +42,7 @@ spec:
            name: flexrm-conf
          imagePullPolicy: Always
        - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "512Mi"
--- a/01_onsite/02_qa/rm-test/deployment.yaml
+++ b/01_onsite/02_qa/rm-test/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-test-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "512Mi"
@ -45,7 +45,7 @@ spec:
              value: "development"
          imagePullPolicy: Always
        - name: rm-test-frnt
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "512Mi"
--- a/01_onsite/02_qa/rm/deployment.yaml
+++ b/01_onsite/02_qa/rm/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "512Mi"
@ -45,7 +45,7 @@ spec:
              value: "development"
          imagePullPolicy: Always
        - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "512Mi"
--- a/02_hetzner/01_prod/rm-croatia/deployment.yaml
+++ b/02_hetzner/01_prod/rm-croatia/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "256Mi"
@ -45,7 +45,7 @@ spec:
              value: "development"
          imagePullPolicy: Always
        - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "256Mi"
--- a/02_hetzner/01_prod/rm-fulda/deployment.yaml
+++ b/02_hetzner/01_prod/rm-fulda/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "256Mi"
@ -45,7 +45,7 @@ spec:
              value: "development"
          imagePullPolicy: Always
        - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "256Mi"
--- a/02_hetzner/01_prod/rm/deployment.yaml
+++ b/02_hetzner/01_prod/rm/deployment.yaml
@ -24,7 +24,7 @@ spec:
      #   fsGroup: 1000
      containers:
        - name: rm-backend
-          image: packages.semapp.lan:5000/rm-backend:2.5.6
+          image: packages.semapp.lan:5000/rm-backend:2.5.7
          resources:
            requests:
              memory: "512Mi"
@ -45,7 +45,7 @@ spec:
              value: "development"
          imagePullPolicy: Always
        - name: rm-frontend
-          image: packages.semapp.lan:5000/rm-frontend:2.5.6
+          image: packages.semapp.lan:5000/rm-frontend:2.5.7
          resources:
            requests:
              memory: "512Mi"