Merge "[OOM] Remove POMBA from OOM repository"
diff --git a/docs/oom_quickstart_guide.rst b/docs/oom_quickstart_guide.rst
index 6b1c69c..51c28c2 100644
--- a/docs/oom_quickstart_guide.rst
+++ b/docs/oom_quickstart_guide.rst
@@ -161,8 +161,9 @@
> make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
`HELM_BIN`
- Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
- multiple version of helm in operating system and choose which one to use.
+ Sets the helm binary to be used. The default value use helm from PATH. Allow
+ the user to have multiple version of helm in operating system and choose
+ which one to use.
**Step 7.** Display the onap charts that available to be deployed::
diff --git a/docs/oom_setup_ingress_controller.rst b/docs/oom_setup_ingress_controller.rst
index c15171c..29dac92 100644
--- a/docs/oom_setup_ingress_controller.rst
+++ b/docs/oom_setup_ingress_controller.rst
@@ -15,7 +15,7 @@
.. figure:: oomLogoV2-medium.png
:align: right
-.. _onap-on-kubernetes-with-rancher:
+.. _oom_setup_ingress_controller:
Ingress controller setup on HA Kubernetes Cluster
diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst
index 7c8e16b..3743f5b 100644
--- a/docs/oom_user_guide.rst
+++ b/docs/oom_user_guide.rst
@@ -147,8 +147,9 @@
> make SKIP_LINT=TRUE [HELM_BIN=<HELM_PATH>] all
`HELM_BIN`
- Sets the helm binary to be used. The default value use helm from PATH. Allow the user to have
- multiple version of helm in operating system and choose which one to use.
+ Sets the helm binary to be used. The default value use helm from PATH.
+ Allow the user to have multiple version of helm in operating system and
+ choose which one to use.
The Helm search command reads through all of the repositories configured on the
system, and looks for matches::
diff --git a/docs/oom_user_guide_helm3.rst b/docs/oom_user_guide_helm3.rst
index b687fe8..08e9ec0 100644
--- a/docs/oom_user_guide_helm3.rst
+++ b/docs/oom_user_guide_helm3.rst
@@ -12,8 +12,8 @@
.. _Helm Documentation: https://docs.helm.sh/helm/
.. _Helm: https://docs.helm.sh/
.. _Kubernetes: https://Kubernetes.io/
-.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer
-.. _user-guide-label:
+.. _Kubernetes LoadBalancer: https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer
+.. _oom_user_guide_helm3:
OOM User Guide helm3 (experimental)
###################################
@@ -415,7 +415,7 @@
Ensure you've disabled any proxy settings the browser you are using to access
the portal and then simply access now the new ssl-encrypted URL:
-https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm
+``https://portal.api.simpledemo.onap.org:30225/ONAPPORTAL/login.htm``
.. note::
Using the HTTPS based Portal URL the Browser needs to be configured to accept
@@ -482,7 +482,7 @@
.. figure:: consulHealth.png
:align: center
-To see the real-time health of a deployment go to: http://<kubernetes IP>:30270/ui/
+To see the real-time health of a deployment go to: ``http://<kubernetes IP>:30270/ui/``
where a GUI much like the following will be found:
diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt
index b3188dd..e14c784 100644
--- a/docs/requirements-docs.txt
+++ b/docs/requirements-docs.txt
@@ -8,6 +8,7 @@
sphinxcontrib-blockdiag
sphinxcontrib-needs>=0.2.3
sphinxcontrib-nwdiag
+sphinxcontrib-redoc
sphinxcontrib-seqdiag
sphinxcontrib-swaggerdoc
sphinxcontrib-plantuml
diff --git a/kubernetes/cds/requirements.yaml b/kubernetes/cds/requirements.yaml
index 214999b..429b109 100644
--- a/kubernetes/cds/requirements.yaml
+++ b/kubernetes/cds/requirements.yaml
@@ -24,7 +24,7 @@
version: ~7.x-0
repository: 'file://components/cds-blueprints-processor'
condition: cds-blueprints-processor.enabled
- - name: cds-blueprints-processor
+ - name: cds-command-executor
version: ~7.x-0
repository: 'file://components/cds-command-executor'
condition: cds-command-executor.enabled
diff --git a/kubernetes/common/common/templates/_labels.tpl b/kubernetes/common/common/templates/_labels.tpl
index 6672762..da8f00f 100644
--- a/kubernetes/common/common/templates/_labels.tpl
+++ b/kubernetes/common/common/templates/_labels.tpl
@@ -30,7 +30,7 @@
app.kubernetes.io/managed-by: {{ $dot.Release.Service }}
{{ if .labels }}
{{- include "common.tplValue" (dict "value" .labels "context" $dot) }}
-{{- end -}}
+{{- end }}
{{- end -}}
{{/*
@@ -41,14 +41,15 @@
*/}}
{{- define "common.matchLabels" -}}
{{- $dot := default . .dot -}}
-{{- if not .matchLabels.nameNoMatch -}}
+{{- $matchLabels := default (dict) .matchLabels -}}
+{{- if not $matchLabels.nameNoMatch -}}
app.kubernetes.io/name: {{ include "common.name" $dot }}
{{- end }}
app.kubernetes.io/instance: {{ include "common.release" $dot }}
-{{ if .matchLabels }}
-{{$_ := unset .matchLabels "nameNoMatch"}}
-{{- include "common.tplValue" (dict "value" .matchLabels "context" $dot) }}
-{{- end -}}
+{{- if $matchLabels }}
+{{$_ := unset $matchLabels "nameNoMatch"}}
+{{- include "common.tplValue" (dict "value" $matchLabels "context" $dot) }}
+{{- end }}
{{- end -}}
{{/*
@@ -69,7 +70,7 @@
labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot ) | nindent 2 }}
{{- if $annotations }}
annotations: {{- include "common.tplValue" (dict "value" $annotations "context" $dot) | nindent 2}}
-{{- end -}}
+{{- end }}
{{- end -}}
{{/*
@@ -94,7 +95,7 @@
{{- $dot := default . .dot -}}
{{- $labels := default (dict) .labels -}}
{{- if $dot.Values.podAnnotations }}
-annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $) | nindent 2 }}
+annotations: {{- include "common.tplValue" (dict "value" $dot.Values.podAnnotations "context" $dot) | nindent 2 }}
{{- end }}
labels: {{- include "common.labels" (dict "labels" $labels "dot" $dot) | nindent 2 }}
name: {{ include "common.name" $dot }}
diff --git a/kubernetes/common/common/templates/_mariadb.tpl b/kubernetes/common/common/templates/_mariadb.tpl
index df0e6b4..1be3e3b 100644
--- a/kubernetes/common/common/templates/_mariadb.tpl
+++ b/kubernetes/common/common/templates/_mariadb.tpl
@@ -45,6 +45,13 @@
{{- end -}}
{{/*
+ UID of mariadb backup credentials
+*/}}
+{{- define "common.mariadb.secret.backupCredentialsUID" -}}
+ {{- printf "db-backup-credentials" }}
+{{- end -}}
+
+{{/*
Name of mariadb user credentials secret
*/}}
{{- define "common.mariadb.secret.userCredentialsSecretName" -}}
diff --git a/kubernetes/consul/charts/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/Chart.yaml
rename to kubernetes/consul/components/consul-server/Chart.yaml
diff --git a/kubernetes/consul/charts/consul-server/requirements.yaml b/kubernetes/consul/components/consul-server/requirements.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/requirements.yaml
rename to kubernetes/consul/components/consul-server/requirements.yaml
diff --git a/kubernetes/consul/charts/consul-server/templates/NOTES.txt b/kubernetes/consul/components/consul-server/templates/NOTES.txt
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/NOTES.txt
rename to kubernetes/consul/components/consul-server/templates/NOTES.txt
diff --git a/kubernetes/consul/charts/consul-server/templates/service.yaml b/kubernetes/consul/components/consul-server/templates/service.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/service.yaml
rename to kubernetes/consul/components/consul-server/templates/service.yaml
diff --git a/kubernetes/consul/charts/consul-server/templates/statefulset.yaml b/kubernetes/consul/components/consul-server/templates/statefulset.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/templates/statefulset.yaml
rename to kubernetes/consul/components/consul-server/templates/statefulset.yaml
diff --git a/kubernetes/consul/charts/consul-server/values.yaml b/kubernetes/consul/components/consul-server/values.yaml
similarity index 100%
rename from kubernetes/consul/charts/consul-server/values.yaml
rename to kubernetes/consul/components/consul-server/values.yaml
diff --git a/kubernetes/consul/requirements.yaml b/kubernetes/consul/requirements.yaml
index 2161e6e..bde1c36 100644
--- a/kubernetes/consul/requirements.yaml
+++ b/kubernetes/consul/requirements.yaml
@@ -23,3 +23,7 @@
- name: repositoryGenerator
version: ~7.x-0
repository: '@local'
+ - name: consul-server
+ version: ~7.x-0
+ repository: 'file://components/consul-server'
+ condition: cds-command-executor.enabled
diff --git a/kubernetes/contrib/components/awx/templates/serviceaccout.yaml b/kubernetes/contrib/components/awx/templates/serviceaccout.yaml
index 0f52ce8..15baf0e 100644
--- a/kubernetes/contrib/components/awx/templates/serviceaccout.yaml
+++ b/kubernetes/contrib/components/awx/templates/serviceaccout.yaml
@@ -30,18 +30,15 @@
resources: ["endpoints", "deployments", "pods", "replicasets/status", "jobs/status"]
verbs: ["get", "list"]
---
-apiVersion: v1
-items:
-- apiVersion: rbac.authorization.k8s.io/v1
- kind: RoleBinding
- metadata:
- name: {{ include "common.fullname" . }}-endpoint-reader
- namespace: {{ include "common.namespace" . }}
- roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "common.fullname" . }}-endpoint-reader
- subjects:
- - kind: ServiceAccount
- name: {{ include "common.fullname" . }}
-kind: List
\ No newline at end of file
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+ name: {{ include "common.fullname" . }}-endpoint-reader
+ namespace: {{ include "common.namespace" . }}
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: {{ include "common.fullname" . }}-endpoint-reader
+subjects:
+- kind: ServiceAccount
+ name: {{ include "common.fullname" . }}
\ No newline at end of file
diff --git a/kubernetes/msb/templates/serviceaccout.yaml b/kubernetes/msb/templates/serviceaccout.yaml
index ae18862..3248a0f 100644
--- a/kubernetes/msb/templates/serviceaccout.yaml
+++ b/kubernetes/msb/templates/serviceaccout.yaml
@@ -19,7 +19,7 @@
name: msb
namespace: {{ include "common.namespace" . }}
---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ include "common.namespace" . }}-msb-binding
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/Chart.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/resources/config/alertmanager.yml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/resources/config/alertmanager.yml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/configmap.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pv.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/pvc.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/templates/service.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-alertmanager/values.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-alertmanager/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/Chart.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/Chart.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/resources/config/grafana.ini
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/resources/config/grafana.ini
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/configmap.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/configmap.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/deployment.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pv.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pv.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/pvc.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/pvc.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/templates/service.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/templates/service.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml b/kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
similarity index 100%
rename from kubernetes/multicloud/components/multicloud-prometheus/charts/prometheus-grafana/values.yaml
rename to kubernetes/multicloud/components/multicloud-prometheus/components/prometheus-grafana/values.yaml
diff --git a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
index 0328610..b17f270 100644
--- a/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
+++ b/kubernetes/multicloud/components/multicloud-prometheus/requirements.yaml
@@ -20,3 +20,9 @@
- name: repositoryGenerator
version: ~7.x-0
repository: '@local'
+ - name: prometheus-alertmanager
+ version: ~7.x-0
+ repository: 'file://components/prometheus-alertmanager'
+ - name: prometheus-grafana
+ version: ~7.x-0
+ repository: 'file://components/prometheus-grafana'
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
index 60f93a3..fa18976 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,28 @@
[tox]
minversion = 1.6
envlist =
+ docs,
+ docs-linkcheck,
gitlint,
skipsdist=true
+[doc8]
+ignore-path-errors=docs/helm-search.txt;D001
+
+[testenv:doc8]
+deps = -rdocs/requirements-docs.txt
+commands =
+ doc8 docs/
+
+[testenv:docs]
+deps = -rdocs/requirements-docs.txt
+commands =
+ sphinx-build -j auto -W -b html -n -W -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+
+[testenv:docs-linkcheck]
+deps = -rdocs/requirements-docs.txt
+commands = sphinx-build -j auto -W -b linkcheck -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/linkcheck
+
[testenv:gitlint]
basepython = python3
deps =