chore(dev-flow): maintain latest changes in main branch

get rid of the dev branch eclipse-tractusx/portal#243
eclipse-tractusx · Jun 19, 2024 · c5e5edd · c5e5edd
1 parent 57601b2
commit c5e5edd
Show file tree

Hide file tree

Showing 19 changed files with 120 additions and 225 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -23,7 +23,6 @@ updates:
   # NuGet
   -
     package-ecosystem: "nuget"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -42,7 +41,6 @@ updates:
   # Github Actions
   -
     package-ecosystem: "github-actions"
-    target-branch: dev
     directory: /
     labels:
       - "dependabot"
@@ -56,7 +54,6 @@ updates:
   # Docker
   -
     package-ecosystem: "docker"
-    target-branch: dev
     directory: ./docker/
     labels:
       - "dependabot"

diff --git a/.github/workflows/chart-test.yml b/.github/workflows/chart-test.yml
@@ -23,7 +23,7 @@ on:
   push:
     paths:
       - 'charts/policy-hub/**'
-    branches: [main, dev, release-candidate]
+    branches: [main]
   pull_request:
     paths:
       - 'charts/policy-hub/**'

diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -21,7 +21,7 @@ name: Check Dependencies
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   pull_request:
     types: [opened, synchronize, reopened]
   workflow_dispatch:

diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
@@ -21,7 +21,7 @@ name: "KICS"
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [main, dev]

diff --git a/.github/workflows/migrations-docker.yml b/.github/workflows/migrations-docker.yml
@@ -31,7 +31,7 @@ on:
       - 'docker/Dockerfile-policy-hub-migrations'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -67,7 +67,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image

diff --git a/.github/workflows/quality-gate-checks.yml b/.github/workflows/quality-gate-checks.yml
@@ -29,4 +29,4 @@ jobs:
   check-quality:
     name: Check quality guidelines
     uses: eclipse-tractusx/sig-infra/.github/workflows/reusable-quality-checks.yaml@main
-    secrets: inherit
+    secrets: inherit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,8 @@ on:
     paths:
       - 'charts/**'
     branches:
-      - main
+      - 'main'
+      - 'release/v*.*.*'
 
 jobs:
   release-helm-chart:

diff --git a/.github/workflows/service-docker.yml b/.github/workflows/service-docker.yml
@@ -30,7 +30,7 @@ on:
       - 'docker/Dockerfile-policy-hub-service'
 
     branches:
-      - 'dev'
+      - 'main'
   workflow_dispatch:
 
 env:
@@ -66,7 +66,7 @@ jobs:
         with:
           images: ${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=dev
+            type=raw,value=main
             type=raw,value=${{ github.sha }}
 
       - name: Build and push Docker image

diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -20,7 +20,7 @@
 name: Sonarcloud
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:

diff --git a/.github/workflows/trivy-dev.yml → .github/workflows/trivy-main.yml b/.github/workflows/trivy-dev.yml → .github/workflows/trivy-main.yml
@@ -20,11 +20,11 @@
 # Depending on the location of your Docker container
 # you need to change the path to the specific Docker registry.
 #
-name: "Trivy Dev"
+name: "Trivy Main"
 
 on:
   push:
-    branches: [ dev ]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [ main, master ]
@@ -39,7 +39,6 @@ on:
 
 env:
   IMAGE_NAMESPACE: "tractusx"
-  IMAGE_NAME: "policy-hub"
 
 jobs:
   analyze-config:
@@ -90,16 +89,16 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-service:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/policy-hub-service:main"
           format: "sarif"
-          output: "trivy-results3.sarif"
+          output: "trivy-results2.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
         with:
-          sarif_file: "trivy-results3.sarif"
+          sarif_file: "trivy-results2.sarif"
 
   analyze-policy-hub-migrations:
     runs-on: ubuntu-latest
@@ -122,14 +121,14 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-migrations:dev"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/policy-hub-migrations:main"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results3.sarif"
           vuln-type: "os,library"
           skip-dirs: "docs/"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
         with:
-          sarif_file: "trivy-results9.sarif"
+          sarif_file: "trivy-results3.sarif"
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -24,7 +24,7 @@ name: "Trivy Stable"
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   # pull_request:
   # The branches below must be a subset of the branches above
   # branches: [ main, master ]
@@ -91,16 +91,16 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-service:latest"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/policy-hub-service:latest"
           format: "sarif"
-          output: "trivy-results3.sarif"
+          output: "trivy-results2.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
         with:
-          sarif_file: "trivy-results3.sarif"
+          sarif_file: "trivy-results2.sarif"
 
   analyze-policy-hub-migrations:
     runs-on: ubuntu-latest
@@ -123,13 +123,13 @@ jobs:
         uses: aquasecurity/trivy-action@b2933f565dbc598b29947660e66259e3c7bc8561 # v0.20.0
         with:
           # Path to Docker image
-          image-ref: "${{ env.IMAGE_NAMESPACE }}/${{ env.IMAGE_NAME }}-migrations:latest"
+          image-ref: "${{ env.IMAGE_NAMESPACE }}/policy-hub-migrations:latest"
           format: "sarif"
-          output: "trivy-results9.sarif"
+          output: "trivy-results3.sarif"
           vuln-type: "os,library"
 
       - name: Upload Trivy scan results to GitHub Security tab
         if: always()
         uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
         with:
-          sarif_file: "trivy-results9.sarif"
+          sarif_file: "trivy-results3.sarif"
diff --git a/.github/workflows/unit.tests-formatting.yml b/.github/workflows/unit.tests-formatting.yml
@@ -21,7 +21,7 @@ name: Unit-Tests and Formatting
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
     paths:
       - 'src/**'
   pull_request:

diff --git a/consortia/argocd-app-templates/appsetup-dev.yaml b/consortia/argocd-app-templates/appsetup-dev.yaml
@@ -28,7 +28,7 @@ spec:
   source:
     path: charts/policy-hub
     repoURL: 'https://github.com/eclipse-tractusx/policy-hub.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
diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
@@ -47,13 +47,13 @@ keycloak:
 
 service:
   image:
-    tag: "dev"
+    tag: "main"
   imagePullPolicy: "Always"
   swaggerEnabled: true
 
 migrations:
   image:
-    tag: "dev"
+    tag: "main"
   imagePullPolicy: "Always"
   logging:
     default: "Debug"

diff --git a/docs/technical-documentation/dev-process/Dev-flow_deploy-dev-env.md b/docs/technical-documentation/dev-process/Dev-flow_deploy-dev-env.md
@@ -7,7 +7,7 @@ flowchart LR
     end
     subgraph eclipse-tractusx
         direction LR
-        D -- PR* to dev*--> PH(policy-hub**)
+        D -- PR* to main*--> PH(policy-hub**)
         click PH "https://github.com/eclipse-tractusx/policy-hub"
     end
     subgraph Argo CD - sync to k8s cluster