diff --git a/incubator/synapse/0.0.5/CHANGELOG.md b/incubator/synapse/0.0.7/CHANGELOG.md
similarity index 85%
rename from incubator/synapse/0.0.5/CHANGELOG.md
rename to incubator/synapse/0.0.7/CHANGELOG.md
index 4168806d9eb..f83b1e92279 100644
--- a/incubator/synapse/0.0.5/CHANGELOG.md
+++ b/incubator/synapse/0.0.7/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
+
+### [synapse-0.0.7](https://github.com/truecharts/apps/compare/synapse-0.0.5...synapse-0.0.7) (2022-01-31)
+
+#### Fix
+
+* Try another way of defining the macaroon secret
+
+
+
### [synapse-0.0.5](https://github.com/truecharts/apps/compare/synapse-0.0.4...synapse-0.0.5) (2022-01-31)
diff --git a/incubator/synapse/0.0.5/CONFIG.md b/incubator/synapse/0.0.7/CONFIG.md
similarity index 100%
rename from incubator/synapse/0.0.5/CONFIG.md
rename to incubator/synapse/0.0.7/CONFIG.md
diff --git a/incubator/synapse/0.0.5/Chart.lock b/incubator/synapse/0.0.7/Chart.lock
similarity index 84%
rename from incubator/synapse/0.0.5/Chart.lock
rename to incubator/synapse/0.0.7/Chart.lock
index 7388d9744a6..7c4abcb4113 100644
--- a/incubator/synapse/0.0.5/Chart.lock
+++ b/incubator/synapse/0.0.7/Chart.lock
@@ -6,4 +6,4 @@ dependencies:
repository: https://truecharts.org/
version: 6.0.58
digest: sha256:a28ed48da9797a2e9d6e9a194aa6f65b07fc1cc0169d5ffdb0ba7c44c94806b1
-generated: "2022-01-31T10:56:45.06238308Z"
+generated: "2022-01-31T14:26:46.188518195Z"
diff --git a/incubator/synapse/0.0.5/Chart.yaml b/incubator/synapse/0.0.7/Chart.yaml
similarity index 98%
rename from incubator/synapse/0.0.5/Chart.yaml
rename to incubator/synapse/0.0.7/Chart.yaml
index b9b1a6d221b..2f9be271816 100644
--- a/incubator/synapse/0.0.5/Chart.yaml
+++ b/incubator/synapse/0.0.7/Chart.yaml
@@ -24,7 +24,7 @@ maintainers:
name: synapse
sources: []
type: application
-version: 0.0.5
+version: 0.0.7
annotations:
truecharts.org/catagories: |
- cloud
diff --git a/incubator/synapse/0.0.5/README.md b/incubator/synapse/0.0.7/README.md
similarity index 100%
rename from incubator/synapse/0.0.5/README.md
rename to incubator/synapse/0.0.7/README.md
diff --git a/incubator/synapse/0.0.5/app-readme.md b/incubator/synapse/0.0.7/app-readme.md
similarity index 100%
rename from incubator/synapse/0.0.5/app-readme.md
rename to incubator/synapse/0.0.7/app-readme.md
diff --git a/incubator/synapse/0.0.5/charts/common-8.14.2.tgz b/incubator/synapse/0.0.7/charts/common-8.14.2.tgz
similarity index 100%
rename from incubator/synapse/0.0.5/charts/common-8.14.2.tgz
rename to incubator/synapse/0.0.7/charts/common-8.14.2.tgz
diff --git a/incubator/synapse/0.0.5/charts/postgresql-6.0.58.tgz b/incubator/synapse/0.0.7/charts/postgresql-6.0.58.tgz
similarity index 100%
rename from incubator/synapse/0.0.5/charts/postgresql-6.0.58.tgz
rename to incubator/synapse/0.0.7/charts/postgresql-6.0.58.tgz
diff --git a/incubator/synapse/0.0.5/ci/base-values.yaml b/incubator/synapse/0.0.7/ci/base-values.yaml
similarity index 100%
rename from incubator/synapse/0.0.5/ci/base-values.yaml
rename to incubator/synapse/0.0.7/ci/base-values.yaml
diff --git a/incubator/synapse/0.0.5/ci/basic-values.yaml b/incubator/synapse/0.0.7/ci/basic-values.yaml
similarity index 100%
rename from incubator/synapse/0.0.5/ci/basic-values.yaml
rename to incubator/synapse/0.0.7/ci/basic-values.yaml
diff --git a/incubator/synapse/0.0.5/helm-values.md b/incubator/synapse/0.0.7/helm-values.md
similarity index 98%
rename from incubator/synapse/0.0.5/helm-values.md
rename to incubator/synapse/0.0.7/helm-values.md
index 1be9bc38ba3..b8790af6b39 100644
--- a/incubator/synapse/0.0.5/helm-values.md
+++ b/incubator/synapse/0.0.7/helm-values.md
@@ -102,6 +102,8 @@ You will, however, be able to use all values referenced in the common chart here
| probes.startup.path | string | `"/health"` | |
| secret | object | `{}` | |
| securityContext.allowPrivilegeEscalation | bool | `true` | |
+| service.federation.ports.federation.port | int | `8448` | |
+| service.federation.ports.federation.targetPort | int | `8008` | |
| service.main.ports.main.port | int | `8008` | |
| service.main.ports.main.targetPort | int | `8008` | |
| service.metrics.enabled | bool | `true` | |
diff --git a/incubator/synapse/0.0.5/ix_values.yaml b/incubator/synapse/0.0.7/ix_values.yaml
similarity index 99%
rename from incubator/synapse/0.0.5/ix_values.yaml
rename to incubator/synapse/0.0.7/ix_values.yaml
index 261c9b1daec..a7f2509af15 100644
--- a/incubator/synapse/0.0.5/ix_values.yaml
+++ b/incubator/synapse/0.0.7/ix_values.yaml
@@ -18,6 +18,11 @@ service:
main:
port: 8008
targetPort: 8008
+ federation:
+ ports:
+ federation:
+ port: 8448
+ targetPort: 8008
replication:
enabled: true
ports:
diff --git a/incubator/synapse/0.0.5/questions.yaml b/incubator/synapse/0.0.7/questions.yaml
similarity index 95%
rename from incubator/synapse/0.0.5/questions.yaml
rename to incubator/synapse/0.0.7/questions.yaml
index 761fcfc1a5a..84ce58bccc0 100644
--- a/incubator/synapse/0.0.5/questions.yaml
+++ b/incubator/synapse/0.0.7/questions.yaml
@@ -699,9 +699,9 @@ questions:
schema:
type: int
default: 8008
- - variable: replication
- label: "Replication Service"
- description: "The Replication Service"
+ - variable: federation
+ label: "federation Service"
+ description: "The federation service"
schema:
additional_attrs: true
type: dict
@@ -778,8 +778,8 @@ questions:
additional_attrs: true
type: dict
attrs:
- - variable: replication
- label: "Replication Service Port Configuration"
+ - variable: federation
+ label: "federation Service Port Configuration"
schema:
additional_attrs: true
type: dict
@@ -789,7 +789,7 @@ questions:
description: "This port exposes the container port on the service"
schema:
type: int
- default: 9092
+ default: 8448
required: true
- variable: advanced
label: "Show Advanced settings"
@@ -824,133 +824,7 @@ questions:
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
- default: 9092
- - variable: metrics
- label: "Metrics Service"
- description: "The Metrics Service"
- schema:
- additional_attrs: true
- type: dict
- attrs:
- - variable: enabled
- label: "Enable the service"
- schema:
- type: boolean
- default: true
- hidden: true
- - variable: type
- label: "Service Type"
- description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
- schema:
- type: string
- default: "Simple"
- enum:
- - value: "Simple"
- description: "Simple"
- - value: "ClusterIP"
- description: "ClusterIP"
- - value: "NodePort"
- description: "NodePort (Advanced)"
- - value: "LoadBalancer"
- description: "LoadBalancer (Advanced)"
- - variable: loadBalancerIP
- label: "LoadBalancer IP"
- description: "LoadBalancerIP"
- schema:
- show_if: [["type", "=", "LoadBalancer"]]
- type: string
- default: ""
- - variable: externalIPs
- label: "External IP's"
- description: "External IP's"
- schema:
- show_if: [["type", "=", "LoadBalancer"]]
- type: list
- default: []
- items:
- - variable: externalIP
- label: "External IP"
- schema:
- type: string
- - variable: ipFamilyPolicy
- label: "IP Family Policy"
- description: "(Advanced) Specify the ip policy"
- schema:
- show_if: [["type", "!=", "Simple"]]
- type: string
- default: "SingleStack"
- enum:
- - value: "SingleStack"
- description: "SingleStack"
- - value: "PreferDualStack"
- description: "PreferDualStack"
- - value: "RequireDualStack"
- description: "RequireDualStack"
- - variable: ipFamilies
- label: "(advanced) IP families"
- description: "(advanced) The ip families that should be used"
- schema:
- show_if: [["type", "!=", "Simple"]]
- type: list
- default: []
- items:
- - variable: ipFamily
- label: "IP family"
- schema:
- type: string
- - variable: ports
- label: "Service's Port(s) Configuration"
- schema:
- additional_attrs: true
- type: dict
- attrs:
- - variable: metrics
- label: "Replication Service Port Configuration"
- schema:
- additional_attrs: true
- type: dict
- attrs:
- - variable: port
- label: "Port"
- description: "This port exposes the container port on the service"
- schema:
- type: int
- default: 9093
- required: true
- - variable: advanced
- label: "Show Advanced settings"
- schema:
- type: boolean
- default: false
- show_subquestions_if: true
- subquestions:
- - variable: protocol
- label: "Port Type"
- schema:
- type: string
- default: "HTTP"
- enum:
- - value: HTTP
- description: "HTTP"
- - value: "HTTPS"
- description: "HTTPS"
- - value: TCP
- description: "TCP"
- - value: "UDP"
- description: "UDP"
- - variable: nodePort
- label: "Node Port (Optional)"
- description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
- schema:
- type: int
- min: 9000
- max: 65535
- - variable: targetPort
- label: "Target Port"
- description: "The internal(!) port on the container the Application runs on"
- schema:
- type: int
- default: 9093
+ default: 8008
- variable: serviceexpert
group: "Networking and Services"
diff --git a/incubator/synapse/0.0.5/security.md b/incubator/synapse/0.0.7/security.md
similarity index 100%
rename from incubator/synapse/0.0.5/security.md
rename to incubator/synapse/0.0.7/security.md
diff --git a/incubator/synapse/0.0.5/templates/_configmap.tpl b/incubator/synapse/0.0.7/templates/_configmap.tpl
similarity index 100%
rename from incubator/synapse/0.0.5/templates/_configmap.tpl
rename to incubator/synapse/0.0.7/templates/_configmap.tpl
diff --git a/incubator/synapse/0.0.5/templates/_helpers.tpl b/incubator/synapse/0.0.7/templates/_helpers.tpl
similarity index 100%
rename from incubator/synapse/0.0.5/templates/_helpers.tpl
rename to incubator/synapse/0.0.7/templates/_helpers.tpl
diff --git a/incubator/synapse/0.0.5/templates/_secret.tpl b/incubator/synapse/0.0.7/templates/_secret.tpl
similarity index 93%
rename from incubator/synapse/0.0.5/templates/_secret.tpl
rename to incubator/synapse/0.0.7/templates/_secret.tpl
index 5fb45b6f9e6..a1bb00a82b9 100644
--- a/incubator/synapse/0.0.5/templates/_secret.tpl
+++ b/incubator/synapse/0.0.7/templates/_secret.tpl
@@ -42,11 +42,10 @@ stringData:
{{- if $previous }}
{{- $msk = ( index $previous.data "macaroon_secret_key" ) }}
- macaroon_secret_key: {{ ( index $previous.data "macaroon_secret_key" ) }}
{{- else }}
{{- $msk = randAlphaNum 50 }}
- macaroon_secret_key: {{ $msk | quote }}
{{- end }}
+ macaroon_secret_key: {{ $msk }}
{{- if .Values.coturn.enabled -}}
turn_shared_secret: {{ include "matrix.coturn.sharedSecret" . }}
diff --git a/incubator/synapse/0.0.5/templates/common.yaml b/incubator/synapse/0.0.7/templates/common.yaml
similarity index 100%
rename from incubator/synapse/0.0.5/templates/common.yaml
rename to incubator/synapse/0.0.7/templates/common.yaml
diff --git a/incubator/synapse/0.0.5/values.yaml b/incubator/synapse/0.0.7/values.yaml
similarity index 100%
rename from incubator/synapse/0.0.5/values.yaml
rename to incubator/synapse/0.0.7/values.yaml