diff --git a/.woodpecker.yml b/.woodpecker.yml index 6c19b41..cb4a49f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -11,42 +11,6 @@ steps: when: - event: [push, tag] - scan: - image: quay.io/wollud1969/woodpecker-helper:0.5.1 - environment: - TRIVY_TOKEN: - from_secret: trivy_token - TRIVY_URL: - from_secret: trivy_url - DTRACK_API_KEY: - from_secret: dtrack_api_key - DTRACK_API_URL: - from_secret: dtrack_api_url - commands: - - export GOPATH=/woodpecker/go # the export is required, otherwise trivy will not consider the variable - - HOME=/home/`id -nu` - - TAG="${CI_COMMIT_TAG:-$CI_COMMIT_SHA}" - - | - trivy fs \ - --server $TRIVY_URL \ - --token $TRIVY_TOKEN \ - --format cyclonedx \ - --scanners license \ - --output /tmp/sbom.xml \ - . - - cat /tmp/sbom.xml - - | - curl -X "POST" \ - -H "Content-Type: multipart/form-data" \ - -H "X-Api-Key: $DTRACK_API_KEY" \ - -F "autoCreate=true" \ - -F "projectName=$CI_REPO" \ - -F "projectVersion=$TAG" \ - -F "bom=@/tmp/sbom.xml"\ - "$DTRACK_API_URL/api/v1/bom" - when: - - event: [push, tag] - dockerize: image: plugins/kaniko settings: @@ -73,5 +37,5 @@ steps: - export KUBECONFIG=/tmp/kubeconfig - ./deployment/deploy.sh when: - - event: tag + - event: [tag] diff --git a/deployment/config.json b/deployment/config.json index ac79582..1fd3bde 100644 --- a/deployment/config.json +++ b/deployment/config.json @@ -115,6 +115,11 @@ "label": "router", "community": "public", "oidTopics": [ + { + "oid": ".1.3.6.1.2.1.25.3.3.1.2.1", + "label": "load1", + "diff": "false" + }, { "oid": ".1.3.6.1.2.1.31.1.1.1.6.5", "label": "wan-in",