From: wrider Date: Tue, 3 Sep 2019 04:21:53 +0000 (-0400) Subject: Make ChartMuseum accessible via path X-Git-Tag: 0.0.2~23 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F868%2F2;p=it%2Fdep.git Make ChartMuseum accessible via path Change-Id: I74aa58d1cd990e7e6ff5ad911cd3006f6f7f2113 Signed-off-by: wrider --- diff --git a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml b/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml deleted file mode 100644 index cd1fa902..00000000 --- a/ric-aux/85-Ext-Services/helm/extsvcaux/templates/services-helm.yaml +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -kind: "Service" -apiVersion: "v1" -metadata: - name: {{ include "common.ingressurl.helm" . }} - namespace: {{ include "common.namespace.aux" . }} -spec: - ports: - - name: {{ include "common.ingressurl.helm" . }}-http-ingress-port - protocol: "TCP" - port: 80 - - name: {{ include "common.ingressurl.helm" . }}-https-ingress-port - protocol: "TCP" - port: 443 ---- -kind: "Endpoints" -apiVersion: "v1" -metadata: - # match with the selector-less service - name: {{ include "common.ingressurl.helm" . }} - namespace: {{ include "common.namespace.aux" . }} -subsets: - - addresses: - - ip: "{{ .Values.extsvcaux.auxip }}" - ports: - - port: {{ include "common.ingresshttpport" . }} - name: {{ include "common.ingressurl.helm" . }}-http-ingress-port - - port: {{ include "common.ingresshttpsport" . }} - name: {{ include "common.ingressurl.helm" . }}-https-ingress-port diff --git a/ric-common/Common-Template/helm/ric-common/Chart.yaml b/ric-common/Common-Template/helm/ric-common/Chart.yaml index f48aa05f..cc0d1cbe 100644 --- a/ric-common/Common-Template/helm/ric-common/Chart.yaml +++ b/ric-common/Common-Template/helm/ric-common/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v1 description: Common templates for inclusion in other charts name: ric-common -version: 2.0.2 +version: 2.0.3 diff --git a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl index 96858a92..6bc1a696 100644 --- a/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl +++ b/ric-common/Common-Template/helm/ric-common/templates/_ingresscontroller.tpl @@ -54,26 +54,6 @@ {{- end -}} -{{- define "common.ingressurl.helm" -}} - {{- if .Values.global -}} - {{- if .Values.global.ingressurl -}} - {{- if .Values.global.ingressurl.helm -}} - {{- printf "%s" .Values.global.ingressurl.helm -}} - {{- else -}} - {{- printf "helm-entry" -}} - {{- end -}} - {{- else -}} - {{- printf "helm-entry" -}} - {{- end -}} - {{- else -}} - {{- printf "helm-entry" -}} - {{- end -}} -{{- end -}} - - - - - ####################### Ingress Controller Ports ########################################### ## Currently the below values are hard-coded due to the fact that kong ingress controller # diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl index fa34a0a7..7de54a19 100644 --- a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl +++ b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/_gen-cert.tpl @@ -20,9 +20,9 @@ Generate certificates for the docker registry */}} {{- define "chartmuseum.gen-cert" -}} -{{- $altNames := list ( include "common.ingressurl.helm" . ) -}} +{{- $altNames := list ( include "common.ingressurl.aux" . ) -}} {{- $ca := genCA "docker-registry-ca" 365 -}} -{{- $cert := genSignedCert ( include "common.ingressurl.helm" . ) nil $altNames 365 $ca -}} +{{- $cert := genSignedCert ( include "common.ingressurl.aux" . ) nil $altNames 365 $ca -}} tls.crt: {{ $cert.Cert | b64enc }} tls.key: {{ $cert.Key | b64enc }} {{- end -}} diff --git a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml index 1a4876bc..2d74a33f 100644 --- a/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml +++ b/ric-infra/15-Chartmuseum/helm/chartmuseum/templates/ingress.yaml @@ -21,13 +21,12 @@ metadata: spec: tls: - hosts: - - {{ include "common.ingressurl.helm" . }} + - {{ include "common.ingressurl.aux" . }} secretName: secret-{{ include "common.name.chartmuseum" . }} rules: - - host: {{ include "common.ingressurl.helm" . }} - http: + - http: paths: - backend: serviceName: {{ include "common.servicename.chartmuseum.http" . }} servicePort: http - path: "/" + path: "/helm" diff --git a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml b/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml deleted file mode 100644 index dd6f3e4a..00000000 --- a/ric-platform/55-Ext-Services/helm/extsvcplt/templates/services-helm.yaml +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ -{{ $platformNameSpace := include "common.namespace.platform" . }} -{{ $xAppNameSpace := include "common.namespace.xapp" . }} -{{ $nameSpaceList := list $platformNameSpace $xAppNameSpace }} -{{- range $nameSpaceList }} - ---- -kind: "Service" -apiVersion: "v1" -metadata: - name: {{ include "common.ingressurl.helm" $ }} - namespace: {{ . }} -spec: - ports: - - name: {{ include "common.ingressurl.helm" $ }}-http-ingress-port - protocol: "TCP" - port: 80 - - name: {{ include "common.ingressurl.helm" $ }}-https-ingress-port - protocol: "TCP" - port: 443 ---- -kind: "Endpoints" -apiVersion: "v1" -metadata: - # match with the selector-less service - name: {{ include "common.ingressurl.helm" $ }} - namespace: {{ . }} -subsets: - - addresses: - - ip: "{{ $.Values.extsvcplt.auxip }}" - ports: - - port: {{ include "common.ingresshttpport" $ }} - name: {{ include "common.ingressurl.helm" $ }}-http-ingress-port - - port: {{ include "common.ingresshttpsport" $ }} - name: {{ include "common.ingressurl.helm" $ }}-https-ingress-port - -{{- end -}}