diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 913a0d79d..437b27cdc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -23,7 +23,6 @@ updates: # Github Actions - package-ecosystem: "github-actions" - target-branch: dev directory: / labels: - "dependabot" diff --git a/.github/workflows/localdev-chart-test.yaml b/.github/workflows/localdev-chart-test.yaml index 06fe22e59..221d3de97 100644 --- a/.github/workflows/localdev-chart-test.yaml +++ b/.github/workflows/localdev-chart-test.yaml @@ -23,7 +23,7 @@ on: # push: # paths: # - 'charts/localdev/**' - # branches: [main, dev] + # branches: [main] # pull_request: # paths: # - 'charts/localdev/**' diff --git a/.github/workflows/portal-chart-test.yaml b/.github/workflows/portal-chart-test.yaml index 8f1f82d75..188568496 100644 --- a/.github/workflows/portal-chart-test.yaml +++ b/.github/workflows/portal-chart-test.yaml @@ -23,7 +23,7 @@ on: push: paths: - 'charts/portal/**' - branches: [main, dev, release-candidate] + branches: [main,release-candidate] pull_request: paths: - 'charts/portal/**' diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml index 5188c5b9a..cfc6cbef7 100644 --- a/consortia/argocd-app-templates/appsetup-dev.yaml +++ b/consortia/argocd-app-templates/appsetup-dev.yaml @@ -28,7 +28,7 @@ spec: source: path: charts/portal repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: dev + targetRevision: main plugin: env: - name: AVP_SECRET diff --git a/consortia/argocd-app-templates/appsetup-upgrade.yaml b/consortia/argocd-app-templates/appsetup-upgrade.yaml deleted file mode 100644 index ff062886c..000000000 --- a/consortia/argocd-app-templates/appsetup-upgrade.yaml +++ /dev/null @@ -1,38 +0,0 @@ -############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://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 -############################################################### - -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: portal -spec: - destination: - namespace: product-portal - server: 'https://kubernetes.default.svc' - source: - path: charts/portal - repoURL: 'https://github.com/eclipse-tractusx/portal.git' - targetRevision: portal-2.0.0 - plugin: - env: - - name: AVP_SECRET - value: vault-secret - - name: helm_args - value: '-f values.yaml -f ../../consortia/environments/values-upgrade.yaml' - project: project-portal diff --git a/consortia/environments/values-upgrade.yaml b/consortia/environments/values-upgrade.yaml deleted file mode 100644 index 95f805a60..000000000 --- a/consortia/environments/values-upgrade.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################### -# Copyright (c) 2023 Contributors to the Eclipse Foundation -# -# See the NOTICE file(s) distributed with this work for additional -# information regarding copyright ownership. -# -# This program and the accompanying materials are made available under the -# terms of the Apache License, Version 2.0 which is available at -# https://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 -############################################################### - -replicaCount: 0 - -postgresql: - auth: - password: "" - replicationPassword: "" - portalPassword: "" - provisioningPassword: ""