aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/dmaap
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/dmaap')
-rw-r--r--kubernetes/dmaap/Chart.yaml29
-rw-r--r--kubernetes/dmaap/Makefile5
-rw-r--r--kubernetes/dmaap/components/Makefile5
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/Chart.yaml23
-rw-r--r--kubernetes/dmaap/components/dmaap-bc/requirements.yaml32
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml19
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml34
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml25
-rw-r--r--kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml41
-rw-r--r--kubernetes/dmaap/components/message-router/Chart.yaml28
-rw-r--r--kubernetes/dmaap/components/message-router/Makefile4
-rw-r--r--kubernetes/dmaap/components/message-router/components/Makefile4
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml22
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml32
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml19
-rw-r--r--kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml29
-rw-r--r--kubernetes/dmaap/components/message-router/requirements.yaml38
-rw-r--r--kubernetes/dmaap/components/message-router/templates/statefulset.yaml14
-rw-r--r--kubernetes/dmaap/components/message-router/values.yaml16
-rw-r--r--kubernetes/dmaap/requirements.yaml39
20 files changed, 188 insertions, 270 deletions
diff --git a/kubernetes/dmaap/Chart.yaml b/kubernetes/dmaap/Chart.yaml
index e0b0c38712..7ae20adaf9 100644
--- a/kubernetes/dmaap/Chart.yaml
+++ b/kubernetes/dmaap/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,31 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP components
name: dmaap
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: message-router
+ version: ~10.x-0
+ repository: 'file://components/message-router'
+ condition: message-router.enabled
+ - name: dmaap-bc
+ version: ~10.x-0
+ repository: 'file://components/dmaap-bc'
+ condition: dmaap-bc.enabled
+ - name: dmaap-dr-node
+ version: ~10.x-0
+ repository: 'file://components/dmaap-dr-node'
+ condition: dmaap-dr-node.enabled
+ - name: dmaap-dr-prov
+ version: ~10.x-0
+ repository: 'file://components/dmaap-dr-prov'
+ condition: dmaap-dr-prov.enabled
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/Makefile b/kubernetes/dmaap/Makefile
index 4c79718d02..7f4318190f 100644
--- a/kubernetes/dmaap/Makefile
+++ b/kubernetes/dmaap/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,8 +44,9 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
+ @rm -f */Chart.lock
%:
@:
diff --git a/kubernetes/dmaap/components/Makefile b/kubernetes/dmaap/components/Makefile
index bf267b7720..3253599dea 100644
--- a/kubernetes/dmaap/components/Makefile
+++ b/kubernetes/dmaap/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,8 +44,9 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
+ @rm -f */Chart.lock
%:
@:
diff --git a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
index 433c065445..3903c5dbea 100644
--- a/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-bc/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,25 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: a Helm chart to deploy ONAP DMaaP Bus Controller (aka dmaap-bc) in Kubernetes
name: dmaap-bc
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: postgres
+ version: ~10.x-0
+ repository: '@local'
+ condition: PG.enabled
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml b/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
deleted file mode 100644
index 10a617d0c3..0000000000
--- a/kubernetes/dmaap/components/dmaap-bc/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2021 Orange
-#
-# 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: common
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: postgres
- version: ~9.x-0
- repository: '@local'
- condition: PG.enabled
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
index 87b5fa1467..4c65198ecc 100644
--- a/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/Chart.yaml
@@ -1,5 +1,6 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -13,7 +14,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP Data Router Node Server
name: dmaap-dr-node
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
deleted file mode 100644
index 4feb42de02..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-node/requirements.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
index 94fc4430c3..74c984b7cf 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/Chart.yaml
@@ -13,7 +13,28 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP DMaaP Data Router Provisioning Server
name: dmaap-dr-prov
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ repository: '@local'
+ - name: mariadb-galera
+ version: ~10.x-0
+ repository: '@local'
+ condition: global.mariadbGalera.localCluster
+ - name: mariadb-init
+ version: ~10.x-0
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
deleted file mode 100644
index 01d481aba2..0000000000
--- a/kubernetes/dmaap/components/dmaap-dr-prov/requirements.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 Nordix Foundation.
-# Modifications Copyright © 2021 Orange
-# ================================================================================
-# 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.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-#
-
-dependencies:
- - name: common
- version: ~9.x-0
- repository: '@local'
- - name: mariadb-galera
- version: ~9.x-0
- repository: '@local'
- condition: global.mariadbGalera.localCluster
- - name: mariadb-init
- version: ~9.x-0
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Chart.yaml b/kubernetes/dmaap/components/message-router/Chart.yaml
index 7bd389eec7..7ecad8b222 100644
--- a/kubernetes/dmaap/components/message-router/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Message Router
name: message-router
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: message-router-kafka
+ version: ~10.x-0
+ repository: 'file://components/message-router-kafka'
+ - name: message-router-zookeeper
+ version: ~10.x-0
+ repository: 'file://components/message-router-zookeeper'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/Makefile b/kubernetes/dmaap/components/message-router/Makefile
index 4c79718d02..51d7de122c 100644
--- a/kubernetes/dmaap/components/message-router/Makefile
+++ b/kubernetes/dmaap/components/message-router/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dmaap/components/message-router/components/Makefile b/kubernetes/dmaap/components/message-router/components/Makefile
index bf267b7720..f4c9784bc4 100644
--- a/kubernetes/dmaap/components/message-router/components/Makefile
+++ b/kubernetes/dmaap/components/message-router/components/Makefile
@@ -33,7 +33,7 @@ make-%:
@if [ -f $*/Makefile ]; then make -C $*; fi
dep-%: make-%
- @if [ -f $*/requirements.yaml ]; then $(HELM_BIN) dep up $*; fi
+ @if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
lint-%: dep-%
@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) lint $*; fi
@@ -44,7 +44,7 @@ package-%: lint-%
@$(HELM_BIN) repo index $(PACKAGE_DIR)
clean:
- @rm -f */requirements.lock
+ @rm -f */Chart.lock
@rm -f *tgz */charts/*tgz
@rm -rf $(PACKAGE_DIR)
%:
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
index 76a48839f3..2a24b7dbd9 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-kafka/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,24 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Message Router Kafka Service
name: message-router-kafka
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: certInitializer
+ version: ~10.x-0
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
deleted file mode 100644
index f85585d5b7..0000000000
--- a/kubernetes/dmaap/components/message-router/components/message-router-kafka/requirements.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# 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: common
- version: ~9.x-0
- # local reference to common chart, as it is
- # a part of this chart's package and will not
- # be published independently to a repo (at this point)
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
index c3a128246a..699722c6e0 100644
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
+++ b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/Chart.yaml
@@ -1,6 +1,7 @@
# Copyright © 2017 Amdocs, Bell Canada
# Modifications Copyright © 2018 AT&T
# Modifications Copyright © 2021 Orange
+# Modifications Copyright © 2021 Nordix Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -14,7 +15,21 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
+apiVersion: v2
description: ONAP Dmaap Message Router Zookeeper Service
name: message-router-zookeeper
-version: 9.0.0
+version: 10.0.0
+
+dependencies:
+ - name: common
+ version: ~10.x-0
+ # local reference to common chart, as it is
+ # a part of this chart's package and will not
+ # be published independently to a repo (at this point)
+ repository: '@local'
+ - name: repositoryGenerator
+ version: ~10.x-0
+ repository: '@local'
+ - name: serviceAccount
+ version: ~10.x-0
+ repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml b/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
deleted file mode 100644
index 74c05f4b68..0000000000
--- a/kubernetes/dmaap/components/message-router/components/message-router-zookeeper/requirements.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# 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: common
- version: ~9.x-0
- # local reference to common chart, as it is
- # a part of this chart's package and will not
- # be published independently to a repo (at this point)
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/requirements.yaml b/kubernetes/dmaap/components/message-router/requirements.yaml
deleted file mode 100644
index 4dfa82b92e..0000000000
--- a/kubernetes/dmaap/components/message-router/requirements.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-#
-# 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: common
- version: ~9.x-0
- # local reference to common chart, as it is
- # a part of this chart's package and will not
- # be published independently to a repo (at this point)
- repository: '@local'
- - name: certInitializer
- version: ~9.x-0
- repository: '@local'
- - name: repositoryGenerator
- version: ~9.x-0
- repository: '@local'
- - name: message-router-kafka
- version: ~9.x-0
- repository: 'file://components/message-router-kafka'
- - name: message-router-zookeeper
- version: ~9.x-0
- repository: 'file://components/message-router-zookeeper'
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'
diff --git a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
index 9bad341792..f0832add80 100644
--- a/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/templates/statefulset.yaml
@@ -103,13 +103,25 @@ spec:
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
periodSeconds: {{ .Values.liveness.periodSeconds }}
timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
- {{ end -}}
+ successThreshold: {{ .Values.liveness.successThreshold }}
+ failureThreshold: {{ .Values.liveness.failureThreshold }}
+ {{ end }}
readinessProbe:
tcpSocket:
port: {{ .Values.readiness.port }}
initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
periodSeconds: {{ .Values.readiness.periodSeconds }}
timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
+ successThreshold: {{ .Values.readiness.successThreshold }}
+ failureThreshold: {{ .Values.readiness.failureThreshold }}
+ startupProbe:
+ tcpSocket:
+ port: {{ .Values.startup.port }}
+ initialDelaySeconds: {{ .Values.startup.initialDelaySeconds }}
+ periodSeconds: {{ .Values.startup.periodSeconds }}
+ timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
+ successThreshold: {{ .Values.startup.successThreshold }}
+ failureThreshold: {{ .Values.startup.failureThreshold }}
env:
- name: enableCadi
value: "{{ .Values.global.aafEnabled }}"
diff --git a/kubernetes/dmaap/components/message-router/values.yaml b/kubernetes/dmaap/components/message-router/values.yaml
index 44697d7c92..7aa31769f4 100644
--- a/kubernetes/dmaap/components/message-router/values.yaml
+++ b/kubernetes/dmaap/components/message-router/values.yaml
@@ -85,18 +85,30 @@ affinity: {}
# probe configuration parameters
liveness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 3
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
port: api
enabled: true
readiness:
- initialDelaySeconds: 70
+ initialDelaySeconds: 10
periodSeconds: 10
timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 3
+ port: api
+
+startup:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 1
+ successThreshold: 1
+ failureThreshold: 70
port: api
service:
diff --git a/kubernetes/dmaap/requirements.yaml b/kubernetes/dmaap/requirements.yaml
deleted file mode 100644
index b1a8f3a8bc..0000000000
--- a/kubernetes/dmaap/requirements.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# Modifications Copyright © 2018 Amdocs,Bell Canada
-# Modifications Copyright © 2021 Orange
-#
-# 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: common
- version: ~9.x-0
- repository: '@local'
- - name: message-router
- version: ~9.x-0
- repository: 'file://components/message-router'
- condition: message-router.enabled
- - name: dmaap-bc
- version: ~9.x-0
- repository: 'file://components/dmaap-bc'
- condition: dmaap-bc.enabled
- - name: dmaap-dr-node
- version: ~9.x-0
- repository: 'file://components/dmaap-dr-node'
- condition: dmaap-dr-node.enabled
- - name: dmaap-dr-prov
- version: ~9.x-0
- repository: 'file://components/dmaap-dr-prov'
- condition: dmaap-dr-prov.enabled
- - name: serviceAccount
- version: ~9.x-0
- repository: '@local'