Skip to content

chore: bump ccg to version v1.1.1 #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 19, 2025
Merged

chore: bump ccg to version v1.1.1 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a81cdae
bump ccg to version v1.1.1
gcgirish May 15, 2025
2cf167e
remove duplicate trivy scan
cgoea May 16, 2025
963f7d5
Merge branch 'main' into bump-ccg-1.1.1
johnoloughlin May 16, 2025
c5a0d2a
Merge branch 'main' into bump-ccg-1.1.1
gcgirish May 16, 2025
b1dea09
Merge branch 'main' into bump-ccg-1.1.1
cgoea May 19, 2025
babd547
remove dependency on scan-vulnerabilities
cgoea May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 1 addition & 33 deletions .github/workflows/virtual-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ permissions: {}

jobs:
pre-merge:
if: github.event_name == 'pull_request'
permissions:
contents: read
uses: open-edge-platform/orch-ci/.github/workflows/pre-merge.yml@main
Expand Down Expand Up @@ -72,38 +73,6 @@ jobs:
with:
project_folder: "."

scan-vulnerabilities:
permissions:
contents: read
name: Scan for vulnerabilities
runs-on: ubuntu-latest
timeout-minutes: 30
env:
OUTPUT_FILE: e2e-tests/trivy/trivy-fs-report.csv
steps:
- name: Checkout code
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

- name: Trivy (Filesystem)
uses: aquasecurity/trivy-action@6c175e9c4083a92bbca2f9724c8a5e33bc2d97a5 # 0.30.0
with:
scan-type: "fs"
scan-ref: "."
format: "template"
template: "@e2e-tests/trivy/trivy-scan-report.tpl"
output: ${{ env.OUTPUT_FILE }}
exit-code: 1
cache: "false"

- name: Upload evidence
if: always()
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
with:
name: trivy-fs-report
path: ${{ env.OUTPUT_FILE }}

scan-viruses:
permissions:
contents: read
Expand Down Expand Up @@ -351,7 +320,6 @@ jobs:
- lint-yaml
- lint-version
- scan-viruses
- scan-vulnerabilities
- check-changed-files
if: |
always() &&
Expand Down
4 changes: 2 additions & 2 deletions argocd/applications/templates/cluster-connect-gateway.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
sources:
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: cluster/charts/{{$appName}}
targetRevision: 1.1.1-dev-20db7ddf
targetRevision: 1.1.1
helm:
releaseName: {{$appName}}
valuesObject:
Expand All @@ -33,7 +33,7 @@ spec:
{{- mergeOverwrite $baseConfig $customConfig $overwrite | toYaml | nindent 10 }}
- repoURL: {{ required "A valid chartRepoURL entry required!" .Values.argo.chartRepoURL }}
chart: cluster/charts/cluster-connect-gateway-crd
targetRevision: 1.1.1-dev-20db7ddf
targetRevision: 1.1.1
destination:
namespace: {{$namespace}}
server: {{ required "A valid targetServer entry required!" .Values.argo.targetServer }}
Expand Down
Loading