From 66789f218b8464f28a08572ef0c30dbfe40b13c5 Mon Sep 17 00:00:00 2001 From: efiacor Date: Fri, 4 Nov 2022 21:52:45 +0000 Subject: [PATCH] [AAF] Remove aaf-hello Deleteing sample aff hello app Signed-off-by: efiacor Change-Id: I32247d82db45979d0809423ac4f4f4b79b5e5515 Issue-ID: OOM-3054 --- kubernetes/aaf/Chart.yaml | 4 - kubernetes/aaf/components/aaf-hello/.helmignore | 21 ----- kubernetes/aaf/components/aaf-hello/Chart.yaml | 31 ------ .../aaf/components/aaf-hello/templates/NOTES.txt | 14 --- .../components/aaf-hello/templates/deployment.yaml | 62 ------------ .../components/aaf-hello/templates/ingress.yaml | 4 - .../aaf/components/aaf-hello/templates/secret.yaml | 17 ---- .../components/aaf-hello/templates/service.yaml | 18 ---- kubernetes/aaf/components/aaf-hello/values.yaml | 105 --------------------- kubernetes/aaf/values.yaml | 3 - 10 files changed, 279 deletions(-) delete mode 100644 kubernetes/aaf/components/aaf-hello/.helmignore delete mode 100644 kubernetes/aaf/components/aaf-hello/Chart.yaml delete mode 100644 kubernetes/aaf/components/aaf-hello/templates/NOTES.txt delete mode 100644 kubernetes/aaf/components/aaf-hello/templates/deployment.yaml delete mode 100644 kubernetes/aaf/components/aaf-hello/templates/ingress.yaml delete mode 100644 kubernetes/aaf/components/aaf-hello/templates/secret.yaml delete mode 100644 kubernetes/aaf/components/aaf-hello/templates/service.yaml delete mode 100644 kubernetes/aaf/components/aaf-hello/values.yaml diff --git a/kubernetes/aaf/Chart.yaml b/kubernetes/aaf/Chart.yaml index bcbe9fa155..9c0aa891eb 100644 --- a/kubernetes/aaf/Chart.yaml +++ b/kubernetes/aaf/Chart.yaml @@ -37,10 +37,6 @@ dependencies: version: ~11.x-0 repository: 'file://components/aaf-gui' condition: aaf-authz.enabled - - name: aaf-hello - version: ~11.x-0 - repository: 'file://components/aaf-hello' - condition: aaf-hello.enabled - name: aaf-locate version: ~11.x-0 repository: 'file://components/aaf-locate' diff --git a/kubernetes/aaf/components/aaf-hello/.helmignore b/kubernetes/aaf/components/aaf-hello/.helmignore deleted file mode 100644 index f0c1319444..0000000000 --- a/kubernetes/aaf/components/aaf-hello/.helmignore +++ /dev/null @@ -1,21 +0,0 @@ -# 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 diff --git a/kubernetes/aaf/components/aaf-hello/Chart.yaml b/kubernetes/aaf/components/aaf-hello/Chart.yaml deleted file mode 100644 index bc4c38de28..0000000000 --- a/kubernetes/aaf/components/aaf-hello/Chart.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 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. -# 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: v2 -description: ONAP AAF Hello -name: aaf-hello -version: 11.0.0 - -dependencies: - - name: common - version: ~11.x-0 - repository: '@local' - - name: repositoryGenerator - version: ~11.x-0 - repository: '@local' - - name: aaf-templates - version: ~11.x-0 - repository: 'file://../aaf-templates' diff --git a/kubernetes/aaf/components/aaf-hello/templates/NOTES.txt b/kubernetes/aaf/components/aaf-hello/templates/NOTES.txt deleted file mode 100644 index ef4d8e7d23..0000000000 --- a/kubernetes/aaf/components/aaf-hello/templates/NOTES.txt +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada -# -# 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. - diff --git a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml b/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml deleted file mode 100644 index 60e7c6bcc8..0000000000 --- a/kubernetes/aaf/components/aaf-hello/templates/deployment.yaml +++ /dev/null @@ -1,62 +0,0 @@ -{{/* -# Copyright © 2017 Amdocs, Bell Canada -# Modifications © 2020 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. -*/}} -apiVersion: apps/v1 -kind: Deployment -metadata: {{- include "common.resourceMetadata" . | nindent 2 }} -spec: - selector: {{- include "common.selectors" . | nindent 4 }} - replicas: {{ .Values.replicaCount }} - template: - metadata: {{- include "common.templateMetadata" . | nindent 6 }} - spec: - initContainers: {{ include "common.aaf-config" (dict "aafRoot" .Values.aaf_init "dot" .) | nindent 6 }} -# CONTAINER Definition - containers: - - name: {{ include "common.name" . }} - command: ["bash","-c","cd /opt/app/aaf && if [ ! -d /opt/app/osaaf/etc ]; then cp -Rf etc logs /opt/app/osaaf; fi && exec bin/hello"] - image: {{ include "repositoryGenerator.repository" . }}/{{.Values.image }} - imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - ports: {{ include "common.containerPorts" . | nindent 10 }} - volumeMounts: {{ include "common.aaf-config-volume-mountpath" . | nindent 8 }} - - mountPath: /etc/localtime - name: localtime - readOnly: true - {{- if eq .Values.liveness.enabled true }} - livenessProbe: - tcpSocket: - port: {{ .Values.liveness.port }} - initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.liveness.periodSeconds }} - {{- end }} - readinessProbe: - tcpSocket: - port: {{ .Values.readiness.port }} - initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.readiness.periodSeconds }} - resources: {{ include "common.resources" . | nindent 12 }} - {{- if .Values.nodeSelector }} - nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: {{ toYaml .Values.affinity | nindent 10 }} - {{- end }} - volumes: {{ include "common.aaf-config-volumes" (dict "aafRoot" .Values.aaf_init "dot" .) | nindent 6 }} - - name: localtime - hostPath: - path: /etc/localtime - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/aaf/components/aaf-hello/templates/ingress.yaml b/kubernetes/aaf/components/aaf-hello/templates/ingress.yaml deleted file mode 100644 index 40b4bba0ce..0000000000 --- a/kubernetes/aaf/components/aaf-hello/templates/ingress.yaml +++ /dev/null @@ -1,4 +0,0 @@ - -{{ include "common.ingress" . }} - - diff --git a/kubernetes/aaf/components/aaf-hello/templates/secret.yaml b/kubernetes/aaf/components/aaf-hello/templates/secret.yaml deleted file mode 100644 index 9a3f011e80..0000000000 --- a/kubernetes/aaf/components/aaf-hello/templates/secret.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{/* -# Copyright © 2020 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. -*/}} - -{{ include "common.secretFast" . }} diff --git a/kubernetes/aaf/components/aaf-hello/templates/service.yaml b/kubernetes/aaf/components/aaf-hello/templates/service.yaml deleted file mode 100644 index 149a8708a6..0000000000 --- a/kubernetes/aaf/components/aaf-hello/templates/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -{{/* -# Copyright © 2017 Amdocs, Bell Canada -# Modifications © 2020 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. -*/}} - -{{ include "common.service" . }} diff --git a/kubernetes/aaf/components/aaf-hello/values.yaml b/kubernetes/aaf/components/aaf-hello/values.yaml deleted file mode 100644 index df3abec67c..0000000000 --- a/kubernetes/aaf/components/aaf-hello/values.yaml +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright © 2017 Amdocs, Bell Canada -# Modifications © 2020 AT&T -# -# 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. -global: - aafEnabled: true - -flavor: small - -################################################################# -# Application configuration defaults. -################################################################# -# application image -aaf_init: - # You might want this in your own app. For AAF, we store in global - # replicas: 1 - fqi: aaf@aaf.osaaf.org -# This MUST match what is put in AAF's "Artifact" for Certificates - fqdn: aaf-hello -# What is put in Locator for External Access - public_fqdn: aaf.osaaf.org - cadi_latitude: "38.0" - cadi_longitude: "-72.0" - credsPath: /opt/app/osaaf/local - aafDeployFqi: deployer@people.osaaf.org - aafDeployPass: demo123456! - # aafDeployCredsExternalSecret: some secret - secret_uid: &aaf_secret_uid nbi-aaf-deploy-creds - permission_user: 1000 - permission_group: 999 - -replicaCount: 0 - -image: onap/aaf/aaf_hello:2.1.23 - -service: - name: aaf-hello - type: ClusterIP - ports: - - name: api - protocol: http - port: 8130 - -nodeSelector: {} - -affinity: {} - -secrets: - - uid: *aaf_secret_uid - type: basicAuth - externalSecret: '{{ ternary (tpl (default "" .Values.aaf_init.aafDeployCredsExternalSecret) .) "aafIsDisabled" .Values.global.aafEnabled }}' - login: '{{ .Values.aaf_init.aafDeployFqi }}' - password: '{{ .Values.aaf_init.aafDeployPass }}' - passwordPolicy: required - -# probe configuration parameters -liveness: - initialDelaySeconds: 30 - periodSeconds: 10 - # necessary to disable liveness probe when setting breakpoints - # in debugger so K8s doesn't restart unresponsive container - enabled: true - port: api - -readiness: - initialDelaySeconds: 5 - periodSeconds: 10 - port: api - -ingress: - enabled: false - service: - - baseaddr: "aafhello" - name: "aaf-hello" - port: 8130 - config: - ssl: "none" - -# Configure resource requests and limits -resources: - small: - limits: - cpu: 200m - memory: 500Mi - requests: - cpu: 10m - memory: 200Mi - large: - limits: - cpu: 400m - memory: 1Gi - requests: - cpu: 20m - memory: 500Mi - unlimited: {} diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml index ee86a2f0ca..b014360833 100644 --- a/kubernetes/aaf/values.yaml +++ b/kubernetes/aaf/values.yaml @@ -58,7 +58,6 @@ global: fqdn: "aaf-oauth" internal_port: 8140 public_port: 31112 -# Note: as hello is a sample app, find values in charts/aaf-hello/values.yaml ################################################################# # Application configuration defaults. @@ -99,8 +98,6 @@ resources: {} aaf-authz: enabled: true -aaf-hello: - enabled: false aaf-sms: enabled: true aaf-sshsm: -- 2.16.6