From 6894e38d967bee93681f00d83e179271985dfe77 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Szwa=C5=82kiewicz?= Date: Tue, 21 Oct 2025 10:03:00 +0200 Subject: [PATCH] Upstream Argocd fixes from DT internal repo MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Issue-ID: OOM-3354 Change-Id: Ic3f806daa9341250f40985d17bab8b92f62335b4 Signed-off-by: Marek Szwałkiewicz --- argo/argocd/app-project.yaml | 35 +++++++++++++++ argo/argocd/kustomization.yaml | 3 +- argo/argocd/values/argocd.yaml | 4 +- .../values/trivy-dojo-report-operator.yaml | 11 +++++ argo/infra/compile-onap.yaml | 1 + argo/infra/compile-onap/helm/Chart.yaml | 2 +- .../helm/templates/onap-helm-render-job.yaml | 4 +- argo/infra/gateway-api/crd/kustomization.yaml | 2 +- argo/infra/ingress-routes/helm/Chart.yaml | 2 +- argo/infra/kiali-instance/kustomization.yaml | 6 +++ .../infra/kiali-instance/secrets/.dockerconfigjson | 1 + argo/infra/kustomization.yaml | 2 +- argo/infra/values/trivy-dojo-report-operator.yaml | 5 +-- argo/onap-test/ingress-routes/helm/Chart.yaml | 2 +- argo/onap-test/kustomization.yaml | 7 +++ argo/onap-test/secrets/.dockerconfigjson | 1 + .../onap-test/testkube/helm/templates/ingress.yaml | 8 ++-- .../testkube/helm/templates/job-template.tpl | 2 + .../pythonsdk-tests-add-delete-cnf-macro.yaml | 2 +- .../pythonsdk-tests-policy-framework.yaml | 2 +- .../pythonsdk-tests/pythonsdk-tests-ves-test.yaml | 2 +- .../testkube/helm/templates/scraper-template.tpl | 2 + argo/onap-test/testkube/helm/values.yaml | 45 ++++--------------- .../add_delete_cnf_macro_configuration.py | 2 +- .../basic_cps/basic_cps_configuration.py | 2 +- .../basic_status/basic_status_configuration.py | 2 +- .../basic_configuration_settings/connectivity.json | 2 +- ...tiate_service_without_resource_configuration.py | 2 +- .../pnf_macro/pnf_macro_configuration.py | 2 +- argo/onap-test/values/trivy-operator.yaml | 3 +- argo/onap/a1policymanagement/application.yaml | 51 +++++++++++++++++++++ argo/onap/aai/application.yaml | 51 +++++++++++++++++++++ argo/onap/authentication/application.yaml | 51 +++++++++++++++++++++ argo/onap/cds/application.yaml | 51 +++++++++++++++++++++ argo/onap/cps/application.yaml | 51 +++++++++++++++++++++ argo/onap/dcaegen2-services/application.yaml | 52 ++++++++++++++++++++++ argo/onap/kustomization.yaml | 30 ++++++------- argo/onap/multicloud/application.yaml | 51 +++++++++++++++++++++ argo/onap/platform/application.yaml | 51 +++++++++++++++++++++ argo/onap/policy/application.yaml | 51 +++++++++++++++++++++ argo/onap/portal-ng/application.yaml | 51 +++++++++++++++++++++ argo/onap/sdc/application.yaml | 51 +++++++++++++++++++++ argo/onap/sdnc/application.yaml | 51 +++++++++++++++++++++ argo/onap/so/application.yaml | 51 +++++++++++++++++++++ argo/onap/strimzi/application.yaml | 51 +++++++++++++++++++++ argo/onap/uui/application.yaml | 51 +++++++++++++++++++++ argo/onap/values/cassandra.yaml | 2 +- argo/onap/values/platform.yaml | 2 +- argo/onap/values/portal-ng.yaml | 2 +- argo/onap/values/sdc.yaml | 12 +++++ argo/onap/values/values-global.yaml | 12 ++--- 51 files changed, 903 insertions(+), 89 deletions(-) create mode 100644 argo/argocd/app-project.yaml create mode 100644 argo/dependencies/values/trivy-dojo-report-operator.yaml create mode 100644 argo/infra/kiali-instance/secrets/.dockerconfigjson create mode 100644 argo/onap-test/secrets/.dockerconfigjson create mode 100644 argo/onap/a1policymanagement/application.yaml create mode 100644 argo/onap/aai/application.yaml create mode 100644 argo/onap/authentication/application.yaml create mode 100644 argo/onap/cds/application.yaml create mode 100644 argo/onap/cps/application.yaml create mode 100644 argo/onap/dcaegen2-services/application.yaml create mode 100644 argo/onap/multicloud/application.yaml create mode 100644 argo/onap/platform/application.yaml create mode 100644 argo/onap/policy/application.yaml create mode 100644 argo/onap/portal-ng/application.yaml create mode 100644 argo/onap/sdc/application.yaml create mode 100644 argo/onap/sdnc/application.yaml create mode 100644 argo/onap/so/application.yaml create mode 100644 argo/onap/strimzi/application.yaml create mode 100644 argo/onap/uui/application.yaml diff --git a/argo/argocd/app-project.yaml b/argo/argocd/app-project.yaml new file mode 100644 index 0000000000..8e08f3f87a --- /dev/null +++ b/argo/argocd/app-project.yaml @@ -0,0 +1,35 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: AppProject +metadata: + name: argo-management + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + description: argo-management Project + sourceRepos: + - '*' + destinations: + - namespace: '*' + server: https://kubernetes.default.svc + clusterResourceWhitelist: + - group: '*' + kind: '*' diff --git a/argo/argocd/kustomization.yaml b/argo/argocd/kustomization.yaml index 83caa54bee..fb6b879316 100644 --- a/argo/argocd/kustomization.yaml +++ b/argo/argocd/kustomization.yaml @@ -20,5 +20,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - argocd.yaml - - argo-project.yaml - - argo-secret.yaml + - app-project.yaml diff --git a/argo/argocd/values/argocd.yaml b/argo/argocd/values/argocd.yaml index b03353bc22..567f9d602d 100644 --- a/argo/argocd/values/argocd.yaml +++ b/argo/argocd/values/argocd.yaml @@ -27,10 +27,8 @@ configs: # -- Specifies the timeout after which a sync would be terminated. 0 means no timeout #controller.sync.timeout.seconds: 600 secret: - argocdServerAdminPassword: "$2a$10$VHCTI04YLEJHZQjBmlZ89OKs8iqYF6I5sjdwRLKy4ChVxFPxt09Ue" + argocdServerAdminPassword: "argo_admin_password" # override to set ArgoCD admin password argocdServerAdminPasswordMtime: "2021-08-03T13:45:00Z" - extra: - oidc.keycloak.clientSecret: "06dc70a8-23c3-4d9f-b1f2-6ea80047c674" cm: url: "https://argocd." statusbadge.enabled: 'true' diff --git a/argo/dependencies/values/trivy-dojo-report-operator.yaml b/argo/dependencies/values/trivy-dojo-report-operator.yaml new file mode 100644 index 0000000000..245a0a0909 --- /dev/null +++ b/argo/dependencies/values/trivy-dojo-report-operator.yaml @@ -0,0 +1,11 @@ +defectDojoApiCredentials: + apiKey: "5ef22d0e4be6c9d2682434e7f4607817fcadfd01" + url: "http://defectdojo-django.defectdojo" + +operator: + trivyDojoReportOperator: + env: + defectDojoActive: "true" + defectDojoCloseOldFindings: "false" + defectDojoCloseOldFindingsProductScope: "true" + defectDojoMinimumSeverity: Critical diff --git a/argo/infra/compile-onap.yaml b/argo/infra/compile-onap.yaml index 254e4079f2..c9f295118f 100644 --- a/argo/infra/compile-onap.yaml +++ b/argo/infra/compile-onap.yaml @@ -23,6 +23,7 @@ metadata: labels: name: gating istio-injection: enabled + --- apiVersion: argoproj.io/v1alpha1 kind: Application diff --git a/argo/infra/compile-onap/helm/Chart.yaml b/argo/infra/compile-onap/helm/Chart.yaml index fc1592ba97..1c18f7a1db 100644 --- a/argo/infra/compile-onap/helm/Chart.yaml +++ b/argo/infra/compile-onap/helm/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v2 version: 0.0.1 description: Job to compile ONAP helm charts -name: compile-onap +name: compile-onap \ No newline at end of file diff --git a/argo/infra/compile-onap/helm/templates/onap-helm-render-job.yaml b/argo/infra/compile-onap/helm/templates/onap-helm-render-job.yaml index 0f0af16bd7..d840e2b024 100644 --- a/argo/infra/compile-onap/helm/templates/onap-helm-render-job.yaml +++ b/argo/infra/compile-onap/helm/templates/onap-helm-render-job.yaml @@ -30,7 +30,7 @@ spec: spec: containers: - name: onap-helm-rendering - image: artifactory.devops.telekom.de/onap-repo/onap/k8s-toolbox:1.1.0 + image: /onap/k8s-toolbox:1.1.0 #image: nexus3.onap.org:10003/onap/k8s-toolbox:1.1.0 args: - /bin/bash @@ -56,4 +56,4 @@ spec: cd kubernetes make SKIP_LINT=TRUE all #make SKIP_LINT=TRUE onap - restartPolicy: Never + restartPolicy: Never \ No newline at end of file diff --git a/argo/infra/gateway-api/crd/kustomization.yaml b/argo/infra/gateway-api/crd/kustomization.yaml index 168e004cff..9eaf544fba 100644 --- a/argo/infra/gateway-api/crd/kustomization.yaml +++ b/argo/infra/gateway-api/crd/kustomization.yaml @@ -26,4 +26,4 @@ resources: - standard/gateway.networking.k8s.io_gateways.yaml - standard/gateway.networking.k8s.io_grpcroutes.yaml - standard/gateway.networking.k8s.io_httproutes.yaml - - standard/gateway.networking.k8s.io_referencegrants.yaml + - standard/gateway.networking.k8s.io_referencegrants.yaml \ No newline at end of file diff --git a/argo/infra/ingress-routes/helm/Chart.yaml b/argo/infra/ingress-routes/helm/Chart.yaml index 7b45819a96..f5156af15e 100644 --- a/argo/infra/ingress-routes/helm/Chart.yaml +++ b/argo/infra/ingress-routes/helm/Chart.yaml @@ -19,4 +19,4 @@ apiVersion: v2 version: 0.0.1 description: Chart to create gateway and Ingress Routes -name: ingress +name: ingress \ No newline at end of file diff --git a/argo/infra/kiali-instance/kustomization.yaml b/argo/infra/kiali-instance/kustomization.yaml index 13b6e21a01..7930fd7e00 100644 --- a/argo/infra/kiali-instance/kustomization.yaml +++ b/argo/infra/kiali-instance/kustomization.yaml @@ -19,5 +19,11 @@ kind: Kustomization apiVersion: kustomize.config.k8s.io/v1beta1 +secretGenerator: + - name: onap-docker-registry-key-kiali + files: + - secrets/.dockerconfigjson + type: kubernetes.io/dockerconfigjson + resources: - kiali-instance.yaml diff --git a/argo/infra/kiali-instance/secrets/.dockerconfigjson b/argo/infra/kiali-instance/secrets/.dockerconfigjson new file mode 100644 index 0000000000..2ee9e46277 --- /dev/null +++ b/argo/infra/kiali-instance/secrets/.dockerconfigjson @@ -0,0 +1 @@ +{"auths":{}} diff --git a/argo/infra/kustomization.yaml b/argo/infra/kustomization.yaml index 5b42a4c940..d6fa4424bf 100644 --- a/argo/infra/kustomization.yaml +++ b/argo/infra/kustomization.yaml @@ -39,4 +39,4 @@ resources: - infra-ingress.yaml - django-defectdojo.yaml - trivy-dojo-report-operator.yaml - - compile-onap.yaml + diff --git a/argo/infra/values/trivy-dojo-report-operator.yaml b/argo/infra/values/trivy-dojo-report-operator.yaml index 55cb7362d2..48cdddff09 100644 --- a/argo/infra/values/trivy-dojo-report-operator.yaml +++ b/argo/infra/values/trivy-dojo-report-operator.yaml @@ -17,9 +17,8 @@ # ============LICENSE_END========================================================= defectDojoApiCredentials: - apiKey: "2e5af2a04069492ea63cbd593efccfd4b2758b77" - url: "http://defectdojo-django.defectdojo" - #url: "https://defectdojo." + apiKey: "." operator: trivyDojoReportOperator: diff --git a/argo/onap-test/ingress-routes/helm/Chart.yaml b/argo/onap-test/ingress-routes/helm/Chart.yaml index 3b96e8298c..296c3615a9 100644 --- a/argo/onap-test/ingress-routes/helm/Chart.yaml +++ b/argo/onap-test/ingress-routes/helm/Chart.yaml @@ -18,4 +18,4 @@ apiVersion: v2 version: 0.0.1 description: Chart to create gateway and Ingress Routes -name: ingress +name: ingress \ No newline at end of file diff --git a/argo/onap-test/kustomization.yaml b/argo/onap-test/kustomization.yaml index 7518ca39e8..1dcafab8d7 100644 --- a/argo/onap-test/kustomization.yaml +++ b/argo/onap-test/kustomization.yaml @@ -22,6 +22,13 @@ kind: Kustomization generatorOptions: disableNameSuffixHash: true +secretGenerator: + - name: artifactory-docker-secret + namespace: testkube + files: + - secrets/.dockerconfigjson + type: kubernetes.io/dockerconfigjson + resources: - testkube.yaml - kafka-ui.yaml diff --git a/argo/onap-test/secrets/.dockerconfigjson b/argo/onap-test/secrets/.dockerconfigjson new file mode 100644 index 0000000000..2ee9e46277 --- /dev/null +++ b/argo/onap-test/secrets/.dockerconfigjson @@ -0,0 +1 @@ +{"auths":{}} diff --git a/argo/onap-test/testkube/helm/templates/ingress.yaml b/argo/onap-test/testkube/helm/templates/ingress.yaml index 0f40a3e236..c8e2f98661 100644 --- a/argo/onap-test/testkube/helm/templates/ingress.yaml +++ b/argo/onap-test/testkube/helm/templates/ingress.yaml @@ -20,7 +20,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: testkube-route - namespace: onap + namespace: {{ .Release.Namespace }} spec: parentRefs: - name: common-gateway @@ -37,7 +37,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: testkube-redirect-route - namespace: onap + namespace: {{ .Release.Namespace }} spec: parentRefs: - name: common-gateway @@ -57,7 +57,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: testkube-api-route - namespace: onap + namespace: {{ .Release.Namespace }} spec: parentRefs: - name: common-gateway @@ -74,7 +74,7 @@ apiVersion: gateway.networking.k8s.io/v1beta1 kind: HTTPRoute metadata: name: testkube-api-redirect-route - namespace: onap + namespace: {{ .Release.Namespace }} spec: parentRefs: - name: common-gateway diff --git a/argo/onap-test/testkube/helm/templates/job-template.tpl b/argo/onap-test/testkube/helm/templates/job-template.tpl index 9693c551ff..b6a5d8624c 100644 --- a/argo/onap-test/testkube/helm/templates/job-template.tpl +++ b/argo/onap-test/testkube/helm/templates/job-template.tpl @@ -7,6 +7,8 @@ jobTemplate: | annotations: argocd.argoproj.io/compare-options: IgnoreExtraneous argocd.argoproj.io/sync-options: Prune=false + labels: + security-scan: off spec: template: spec: diff --git a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-add-delete-cnf-macro.yaml b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-add-delete-cnf-macro.yaml index 52c541910d..93563b41b0 100644 --- a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-add-delete-cnf-macro.yaml +++ b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-add-delete-cnf-macro.yaml @@ -17,4 +17,4 @@ # ============LICENSE_END========================================================= {{- if .Values.tests.tests.addDeleteCnfMacro.enabled }} {{ include "smoke.test" (dict "testName" .Values.tests.tests.addDeleteCnfMacro.testName "onapTestName" "add_delete_cnf_macro" "dot" .) }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-policy-framework.yaml b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-policy-framework.yaml index 76d35831c3..7c2499c062 100644 --- a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-policy-framework.yaml +++ b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-policy-framework.yaml @@ -17,4 +17,4 @@ # ============LICENSE_END========================================================= {{- if .Values.tests.tests.policyFramework.enabled }} {{ include "smoke.test" (dict "testName" .Values.tests.tests.policyFramework.testName "onapTestName" "basic_policy" "dot" .) }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-ves-test.yaml b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-ves-test.yaml index 6c7f9c27e9..ce9c74ebf0 100644 --- a/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-ves-test.yaml +++ b/argo/onap-test/testkube/helm/templates/pythonsdk-tests/pythonsdk-tests-ves-test.yaml @@ -17,4 +17,4 @@ # ============LICENSE_END========================================================= {{- if .Values.tests.tests.vesPublish.enabled }} {{ include "smoke.test" (dict "testName" .Values.tests.tests.vesPublish.testName "onapTestName" "ves_publish" "dot" .) }} -{{- end }} +{{- end }} \ No newline at end of file diff --git a/argo/onap-test/testkube/helm/templates/scraper-template.tpl b/argo/onap-test/testkube/helm/templates/scraper-template.tpl index bef7b2d6e4..535834d69b 100644 --- a/argo/onap-test/testkube/helm/templates/scraper-template.tpl +++ b/argo/onap-test/testkube/helm/templates/scraper-template.tpl @@ -7,6 +7,8 @@ scraperTemplate: | annotations: argocd.argoproj.io/compare-options: IgnoreExtraneous argocd.argoproj.io/sync-options: Prune=false + labels: + security-scan: off spec: template: spec: diff --git a/argo/onap-test/testkube/helm/values.yaml b/argo/onap-test/testkube/helm/values.yaml index af8c2573bf..db0ea47909 100644 --- a/argo/onap-test/testkube/helm/values.yaml +++ b/argo/onap-test/testkube/helm/values.yaml @@ -44,6 +44,13 @@ serviceMesh: imagePullSecrets: - name: onap-docker-registry-key +testkube-dashboard: + image: + tag: 1.16.15 +testkube-server: + image: + tag: 1.16.40 + tests: testEnvName: "" configuration: @@ -52,42 +59,6 @@ tests: path: /argo/onap-test/testkube/pythonsdk-tests branch: main secretName: testkube-git-creds - gradle: - uri: https://git.onap.org/integration/java-tests - branch: main - image: /kubeshop/testkube-gradle-executor:1.16.39 - tests: - aai: - aaiTraversalTest: - enabled: true - testName: TraversalTest - env: - AAI_BASEURL: http://aai.onap/aai/v30 - aaiCrudTest: - enabled: true - testName: AAICrudTest - env: - AAI_BASEURL: http://aai.onap/aai/v30 - kafkaTest: - enabled: false - testName: KafkaTest - branch: kafka - env: - AAI_BASEURL: http://aai.onap/aai/v30 - cypress: - uri: https://git.onap.org/integration/cypress-tests - branch: main - image: /kubeshop/testkube-cypress-executor:1.16.39 - tests: - portalng: - someTest: - enabled: true - testName: foo - env: - CYPRESS_KEYCLOAK_URL: https://keycloak-ui. - CYPRESS_PORTAL_NG_URL: https://portal-ng-ui. - CYPRESS_PORTAL_NG_USERNAME: onap-admin - CYPRESS_PORTAL_NG_PASSWORD: password tests: basicCds: @@ -270,6 +241,7 @@ testkube: enabled: true labels: sidecar.istio.io/inject: "false" + security-scan: "off" image: registry: migrate: @@ -280,6 +252,7 @@ testkube: registry: labels: sidecar.istio.io/inject: "false" + security-scan: "off" proxy: image: registry: diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/add_delete_cnf_macro/add_delete_cnf_macro_configuration.py b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/add_delete_cnf_macro/add_delete_cnf_macro_configuration.py index a2baa455ff..d103ebbb49 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/add_delete_cnf_macro/add_delete_cnf_macro_configuration.py +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/add_delete_cnf_macro/add_delete_cnf_macro_configuration.py @@ -1,4 +1,4 @@ from onaptests.configuration.add_delete_cnf_macro_settings import * from global_tests_settings import * -SERVICE_INSTANCE_NAME = f"add_delete_cnf_macro_{str(uuid4())}" +SERVICE_INSTANCE_NAME = f"add_delete_cnf_macro_{str(uuid4())}" \ No newline at end of file diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_cps/basic_cps_configuration.py b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_cps/basic_cps_configuration.py index 3802c94081..bbab6f82f2 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_cps/basic_cps_configuration.py +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_cps/basic_cps_configuration.py @@ -3,4 +3,4 @@ from global_tests_settings import * CHECK_POSTGRESQL = True -DB_PRIMARY_HOST = "tcp-pgset-primary" +DB_PRIMARY_HOST = "tcp-pgset-primary.onap.svc.cluster.local" diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_status/basic_status_configuration.py b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_status/basic_status_configuration.py index 874e08960b..4875cfdcca 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_status/basic_status_configuration.py +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/basic_status/basic_status_configuration.py @@ -10,4 +10,4 @@ WAIVER_LIST = ['integration', 'jaeger', 'performance-test', 'medusa-purge', 'wir EXCLUDE_NAMESPACE_LIST = ['nonrtric-rapp', 'kyverno', 'cluster-observability'] CHECK_ALL_NAMESPACES = True -LOG_CONFIG["handlers"]["file"]["level"] = "INFO" +LOG_CONFIG["handlers"]["file"]["level"] = "INFO" \ No newline at end of file diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/connectivity.json b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/connectivity.json index d3fa0019f2..a98dee4169 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/connectivity.json +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/connectivity.json @@ -3,4 +3,4 @@ "cloud-owner":"basiccnf-cloud-owner", "other-connectivity-list": {"connectivity-records":[]} -} +} \ No newline at end of file diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/instantiate_service_without_resource/instantiate_service_without_resource_configuration.py b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/instantiate_service_without_resource/instantiate_service_without_resource_configuration.py index 13e348694a..db6416cd28 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/instantiate_service_without_resource/instantiate_service_without_resource_configuration.py +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/instantiate_service_without_resource/instantiate_service_without_resource_configuration.py @@ -1,2 +1,2 @@ from onaptests.configuration.instantiate_service_without_resource_settings import * -from global_tests_settings import * +from global_tests_settings import * \ No newline at end of file diff --git a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/pnf_macro/pnf_macro_configuration.py b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/pnf_macro/pnf_macro_configuration.py index c67553d2a2..fcb8d4ec43 100644 --- a/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/pnf_macro/pnf_macro_configuration.py +++ b/argo/onap-test/testkube/pythonsdk-tests/basic_configuration_settings/pnf_macro/pnf_macro_configuration.py @@ -3,4 +3,4 @@ from global_tests_settings import * USE_SIMULATOR = True PNF_SIMULATOR_URL = "pnf-macro-test-simulator.onap-tests" -PNF_SIMULATOR_PORT = "5000" +PNF_SIMULATOR_PORT = "5000" \ No newline at end of file diff --git a/argo/onap-test/values/trivy-operator.yaml b/argo/onap-test/values/trivy-operator.yaml index f92f8709ff..86375cbf44 100644 --- a/argo/onap-test/values/trivy-operator.yaml +++ b/argo/onap-test/values/trivy-operator.yaml @@ -59,7 +59,8 @@ operator: image: registry: trivyOperator: - skipResourceByLabels: "test-name" + # scraper job is annotated with 'testkube' label + skipResourceByLabels: "testkube,app.kubernetes.io/instance=testkube,argocd.argoproj.io/instance=testkube,security-scan=off" trivy: resources: requests: diff --git a/argo/onap/a1policymanagement/application.yaml b/argo/onap/a1policymanagement/application.yaml new file mode 100644 index 0000000000..327a8b92b2 --- /dev/null +++ b/argo/onap/a1policymanagement/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-a1policymanagement + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: a1policymanagement + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/a1policymanagement.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/aai/application.yaml b/argo/onap/aai/application.yaml new file mode 100644 index 0000000000..913df22206 --- /dev/null +++ b/argo/onap/aai/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-aai + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: aai + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/aai.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/authentication/application.yaml b/argo/onap/authentication/application.yaml new file mode 100644 index 0000000000..96ee57b0f1 --- /dev/null +++ b/argo/onap/authentication/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-authentication + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: authentication + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/authentication.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/cds/application.yaml b/argo/onap/cds/application.yaml new file mode 100644 index 0000000000..04698bd2cd --- /dev/null +++ b/argo/onap/cds/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-cds + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: cds + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/cds.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/cps/application.yaml b/argo/onap/cps/application.yaml new file mode 100644 index 0000000000..aa1f46d38c --- /dev/null +++ b/argo/onap/cps/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-cps + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: cps + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/cps.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/dcaegen2-services/application.yaml b/argo/onap/dcaegen2-services/application.yaml new file mode 100644 index 0000000000..64e5594dba --- /dev/null +++ b/argo/onap/dcaegen2-services/application.yaml @@ -0,0 +1,52 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-dcaegen2-services + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: dcaegen2-services + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/dcaegen2-services.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + - ServerSideApply=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/kustomization.yaml b/argo/onap/kustomization.yaml index 4953d57e3d..51e837e461 100644 --- a/argo/onap/kustomization.yaml +++ b/argo/onap/kustomization.yaml @@ -19,21 +19,21 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - a1policymanagement.yaml - - aai.yaml - - authentication.yaml - - cds.yaml - - cps.yaml - - dcaegen2-services.yaml - - multicloud.yaml - - platform.yaml - - policy.yaml - - portal-ng.yaml - - sdc.yaml - - sdnc.yaml - - so.yaml - - uui.yaml - - strimzi.yaml + - a1policymanagement/application.yaml + - aai/application.yaml + - authentication/application.yaml + - cds/application.yaml + - cps/application.yaml + - dcaegen2-services/application.yaml + - multicloud/application.yaml + - platform/application.yaml + - policy/application.yaml + - portal-ng/application.yaml + - sdc/application.yaml + - sdnc/application.yaml + - so/application.yaml + - uui/application.yaml + - strimzi/application.yaml - common/cassandra.yaml - common/mariadb-galera.yaml - common/postgres.yaml diff --git a/argo/onap/multicloud/application.yaml b/argo/onap/multicloud/application.yaml new file mode 100644 index 0000000000..8fdd1bf1a5 --- /dev/null +++ b/argo/onap/multicloud/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-multicloud + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: multicloud + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/multicloud.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/platform/application.yaml b/argo/onap/platform/application.yaml new file mode 100644 index 0000000000..1aef4f2d82 --- /dev/null +++ b/argo/onap/platform/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-platform + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: platform + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/platform.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/policy/application.yaml b/argo/onap/policy/application.yaml new file mode 100644 index 0000000000..5a3f26491f --- /dev/null +++ b/argo/onap/policy/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-policy + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: policy + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/policy.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/portal-ng/application.yaml b/argo/onap/portal-ng/application.yaml new file mode 100644 index 0000000000..3cadc5ca3c --- /dev/null +++ b/argo/onap/portal-ng/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-portal-ng + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: portal-ng + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/portal-ng.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/sdc/application.yaml b/argo/onap/sdc/application.yaml new file mode 100644 index 0000000000..1f825f65e4 --- /dev/null +++ b/argo/onap/sdc/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-sdc + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: sdc + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/sdc.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/sdnc/application.yaml b/argo/onap/sdnc/application.yaml new file mode 100644 index 0000000000..75122a0d5f --- /dev/null +++ b/argo/onap/sdnc/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-sdnc + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: sdnc + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/sdnc.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/so/application.yaml b/argo/onap/so/application.yaml new file mode 100644 index 0000000000..a144b8b431 --- /dev/null +++ b/argo/onap/so/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-so + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: so + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/so.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/strimzi/application.yaml b/argo/onap/strimzi/application.yaml new file mode 100644 index 0000000000..a56fa32562 --- /dev/null +++ b/argo/onap/strimzi/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-strimzi + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: strimzi + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/strimzi.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/uui/application.yaml b/argo/onap/uui/application.yaml new file mode 100644 index 0000000000..db98a9214c --- /dev/null +++ b/argo/onap/uui/application.yaml @@ -0,0 +1,51 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2025 Deutsche Telekom +# ================================================================================ +# 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========================================================= +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: onap-uui + namespace: argocd + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: onap + server: https://kubernetes.default.svc + project: default + sources: + - repoURL: '' + targetRevision: + ref: defaultValues + - repoURL: http://chartmuseum.chartmuseum:8080 + chart: uui + targetRevision: "*" + helm: + ignoreMissingValueFiles: true + valueFiles: + - $defaultValues/argo/onap/values/values-global.yaml + - $defaultValues/argo/onap/values/uui.yaml + syncPolicy: + managedNamespaceMetadata: + labels: + istio-injection: enabled + syncOptions: + - CreateNamespace=true + automated: + prune: true + selfHeal: true diff --git a/argo/onap/values/cassandra.yaml b/argo/onap/values/cassandra.yaml index 2a3c686dd2..89109920f3 100644 --- a/argo/onap/values/cassandra.yaml +++ b/argo/onap/values/cassandra.yaml @@ -18,4 +18,4 @@ k8ssandraOperator: persistence: - storageClassName: + storageClassName: \ No newline at end of file diff --git a/argo/onap/values/platform.yaml b/argo/onap/values/platform.yaml index a3ef1da6da..47a02d53dd 100644 --- a/argo/onap/values/platform.yaml +++ b/argo/onap/values/platform.yaml @@ -19,4 +19,4 @@ cmpv2-cert-provider: enabled: false oom-cert-service: - enabled: false + enabled: false \ No newline at end of file diff --git a/argo/onap/values/portal-ng.yaml b/argo/onap/values/portal-ng.yaml index 72621163d9..9323f15fc9 100644 --- a/argo/onap/values/portal-ng.yaml +++ b/argo/onap/values/portal-ng.yaml @@ -18,4 +18,4 @@ global: # setting for mongodb - storageClass: + storageClass: \ No newline at end of file diff --git a/argo/onap/values/sdc.yaml b/argo/onap/values/sdc.yaml index 877dff51f9..5e7b7c3ef2 100644 --- a/argo/onap/values/sdc.yaml +++ b/argo/onap/values/sdc.yaml @@ -21,6 +21,10 @@ sdc-cs: argocd.argoproj.io/hook: Sync argocd.argoproj.io/hook-delete-policy: BeforeHookCreation +sdc-fe: + ingress: + enabled: true + sdc-be: jobAnnotations: argocd.argoproj.io/hook: Sync @@ -35,3 +39,11 @@ sdc-wfd-be: jobAnnotations: argocd.argoproj.io/hook: Sync argocd.argoproj.io/hook-delete-policy: BeforeHookCreation + podAnnotations: + proxy.istio.io/config: | + tracing: + sampling: 0 + +sdc-wfd-fe: + ingress: + enabled: true diff --git a/argo/onap/values/values-global.yaml b/argo/onap/values/values-global.yaml index a1b6b71864..315c05816c 100644 --- a/argo/onap/values/values-global.yaml +++ b/argo/onap/values/values-global.yaml @@ -44,15 +44,15 @@ global: repositoryCred: user: docker password: docker - busyboxImage: busybox:1.34.1 - curlImage: curlimages/curl:7.80.0 + busyboxImage: busybox:1.37.0 + curlImage: curlimages/curl:8.14.1 envsubstImage: dibi/envsubst:latest htpasswdImage: xmartlabs/htpasswd:latest - kubectlImage: bitnami/kubectl:1.22.4 + kubectlImage: bitnami/kubectl:1.22.16 loggingImage: beats/filebeat:5.5.0 mongodbImage: percona/percona-server-mongodb:7.0.16-10 mariadbImage: mariadb:11.7.2 - nginxImage: bitnami/nginx:1.21.4 + nginxImage: bitnami/nginx:1.29.0 postgresImage: crunchydata/crunchy-postgres:centos8-13.2-4.6.1 readinessImage: onap/oom/readiness:6.2.0 # Default definition of the secret containing the docker image repository @@ -76,9 +76,9 @@ global: # enable this if you have deployed Jaeger alongside ONAP tracing: - enabled: false + enabled: true collector: - baseUrl: http://jaeger-collector.istio-config + baseUrl: http://jaeger-collector.istio-system port: zipkin: 9411 otlpGrpc: 4317 -- 2.16.6