diff --git a/README.md b/README.md index a08887f..0425db6 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,10 @@ # ipfs-cluster-chart Helm Chart for: https://cluster.ipfs.io/documentation/guides/k8s/ -NOTE: all the secrets are hardcoded and will be replaced \ No newline at end of file +NOTE: all the secrets are hardcoded and will be replaced + +## NOTE + +The chart is inspired from: +- https://github.com/ipfs/ipfs-cluster-website/blob/1258134676f5293422eb97b702ae56b207261e62/content/documentation/guides/k8s.md +- https://cluster.ipfs.io/documentation/guides/k8s/ \ No newline at end of file diff --git a/charts/ipfs-cluster/Chart.yaml b/charts/ipfs-cluster/Chart.yaml index 5ace123..06fba77 100644 --- a/charts/ipfs-cluster/Chart.yaml +++ b/charts/ipfs-cluster/Chart.yaml @@ -1,4 +1,4 @@ description: IPFS Cluster chart name: ipfs-cluster -version: v0.0.2 +version: v0.0.3 apiVersion: v2 diff --git a/charts/ipfs-cluster/templates/ingress.yaml b/charts/ipfs-cluster/templates/ingress.yaml index ababf68..a3990ad 100644 --- a/charts/ipfs-cluster/templates/ingress.yaml +++ b/charts/ipfs-cluster/templates/ingress.yaml @@ -3,6 +3,7 @@ kind: Ingress metadata: name: {{ .Release.Name }} annotations: + external-dns.alpha.kubernetes.io/cloudflare-proxied: "true" kubernetes.io/ingress.class: "nginx" nginx.ingress.kubernetes.io/limit-rps: "10" cert-manager.io/cluster-issuer: letsencrypt @@ -22,11 +23,4 @@ spec: service: name: {{ include "ipfs-cluster.serviceNameHttp" . }} port: - name: api - - path: /gateway/(.+) - pathType: Prefix - backend: - service: - name: {{ include "ipfs-cluster.serviceNameHttp" . }} - port: - name: gateway \ No newline at end of file + name: gateway \ No newline at end of file diff --git a/charts/ipfs-cluster/templates/service.yaml b/charts/ipfs-cluster/templates/service.yaml index ae8dd32..51aee7f 100644 --- a/charts/ipfs-cluster/templates/service.yaml +++ b/charts/ipfs-cluster/templates/service.yaml @@ -9,7 +9,6 @@ metadata: node: {{ .Release.Name }} spec: type: LoadBalancer - externalTrafficPolicy: Local ports: - name: swarm targetPort: swarm diff --git a/charts/ipfs-cluster/templates/statefulset.yaml b/charts/ipfs-cluster/templates/statefulset.yaml index a33e061..3e7f8c4 100644 --- a/charts/ipfs-cluster/templates/statefulset.yaml +++ b/charts/ipfs-cluster/templates/statefulset.yaml @@ -98,7 +98,9 @@ spec: - name: CLUSTER_RESTAPI_PRIVATEKEY value: "CAESQEmvGJbMboEibpcWCTKOtDYU2eEyyHLN9gDdJli6Z2tksAkhFWNx0Fk3vOlwLIitE2rfGtIj61Ovla/mHC42Plg=" - name: CLUSTER_RESTAPI_BASICAUTHCREDENTIALS - value: "w3f:password" + value: "w3f:password" + - name: CLUSTER_CRDT_TRUSTEDPEERS + value: "QmfBjL2kDjr34JbTLquxJE7d8gNbMuRmLbDuyHPQcebSgV,12D3KooWMQy63QTigMxb4sX3jva4P52PbdnAaatVjZZta63TDnL3" - name: SVC_NAME value: {{ include "ipfs-cluster.serviceName" . }} ports: @@ -128,7 +130,7 @@ spec: - name: configure-script configMap: name: {{ include "ipfs-cluster.configmapBootstrapName" . }} - {{ if ne .Values.persistance.enabled true }} + {{ if ne .Values.persistence.enabled true }} - name: cluster-storage emptyDir: {} - name: ipfs-storage @@ -138,17 +140,15 @@ spec: - metadata: name: cluster-storage spec: - storageClassName: standard accessModes: ["ReadWriteOnce"] resources: requests: - storage: {{ .Values.persistance.clusterStorage }} + storage: {{ .Values.persistence.clusterStorage }} - metadata: name: ipfs-storage spec: - storageClassName: standard accessModes: ["ReadWriteOnce"] resources: requests: - storage: {{ .Values.persistance.ipfsStorage }} + storage: {{ .Values.persistence.ipfsStorage }} {{ end }} \ No newline at end of file diff --git a/charts/ipfs-cluster/values.yaml b/charts/ipfs-cluster/values.yaml index 93520b2..0c19600 100644 --- a/charts/ipfs-cluster/values.yaml +++ b/charts/ipfs-cluster/values.yaml @@ -19,9 +19,9 @@ bootstrapPeerId: QmfBjL2kDjr34JbTLquxJE7d8gNbMuRmLbDuyHPQcebSgV replicaCount: 1 domain: ipfs.w3f.community -httpDomain: ipfs-http.w3f.community +httpDomain: ipfs-gateway.w3f.community -persistance: +persistence: enabled: true clusterStorage: 5Gi ipfsStorage: 200Gi \ No newline at end of file diff --git a/helmfile.d/10-ipfs-cluster.yaml b/helmfile.d/10-ipfs-cluster.yaml index 24234d5..b584382 100644 --- a/helmfile.d/10-ipfs-cluster.yaml +++ b/helmfile.d/10-ipfs-cluster.yaml @@ -13,7 +13,7 @@ releases: {{ if eq .Environment.Name "production" }} chart: w3f/ipfs-cluster namespace: ipfs - version: v0.0.2 + version: v0.0.3 {{ else }} chart: ../charts/ipfs-cluster {{ end }} diff --git a/helmfile.d/config/ipfs-cluster-values.yaml.gotmpl b/helmfile.d/config/ipfs-cluster-values.yaml.gotmpl index 4930e88..9766256 100644 --- a/helmfile.d/config/ipfs-cluster-values.yaml.gotmpl +++ b/helmfile.d/config/ipfs-cluster-values.yaml.gotmpl @@ -5,7 +5,7 @@ image: tag: {{ env "CIRCLE_SHA1" | default "kind" }} {{ end }} -persistance: - enabled: false +persistence: + enabled: true replicaCount: 2 \ No newline at end of file