diff --git a/manifest/helm-charts/infra/minio/config.yaml b/manifest/helm-charts/infra/minio/config.yaml index 77f27c229..7d7797aaa 100644 --- a/manifest/helm-charts/infra/minio/config.yaml +++ b/manifest/helm-charts/infra/minio/config.yaml @@ -22,18 +22,46 @@ ingress: ingressClassName: "nginx" ## @param ingress.hostname Default host for the ingress resource ## - hostname: openim1.nsddd.top + hostname: openim2.nsddd.top ## @param ingress.path The Path to MinIO®. You may need to set this to '/*' in order to use this with ALB ingress controllers. ## - path: /minio-api(/|$)(.*) + path: / ## @param ingress.pathType Ingress path type ## pathType: ImplementationSpecific ## @param ingress.servicePort Service port to be used ## Default is http. Alternative is https. ## + servicePort: minio-console + + + +apiIngress: + ## @param apiIngress.enabled Enable ingress controller resource for MinIO API + ## + enabled: true + ## @param apiIngress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: "" + ## @param apiIngress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster. + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "nginx" + ## @param apiIngress.hostname Default host for the ingress resource + ## + hostname: openim2.nsddd.top + ## @param apiIngress.path The Path to MinIO®. You may need to set this to '/*' in order to use this with ALB ingress controllers. + ## + path: /im-minio-api(/|$)(.*) + ## @param apiIngress.pathType Ingress path type + ## + pathType: ImplementationSpecific + ## @param apiIngress.servicePort Service port to be used + ## Default is http. Alternative is https. + ## servicePort: minio-api - ## @param ingress.annotations Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. + ## @param apiIngress.annotations Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. ## For a full list of possible ingress annotations, please see ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md ## Use this parameter to set the required annotations for cert-manager, see @@ -47,34 +75,11 @@ ingress: annotations: nginx.ingress.kubernetes.io/use-regex: "true" nginx.ingress.kubernetes.io/rewrite-target: /$2 - ## @param ingress.tls Enable TLS configuration for the hostname defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` + ## @param apiIngress.tls Enable TLS configuration for the hostname defined at `apiIngress.hostname` parameter + ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.apiIngress.hostname }}` ## You can: ## - Use the `ingress.secrets` parameter to create this TLS secret ## - Rely on cert-manager to create it by setting the corresponding annotations ## - Rely on Helm to create self-signed certificates by setting `ingress.selfSigned=true` ## - tls: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## - selfSigned: false - ## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record. - ## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array - ## e.g: - ## extraHosts: - ## - name: minio.local - ## path: / - ## - extraHosts: [] - extraPaths: - - path: /minio-console(/|$)(.*) - backend: - serviceName: im-minio - servicePort: minio-console - ## @param ingress.extraPaths Any additional paths that may need to be added to the ingress under the main host - ## For example: The ALB ingress controller requires a special rule for handling SSL redirection. - ## extraPaths: - ## - path: /* - ## backend: - ## serviceName: ssl-redirect - ## servicePort: use-annotation \ No newline at end of file + tls: false \ No newline at end of file diff --git a/manifest/helm-charts/services/config.yaml b/manifest/helm-charts/services/config.yaml index 74f2dec7d..8262fd8e8 100644 --- a/manifest/helm-charts/services/config.yaml +++ b/manifest/helm-charts/services/config.yaml @@ -175,7 +175,7 @@ config: accessKeyID: "root" secretAccessKey: "openIM123" sessionToken: '' - signEndpoint: "https://openim1.nsddd.top/minio-api" + signEndpoint: "https://openim2.nsddd.top/im-minio-api" cos: bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com secretID: ''