#-------------------------------------------------------------------------
common:
- releasePrefix: r3
+ releasePrefix: r4
# If a local docker registry is used, please specify it using the following option
# localregistry: nexus3.o-ran-sc.org:10004
registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
name: ric-plt-o1
tag: 0.3.2
+
+xapponboarder:
+ image:
+ xapponboarder:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: xapp-onboarder
+ tag: 1.0.0
+ chartmuseum:
+ registry: "docker.io"
+ name: chartmuseum/chartmuseum
+ tag: v0.8.2
+ allow_redeploy: "True"
XAPPNAMESPACE=$(echo "$NAMESPACE_BLOCK" | awk '/^ *xapp:/{print $2}')
RELEASE_PREFIX=$(echo "$COMMON_BLOCK" | awk '/^ *releasePrefix:/{print $2}')
# replace the dbaasha with dbaas1 if deploying non HA DBaaS
-COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure appmgr rtmgr dbaasha e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator"}
+COMPONENTS=${LIST_OF_COMPONENTS:-"infrastructure xapp-onboarder appmgr rtmgr dbaas1 e2mgr e2term a1mediator submgr vespamgr jaegeradapter o1mediator"}
echo "Deploying RIC infra components [$COMPONENTS]"
# limitations under the License. #
################################################################################
-COMPONENTS="appmgr rtmgr dbaas1 dbaasha e2mgr e2term a1mediator submgr vespamgr jaegeradapter infrastructure o1mediator"
+COMPONENTS="xapp-onboarder appmgr rtmgr dbaas1 dbaasha e2mgr e2term a1mediator submgr vespamgr jaegeradapter infrastructure o1mediator"
RECIPE_NAMESPACE=$(kubectl get cm --all-namespaces | grep ricplt-recipe | awk '{print $1}')
kubectl get configmap -n $RECIPE_NAMESPACE ricplt-recipe -o jsonpath='{.data.recipe}' > /tmp/recipe.yaml
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
name: {{ include "common.configmapname.appmgr" . }}-appconfig
data:
{{- $restport := (printf ":%s" (include "common.serviceport.appmgr.http" .) ) | quote -}}
- {{- $defaulthelmrepo := (printf "http://127.0.0.1:%s" (include "common.serviceport.appmgr.chartmuseum.http" .) ) | quote -}}
+ {{- $defaulthelmrepo := (printf "http://%s:%s" (include "common.servicename.xapp-onboarder.server" .) (include "common.serviceport.xapp-onboarder.chartmuseum" .) ) | quote -}}
{{- $helmrepo := default $defaulthelmrepo .Values.appmgr.repoUrl | quote -}}
{{- $reponame := default "helm-repo" .Values.appmgr.reponame | quote -}}
{{- $tillerdeploynamespace := include "common.tillerDeployNameSpace" $ctx -}}
subPath: appmgr-tiller-secret-copier.sh
{{- end }}
containers:
- - name: {{ include "common.containername.appmgr.chartmuseum" . }}
- {{- $newctx := dict "ctx" $topCtx "defaultregistry" .Values.appmgr.image.chartmuseum.registry }}
- image: {{ include "common.dockerregistry.url" $newctx }}/{{ .Values.appmgr.image.chartmuseum.name }}:{{ .Values.appmgr.image.chartmuseum.tag }}
- {{- $newctx := dict "ctx" $topCtx "defaultpullpolicy" .Values.appmgr.imagePullPolicy }}
- imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $newctx }}
- securityContext:
- fsGroup: 0
- runAsUser: 0
- envFrom:
- - configMapRef:
- name: {{ include "common.configmapname.appmgr" . }}-chartmuseum-env
- ports:
- - name: chartmuseum
- containerPort: {{ include "common.serviceport.appmgr.chartmuseum.http" . }}
- protocol: TCP
- name: {{ include "common.containername.appmgr" . }}
{{- $newctx := dict "ctx" $topCtx "defaultregistry" .Values.appmgr.image.appmgr.registry }}
image: {{ include "common.dockerregistry.url" $newctx }}/{{ .Values.appmgr.image.appmgr.name }}:{{ .Values.appmgr.image.appmgr.tag }}
protocol: "TCP"
name: "http"
targetPort: "http"
- - port: {{ include "common.serviceport.appmgr.chartmuseum.http" . }}
- targetPort: chartmuseum
- protocol: TCP
- name: chartmuseum
selector:
app: {{ include "common.namespace.platform" . }}-{{ include "common.name.appmgr" . }}
release: {{ .Release.Name }}
registry: "nexus3.o-ran-sc.org:10002/o-ran-sc"
name: ric-plt-appmgr
tag: 0.2.0
- chartmuseum:
- registry: "docker.io"
- name: chartmuseum/chartmuseum
- tag: v0.8.2
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
#- name: dbaasha
# condition: dbaasha.enabled
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
- name: extsvcplt
version: 0.2.0
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
dependencies:
- name: ric-common
- version: ~3.0.0
+ version: ~3.1.0
repository: "@local"
--- /dev/null
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
--- /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. #
+################################################################################
+
+apiVersion: v1
+appVersion: "1.0"
+description: Helm Chart for xapp_onboarder
+name: xapp-onboarder
+version: 3.0.0
--- /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. #
+################################################################################
+
+dependencies:
+ - name: ric-common
+ version: ~3.1.0
+ repository: "@local"
--- /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. #
+################################################################################
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: {{ include "common.deploymentname.xapp-onboarder" . }}
+ namespace: {{ include "common.namespace.platform" . }}
+ labels:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.xapp-onboarder" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ replicas: {{ .Values.xapponboarder.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.xapp-onboarder" . }}
+ release: {{ .Release.Name }}
+ template:
+ metadata:
+ {{- if .Values.xapponboarder.annotations }}
+ annotations:
+ {{- .Values.xapponboarder.annotations | nindent 8 -}}
+ {{ end }}
+ labels:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.xapp-onboarder" . }}
+ release: {{ .Release.Name }}
+ spec:
+ hostname: {{ include "common.name.xapp-onboarder" . }}
+ imagePullSecrets:
+ {{- $newctx := dict "ctx" $ "defaultregistry" .Values.xapponboarder.image.xapponboarder.registry }}
+ - name: {{ include "common.dockerregistry.credential" $newctx }}
+ containers:
+ - name: {{ include "common.containername.xapp-onboarder.chartmuseum" . }}
+ {{- $newctx := dict "ctx" $ "defaultregistry" .Values.xapponboarder.image.chartmuseum.registry }}
+ image: {{ include "common.dockerregistry.url" $newctx }}/{{ .Values.xapponboarder.image.chartmuseum.name }}:{{ .Values.xapponboarder.image.chartmuseum.tag }}
+ {{- $newctx := dict "ctx" $ "defaultpullpolicy" .Values.xapponboarder.imagePullPolicy }}
+ imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $newctx }}
+ securityContext:
+ fsGroup: 0
+ runAsUser: 0
+ envFrom:
+ - configMapRef:
+ name: {{ include "common.configmapname.xapp-onboarder" . }}-chartmuseum-env
+ ports:
+ - name: chartmuseum
+ containerPort: {{ include "common.serviceport.xapp-onboarder.chartmuseum" . }}
+ protocol: TCP
+ - name: {{ include "common.containername.xapp-onboarder" . }}
+ {{- $newctx := dict "ctx" $ "defaultregistry" .Values.xapponboarder.image.xapponboarder.registry }}
+ image: {{ include "common.dockerregistry.url" $newctx }}/{{ .Values.xapponboarder.image.xapponboarder.name }}:{{ .Values.xapponboarder.image.xapponboarder.tag }}
+ {{- $newctx := dict "ctx" $ "defaultpullpolicy" .Values.xapponboarder.imagePullPolicy }}
+ imagePullPolicy: {{ include "common.dockerregistry.pullpolicy" $newctx }}
+ ports:
+ - name: server
+ containerPort: {{ include "common.serviceport.xapp-onboarder.server" . }}
+ protocol: TCP
+ envFrom:
+ - configMapRef:
+ name: {{ include "common.configmapname.xapp-onboarder" . }}-env
+ livenessProbe:
+ #exec:
+ # command:
+ # - /bin/bash
+ # - -c
+ # - ps -ef | grep {{ .Values.livenessprocessname }}| grep -v "grep"
+ #initialDelaySeconds: 120
+ #periodSeconds: 30
+ readinessProbe:
+ # httpGet:
+ # path: /
+ # port: http
+ restartPolicy: Always
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.configmapname.appmgr" . }}-chartmuseum-env
+ name: {{ include "common.configmapname.xapp-onboarder" . }}-chartmuseum-env
data:
DEBUG: "true"
STORAGE: "local"
STORAGE_LOCAL_ROOTDIR: "/charts"
- PORT: {{ include "common.serviceport.appmgr.chartmuseum.http" . | quote }}
+ PORT: {{ include "common.serviceport.xapp-onboarder.chartmuseum" . | quote }}
--- /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. #
+################################################################################
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: {{ include "common.configmapname.xapp-onboarder" . }}-env
+data:
+ FLASK_PORT: {{ include "common.serviceport.xapp-onboarder.server" . | quote }}
+ FLASK_DEBUG: "False"
+ DBAAS_SERVICE_HOST: {{ include "common.servicename.dbaas.tcp" . | quote }}
+ DBAAS_SERVICE_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
+ DBAAS_PORT_6379_TCP_ADDR: {{ include "common.servicename.dbaas.tcp" . | quote }}
+ DBAAS_PORT_6379_TCP_PORT: {{ include "common.serviceport.dbaas.tcp" . | quote }}
+ DBAAS_MASTER_NAME: {{ include "common.servicename.dbaasha.tcp" . | quote }}
+ DBAAS_SERVICE_SENTINEL_PORT: {{ include "common.serviceport.dbaasha.sentinel" . | quote }}
+ CHART_WORKSPACE_PATH: {{.Values.xapponboarder.chart_workspace_path | quote}}
+ CHART_REPO_URL: "http://0.0.0.0:8080"
+ HELM_VERSION: {{.Values.xapponboarder.helm_version | quote }}
+ HTTP_RETRY: {{.Values.xapponboarder.http_retry | quote }}
+ ALLOW_REDEPLOY: {{.Values.xapponboarder.allow_redeploy | quote }}
+ CHART_WORKSPACE_SIZE: {{.Values.xapponboarder.chart_workspace_size | quote }}
+ MOCK_TEST_MODE: "False"
+ MOCK_TEST_HELM_REPO_TEMP_DIR: "/tmp/mock_helm_repo"
+
--- /dev/null
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+ name: {{ include "common.ingressname.xapp-onboarder" . }}-chartmuseum
+spec:
+ rules:
+ - http:
+ paths:
+ - path: {{ include "common.kongpath.ric.chartmuseum" . }}
+ backend:
+ serviceName: {{ include "common.servicename.xapp-onboarder.server" . }}
+ servicePort: {{ include "common.serviceport.xapp-onboarder.chartmuseum" . }}
--- /dev/null
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+ name: {{ include "common.ingressname.xapp-onboarder" . }}-server
+spec:
+ rules:
+ - http:
+ paths:
+ - path: {{ include "common.kongpath.ric.xapp-onboarder" . }}
+ backend:
+ serviceName: {{ include "common.servicename.xapp-onboarder.server" . }}
+ servicePort: {{ include "common.serviceport.xapp-onboarder.server" . }}
--- /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. #
+################################################################################
+
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "common.servicename.xapp-onboarder.server" . }}
+ namespace: {{ include "common.namespace.platform" . }}
+ labels:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.xapp-onboarder" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
+spec:
+ type: ClusterIP
+ ports:
+ - port: {{ include "common.serviceport.xapp-onboarder.server" . }}
+ protocol: "TCP"
+ name: "server"
+ targetPort: "server"
+ - port: {{ include "common.serviceport.xapp-onboarder.chartmuseum" . }}
+ targetPort: "chartmuseum"
+ protocol: TCP
+ name: "chartmuseum"
+ selector:
+ app: {{ include "common.namespace.platform" . }}-{{ include "common.name.xapp-onboarder" . }}
+ release: {{ .Release.Name }}
+
+
# See the License for the specific language governing permissions and #
# limitations under the License. #
################################################################################
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
- name: {{ include "common.ingressname.appmgr" . }}-chartmuseum
-spec:
- tls:
- - hosts:
- - {{ include "common.ingresscontroller.url.platform" . }}
- secretName: secret-plt-ingress-cert
- rules:
- - http:
- paths:
- - backend:
- serviceName: {{ include "common.servicename.appmgr.http" . }}
- servicePort: {{ include "common.serviceport.appmgr.chartmuseum.http" . }}
- path: {{ include "common.kongpath.ric.helmrepo" . }}
+
+
+xapponboarder:
+ chart_workspace_size: "500MB"
+ chart_workspace_path: "/tmp/xapp-onboarder"
+ http_retry: "3"
+ helm_version: "2.12.3"
+ allow_redeploy: "True"
+
+ replicaCount: 1
+ imagePullPolicy: IfNotPresent
+ image:
+ xapponboarder:
+ registry: "nexus3.o-ran-sc.org:10004/o-ran-sc"
+ name: xapp-onboarder
+ tag: 1.0.0
+ chartmuseum:
+ registry: "docker.io"
+ name: chartmuseum/chartmuseum
+ tag: v0.8.2
Code Review / ric-plt / ric-dep.git / commitdiff