diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index b527ab54..99b05784 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml index e09b238b..e11457a1 100644 --- a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 5becbb74..66598d86 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index 711a1324..429537e4 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/content/values.alpha.yaml b/freeleaps/helm-pkg/content/values.alpha.yaml index 1b6f113c..e32e206a 100644 --- a/freeleaps/helm-pkg/content/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/devops/values.alpha.yaml b/freeleaps/helm-pkg/devops/values.alpha.yaml index 7fd07fc4..01077a9d 100644 --- a/freeleaps/helm-pkg/devops/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/devsvc/values.alpha.yaml b/freeleaps/helm-pkg/devsvc/values.alpha.yaml index 83d24057..86fe6234 100644 --- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml +++ b/freeleaps/helm-pkg/devsvc/values.alpha.yaml @@ -94,12 +94,12 @@ devsvc: vpa: minAllowed: enabled: false - cpu: "50m" - memory: "64Mi" + cpu: 50m + memory: 64Mi maxAllowed: enabled: true - cpu: "200m" - memory: "128Mi" + cpu: 200m + memory: 128Mi controlledResources: - - cpu - - memory \ No newline at end of file + - cpu + - memory diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml index 2c6c0ef5..0a7ca014 100644 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml +++ b/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 }} \ No newline at end of file + 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 }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index 25f48ef9..375e3f36 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml index b0090d8e..bb1521b4 100644 --- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml index bc1ab62e..18b14e9a 100644 --- a/freeleaps/helm-pkg/freeleaps/values.yaml +++ b/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 diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 34709947..3de32dee 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/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' diff --git a/freeleaps/helm-pkg/payment/values.alpha.yaml b/freeleaps/helm-pkg/payment/values.alpha.yaml index 3bbfbd7a..c7c21718 100644 --- a/freeleaps/helm-pkg/payment/values.alpha.yaml +++ b/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