diff --git a/manila/templates/deployment-api.yaml b/manila/templates/deployment-api.yaml index cdb117f49e..3ec37b3d3f 100644 --- a/manila/templates/deployment-api.yaml +++ b/manila/templates/deployment-api.yaml @@ -80,12 +80,12 @@ spec: - stop ports: - name: m-api - containerPort: {{ tuple "share" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + containerPort: {{ tuple "sharev2" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} readinessProbe: httpGet: scheme: HTTP - path: {{ tuple "share" "healthcheck" "" . | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" }} - port: {{ tuple "share" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + path: {{ tuple "sharev2" "healthcheck" "" . | include "helm-toolkit.endpoints.keystone_endpoint_path_lookup" }} + port: {{ tuple "sharev2" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} volumeMounts: - name: pod-tmp mountPath: /tmp diff --git a/manila/templates/ingress-api.yaml b/manila/templates/ingress-api.yaml index ef9426f844..f2a5bac6a6 100644 --- a/manila/templates/ingress-api.yaml +++ b/manila/templates/ingress-api.yaml @@ -13,6 +13,6 @@ limitations under the License. */}} {{- if and .Values.manifests.ingress_api .Values.network.api.ingress.public }} -{{- $ingressOpts := dict "envAll" . "backendServiceType" "share" "backendPort" "m-api" -}} +{{- $ingressOpts := dict "envAll" . "backendServiceType" "sharev2" "backendPort" "m-api" -}} {{ $ingressOpts | include "helm-toolkit.manifests.ingress" }} {{- end }} diff --git a/manila/templates/job-ks-endpoints.yaml b/manila/templates/job-ks-endpoints.yaml index 56b529ed72..d54b96635b 100644 --- a/manila/templates/job-ks-endpoints.yaml +++ b/manila/templates/job-ks-endpoints.yaml @@ -20,7 +20,7 @@ helm.sh/hook-weight: "-2" {{- end }} {{- if .Values.manifests.job_ks_endpoints }} -{{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "share" "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} +{{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_endpoints" . | fromYaml) -}} {{- if .Values.pod.tolerations.manila.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/manila/templates/job-ks-service.yaml b/manila/templates/job-ks-service.yaml index 895b31f566..08f745e35d 100644 --- a/manila/templates/job-ks-service.yaml +++ b/manila/templates/job-ks-service.yaml @@ -20,7 +20,7 @@ helm.sh/hook-weight: "-3" {{- end }} {{- if .Values.manifests.job_ks_service }} -{{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "share" "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} +{{- $ksServiceJob := dict "envAll" . "serviceName" "manila" "serviceTypes" ( tuple "sharev2" ) "jobAnnotations" (include "metadata.annotations.job.ks_service" . | fromYaml) -}} {{- if .Values.pod.tolerations.manila.enabled -}} {{- $_ := set $ksServiceJob "tolerationsEnabled" true -}} {{- end -}} diff --git a/manila/templates/secret-ingress-tls.yaml b/manila/templates/secret-ingress-tls.yaml index 9db2b2550a..9d966e3916 100644 --- a/manila/templates/secret-ingress-tls.yaml +++ b/manila/templates/secret-ingress-tls.yaml @@ -13,5 +13,5 @@ limitations under the License. */}} {{- if .Values.manifests.secret_ingress_tls }} -{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "share" ) }} +{{- include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "sharev2" ) }} {{- end }} diff --git a/manila/templates/service-api.yaml b/manila/templates/service-api.yaml index c529fd8b36..0c3080f43b 100644 --- a/manila/templates/service-api.yaml +++ b/manila/templates/service-api.yaml @@ -18,11 +18,11 @@ limitations under the License. apiVersion: v1 kind: Service metadata: - name: {{ tuple "share" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} + name: {{ tuple "sharev2" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} spec: ports: - name: m-api - port: {{ tuple "share" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + port: {{ tuple "sharev2" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} {{ if .Values.network.api.node_port.enabled }} nodePort: {{ .Values.network.api.node_port.port }} {{ end }} diff --git a/manila/templates/service-ingress-api.yaml b/manila/templates/service-ingress-api.yaml index 58492cd482..d9cdb97c34 100644 --- a/manila/templates/service-ingress-api.yaml +++ b/manila/templates/service-ingress-api.yaml @@ -13,6 +13,6 @@ limitations under the License. */}} {{- if and .Values.manifests.service_ingress_api .Values.network.api.ingress.public }} -{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "share" -}} +{{- $serviceIngressOpts := dict "envAll" . "backendServiceType" "sharev2" -}} {{ $serviceIngressOpts | include "helm-toolkit.manifests.service_ingress" }} {{- end }} diff --git a/manila/values.yaml b/manila/values.yaml index 1b73112f30..08086689c1 100644 --- a/manila/values.yaml +++ b/manila/values.yaml @@ -963,24 +963,6 @@ endpoints: api: default: 80 internal: 5000 - share: - name: manila - hosts: - default: manila-api - public: manila - host_fqdn_override: - default: null - path: - default: '/v1' - healthcheck: /healthcheck - scheme: - default: http - service: http - port: - api: - default: 8786 - public: 80 - service: 8786 sharev2: name: manilav2 hosts: @@ -990,6 +972,7 @@ endpoints: default: null path: default: '/v2' + healthcheck: /healthcheck scheme: default: http service: http diff --git a/releasenotes/notes/remove-share-v1-api-d7b0b85e395bf131.yaml b/releasenotes/notes/remove-share-v1-api-d7b0b85e395bf131.yaml new file mode 100644 index 0000000000..99637d72da --- /dev/null +++ b/releasenotes/notes/remove-share-v1-api-d7b0b85e395bf131.yaml @@ -0,0 +1,6 @@ +--- +manila: + - | + Removed endpoint for the legacy share API, becuase it has been removed from + manila. +...