Skip to content

Added trivy scan tekton-tasks and updated chart version of kubviz-agent #68

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

Open
akash4sh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added trivy scan tekton-tasks and updated chart version of kubviz-agent #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
67 changes: 67 additions & 0 deletions cicd/tekton-cluster-tasks/templates/trivy-scan-after-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
apiVersion: tekton.dev/v1beta1
kind: ClusterTask
metadata:
name: scan-image-after
spec:
workspaces:
- name: output
params:
- name: image
type: string
- name: timeout
type: string
default: "5m"
- name: ID
type: string
steps:
- name: scan
image: ghcr.io/kube-tarian/helmrepo-supporting-tools/trivy:latest
script: |
#!/bin/sh
trivy image --timeout $(params.timeout) $(params.image)
trivy image --timeout $(params.timeout) -f json -o /workspace/output/trivy-report.json $(params.image)
trivy image --timeout $(params.timeout) $(params.image) | grep Total
- name: store-scan-result
image: ghcr.io/kube-tarian/helmrepo-supporting-tools/trivy-db:1.0.0
env:
- name: POSTGRES_HOST
valueFrom:
secretKeyRef:
name: postgres-secret
key: host
- name: DB_USER
valueFrom:
secretKeyRef:
name: postgres-secret
key: user
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-secret
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: postgres-secret
key: dbname
- name: JSON_FILE
value: /workspace/output/trivy-report.json
script: |
#!/bin/bash
export PGPASSWORD="${POSTGRES_PASSWORD}"
export POSTGRES_HOST="${POSTGRES_HOST}"
export DB_NAME="${DB_NAME}"
export DB_USER="${DB_USER}"
export JSON_FILE="${JSON_FILE}"

/usr/local/bin/create_tables_after.sh

# echo "Storing Trivy scan results to PostgreSQL..."
job_id=$(params.ID)
scan_result=$(cat $JSON_FILE | sed "s/'/''/g")

psql -h "${POSTGRES_HOST}" -U "${DB_USER}" -d "${DB_NAME}" -c "\
INSERT INTO tekton_after_trivy_results (job_id, image) \
VALUES ('${job_id}', '$(params.image)')"

/usr/local/bin/insert_data_after.sh
67 changes: 67 additions & 0 deletions cicd/tekton-cluster-tasks/templates/trivy-scan-before-task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
apiVersion: tekton.dev/v1beta1
kind: ClusterTask
metadata:
name: scan-image-before
spec:
workspaces:
- name: output
params:
- name: image
type: string
- name: timeout
type: string
default: "5m"
- name: ID
type: string
steps:
- name: scan
image: ghcr.io/kube-tarian/helmrepo-supporting-tools/trivy:latest
script: |
#!/bin/sh
trivy image --timeout $(params.timeout) $(params.image)
trivy image --timeout $(params.timeout) -f json -o /workspace/output/trivy-report.json $(params.image)
trivy image --timeout $(params.timeout) $(params.image) | grep Total
- name: store-scan-result
image: ghcr.io/kube-tarian/helmrepo-supporting-tools/trivy-db:1.0.0
env:
- name: POSTGRES_HOST
valueFrom:
secretKeyRef:
name: postgres-secret
key: host
- name: DB_USER
valueFrom:
secretKeyRef:
name: postgres-secret
key: user
- name: POSTGRES_PASSWORD
valueFrom:
secretKeyRef:
name: postgres-secret
key: password
- name: DB_NAME
valueFrom:
secretKeyRef:
name: postgres-secret
key: dbname
- name: JSON_FILE
value: /workspace/output/trivy-report.json
script: |
#!/bin/bash
export PGPASSWORD="${POSTGRES_PASSWORD}"
export POSTGRES_HOST="${POSTGRES_HOST}"
export DB_NAME="${DB_NAME}"
export DB_USER="${DB_USER}"
export JSON_FILE="${JSON_FILE}"

/usr/local/bin/create_tables_before.sh

# echo "Storing Trivy scan results to PostgreSQL..."
job_id=$(params.ID)
scan_result=$(cat $JSON_FILE | sed "s/'/''/g")

psql -h "${POSTGRES_HOST}" -U "${DB_USER}" -d "${DB_NAME}" -c "\
INSERT INTO tekton_before_trivy_results (job_id, image) \
VALUES ('${job_id}', '$(params.image)')"

/usr/local/bin/insert_data_before.sh
2 changes: 1 addition & 1 deletion default-apps-templates/app_list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ defaultApps:
repoURL: 'https://intelops.github.io/kubviz/'
namespace: observability
chart: agent
targetRevision: "1.1.23"
targetRevision: "1.1.24"
valuesPath: infra/clusters/app-configs/{{.ClusterName}}/kubviz-agent-values.yaml
- name: external-secrets
repoURL: 'https://kube-tarian.github.io/helmrepo-supporting-tools'
Expand Down
Loading