+++ /dev/null
-################################################################################
-# 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
apiVersion: v1
description: Common templates for inclusion in other charts
name: ric-common
-version: 2.0.2
+version: 2.0.3
{{- 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 #
*/}}
{{- 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 -}}
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"
+++ /dev/null
-################################################################################
-# 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 -}}