merge: resolve conflict in values.alpha.yaml

- Choose newer image tag: snapshot-eec7ac2
- Resolve merge conflict between branches

freeleaps/helm-pkg/authentication/values.alpha.yaml

@@ -15,7 +15,7 @@ authentication:
     registry: docker.io
     repository: null
     name: authentication
-    tag: snapshot-b9f275c
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http

freeleaps/helm-pkg/centralStorage/values.alpha.yaml

@@ -15,7 +15,7 @@ centralStorage:
     registry: docker.io
     repository: null
     name: central_storage
-    tag: snapshot-baf606d
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http

freeleaps/helm-pkg/chat/values.alpha.yaml

@@ -15,7 +15,7 @@ chat:
     registry: docker.io
     repository: null
     name: chat
-    tag: snapshot-97090e9
+    tag: snapshot-1f1ef3a
     imagePullPolicy: IfNotPresent
   ports:
   - name: http

freeleaps/helm-pkg/chat/values.prod.yaml

@@ -13,7 +13,7 @@ chat:
     registry: docker.io
     repository: null
     name: chat
-    tag: snapshot-e46efad
+    tag: snapshot-b25e221
     imagePullPolicy: Always
   ports:
   - name: http

freeleaps/helm-pkg/content/values.alpha.yaml

@@ -15,7 +15,7 @@ content:
     registry: docker.io
     repository: null
     name: content
-    tag: snapshot-b9f275c
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http

freeleaps/helm-pkg/devops/values.alpha.yaml

@@ -10,7 +10,7 @@ devops:
     registry: docker.io
     repository: null
     name: devops
-    tag: snapshot-b9f275c
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http

freeleaps/helm-pkg/devsvc/values.alpha.yaml

@@ -94,12 +94,12 @@ devsvc:
   vpa:
     minAllowed:
       enabled: false
-      cpu: "50m"
+      cpu: 50m
-      memory: "64Mi"
+      memory: 64Mi
     maxAllowed:
       enabled: true
-      cpu: "200m"
+      cpu: 200m
-      memory: "128Mi"
+      memory: 128Mi
     controlledResources:
-      - cpu
+    - cpu
-      - memory
+    - memory

freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml

@@ -36,4 +36,6 @@ data:
   REDIS_URL: {{ .Values.freeleaps.configs.redisUrl | b64enc | quote }}
   REDIS_IS_CLUSTER: {{ .Values.freeleaps.configs.redisIsCluster | b64enc | quote }}
   METRICS_ENABLED: {{ .Values.freeleaps.configs.metricsEnabled | default false | toString | b64enc }}
-  PROBES_ENABLED: {{ .Values.freeleaps.configs.probesEnabled | default false | toString | b64enc }}
+  PROBES_ENABLED: {{ .Values.freeleaps.configs.probesEnabled | default false | toString | b64enc }}
+  GITEA_API_KEY: {{ .Values.freeleaps.configs.giteaApiKey | b64enc | quote }}
+  GITEA_ENDPOINT: {{ .Values.freeleaps.configs.giteaEndpoint | b64enc | quote }}

freeleaps/helm-pkg/freeleaps/values.alpha.yaml

@@ -15,7 +15,7 @@ freeleaps:
     registry: docker.io
     repository: null
     name: backend
-    tag: snapshot-97090e9
+    tag: snapshot-1f1ef3a
     imagePullPolicy: IfNotPresent
   ports:
   - name: http
@@ -72,7 +72,7 @@ freeleaps:
     rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster
     rabbitmqPort: 5672
     rabbitmqUsername: user
-    rabbitmqPassword: toKhVTIgRqHe3PLy
+    rabbitmqPassword: 4O80YlxnlhHrjzaM
     freeleapsDevsvcEndpoint: http://devsvc-service.freeleaps-alpha.svc.freeleaps.cluster:8007/api/devsvc/
     freeleapsContentEndpoint: http://content-service.freeleaps-alpha.svc.freeleaps.cluster:8013/api/content/
     freeleapsCentralStorageEndpoint: http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage/
@@ -87,6 +87,8 @@ freeleaps:
     redisIsCluster: 'false'
     metricsEnabled: 'false'
     probesEnabled: 'true'
+    giteaApiKey: 737645b8a52b24bf6fc5081c461255fd4c28ab0a
+    giteaEndpoint: https://alpha.gitea.freeleaps.mathmast.com/
   vpa:
     minAllowed:
       enabled: false

freeleaps/helm-pkg/freeleaps/values.prod.yaml

@@ -73,6 +73,8 @@ freeleaps:
     redisIsCluster: 'true'
     metricsEnabled: 'true'
     probesEnabled: 'true'
+    giteaApiKey: a61216761e1cda4797c1bc13c4cc26472e9e1eb3
+    giteaEndpoint: https://gitea.freeleaps.mathmast.com/
   vpa:
     minAllowed:
       enabled: true

freeleaps/helm-pkg/freeleaps/values.yaml

@@ -112,6 +112,11 @@ freeleaps:
     metricsEnabled: "false"
     # PROBES_ENABLED
     probesEnabled: "false"
+    # GITEA_API_KEY
+    giteaApiKey: ""
+    # GITEA_ENDPOINT
+    giteaEndpoint: ""
+
   vpa:
     minAllowed:
       enabled: true

freeleaps/helm-pkg/notification/values.alpha.yaml

@@ -15,7 +15,7 @@ notification:
     registry: docker.io
     repository: null
     name: notification
-    tag: snapshot-b9f275c
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http
@@ -83,13 +83,13 @@ notification:
     rabbitmqHost: freeleaps-alpha-rabbitmq.freeleaps-alpha.svc.freeleaps.cluster
     rabbitmqPort: 5672
     rabbitmqUsername: user
-    rabbitmqPassword: toKhVTIgRqHe3PLy
+    rabbitmqPassword: 4O80YlxnlhHrjzaM
     rabbitmqVritualHost: /
     systemUserId: 117f191e810c19729de860aa
     smsFrom: '+16898887156'
     emailFrom: freeleaps@freeleaps.com
     secretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b
-    sendgridApiKey: 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
+    sendgridApiKey: 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
     twilioAccountSid: ACf8c9283a6acda060258eadb29be58bc8
     twilioAuthToken: ef160748cc22c8b7195b49df4b8eca7e
     metricsEnabled: 'false'

freeleaps/helm-pkg/payment/values.alpha.yaml

@@ -15,7 +15,7 @@ payment:
     registry: docker.io
     repository: null
     name: payment
-    tag: snapshot-b9f275c
+    tag: snapshot-eec7ac2
     imagePullPolicy: IfNotPresent
   ports:
   - name: http