diff options
-rw-r--r-- | kubernetes/Makefile | 6 | ||||
-rw-r--r-- | kubernetes/clamp/charts/clamp-dash-es/values.yaml | 22 | ||||
-rw-r--r-- | kubernetes/clamp/charts/clamp-dash-kibana/values.yaml | 23 | ||||
-rw-r--r-- | kubernetes/clamp/charts/clamp-dash-logstash/values.yaml | 22 | ||||
-rw-r--r-- | kubernetes/clamp/charts/mariadb/values.yaml | 22 | ||||
-rw-r--r-- | kubernetes/clamp/values.yaml | 23 | ||||
-rw-r--r-- | kubernetes/nbi/README.md | 17 |
7 files changed, 103 insertions, 32 deletions
diff --git a/kubernetes/Makefile b/kubernetes/Makefile index 7b19e6e773..fa63bd8942 100644 --- a/kubernetes/Makefile +++ b/kubernetes/Makefile @@ -25,7 +25,7 @@ HELM_CHARTS := $(filter-out $(EXCLUDES), $(patsubst %/.,%,$(wildcard */.))) $(PA .PHONY: $(EXCLUDES) $(HELM_CHARTS) -all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS) +all: $(COMMON_CHARTS_DIR) $(HELM_CHARTS) plugins $(COMMON_CHARTS): @echo "\n[$@]" @@ -54,6 +54,10 @@ clean: @find . -type f -name '*.tgz' -delete @rm -rf $(PACKAGE_DIR)/* +# publish helm plugins via distrubtion directory +plugins: + @cp -R helm $(PACKAGE_DIR)/ + # start up a local helm repo to serve up helm chart packages repo: @mkdir -p $(PACKAGE_DIR) diff --git a/kubernetes/clamp/charts/clamp-dash-es/values.yaml b/kubernetes/clamp/charts/clamp-dash-es/values.yaml index 98ce044d03..43920b3d65 100644 --- a/kubernetes/clamp/charts/clamp-dash-es/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-es/values.yaml @@ -20,6 +20,7 @@ global: nodePortPrefix: 302 repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== persistence: {} +flavor: small ################################################################# # Application configuration defaults. @@ -108,9 +109,18 @@ ingress: # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory resources: - limits: - cpu: 1 - memory: 4Gi - requests: - cpu: 10m - memory: 2.5Gi + small: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 10m + memory: 2.5Gi + large: + limits: + cpu: 1 + memory: 4Gi + requests: + cpu: 10m + memory: 2.5Gi + unlimited: {} diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml index 9cc1b2f82f..b60dbcff38 100644 --- a/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-kibana/values.yaml @@ -22,6 +22,7 @@ global: readinessRepository: oomk8s readinessImage: readiness-check:1.1.0 persistence: {} +flavor: small ################################################################# # Application configuration defaults. @@ -88,10 +89,18 @@ ingress: # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory resources: - limits: - cpu: 1 - memory: 2Gi - requests: - cpu: 10m - memory: 750Mi - + small: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 10m + memory: 750Mi + large: + limits: + cpu: 1 + memory: 2Gi + requests: + cpu: 10m + memory: 750Mi + unlimited: {} diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml index 06a5d0bca3..ba8f46bdac 100644 --- a/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml +++ b/kubernetes/clamp/charts/clamp-dash-logstash/values.yaml @@ -22,6 +22,7 @@ global: readinessRepository: oomk8s readinessImage: readiness-check:1.1.0 persistence: {} +flavor: small ################################################################# # Application configuration defaults. @@ -91,9 +92,18 @@ ingress: # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory resources: - limits: - cpu: 1 - memory: 1.3Gi - requests: - cpu: 10m - memory: 750Mi + small: + limits: + cpu: 1 + memory: 1.3Gi + requests: + cpu: 10m + memory: 750Mi + large: + limits: + cpu: 1 + memory: 1.3Gi + requests: + cpu: 10m + memory: 750Mi + unlimited: {} diff --git a/kubernetes/clamp/charts/mariadb/values.yaml b/kubernetes/clamp/charts/mariadb/values.yaml index a419f11b3a..13d1971028 100644 --- a/kubernetes/clamp/charts/mariadb/values.yaml +++ b/kubernetes/clamp/charts/mariadb/values.yaml @@ -25,6 +25,7 @@ global: # global defaults repository: nexus3.onap.org:10001 image: mariadb:10.1.11 pullPolicy: Always +flavor: small ################################################################# # Application configuration defaults. @@ -98,9 +99,18 @@ ingress: # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory resources: - limits: - cpu: 1 - memory: 500Mi - requests: - cpu: 10m - memory: 200Mi + small: + limits: + cpu: 1 + memory: 500Mi + requests: + cpu: 10m + memory: 200Mi + large: + limits: + cpu: 1 + memory: 500Mi + requests: + cpu: 10m + memory: 200Mi + unlimited: {} diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 81816be230..7edf75849c 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -26,6 +26,8 @@ global: # global defaults subChartsOnly: enabled: true +flavor: small + # application image repository: nexus3.onap.org:10001 image: onap/clamp:3.0.3 @@ -118,9 +120,18 @@ ingress: # Minimum memory for development is 2 CPU cores and 4GB memory # Minimum memory for production is 4 CPU cores and 8GB memory resources: - limits: - cpu: 1 - memory: 1.2Gi - requests: - cpu: 10m - memory: 800Mi + small: + limits: + cpu: 1 + memory: 1.2Gi + requests: + cpu: 10m + memory: 800Mi + large: + limits: + cpu: 1 + memory: 1.2Gi + requests: + cpu: 10m + memory: 800Mi + unlimited: {} diff --git a/kubernetes/nbi/README.md b/kubernetes/nbi/README.md new file mode 100644 index 0000000000..9d79efe618 --- /dev/null +++ b/kubernetes/nbi/README.md @@ -0,0 +1,17 @@ +# NBI + +## Introduction + +NBI stands for NorthBound Interface. It brings to ONAP a set of API that can be +used by external systems as BSS for example. These API are based on TMF API. + +Full description is on [ONAP Read the Doc](https://onap.readthedocs.io/en/latest/submodules/externalapi/nbi.git/docs/offeredapis/index.html). + +## Requirements + +NBI needs the following ONAP projects to work: + +- AAI +- SO +- SDC +- MSB |