From 84b84306afbc9209c54cf1204f7e2a303eeefd48 Mon Sep 17 00:00:00 2001 From: Renming Date: Mon, 12 Jun 2023 15:59:57 +0800 Subject: [PATCH] Update deployment files (#249) --- Makefile | 8 ++++++-- .../scripts/cloud-native-security-inspector-portal.yaml | 2 +- deployments/yaml/data-exporter.yaml | 2 +- deployments/yaml/manager.yaml | 2 +- deployments/yaml/scanner-trivy.yaml | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index cc744f5c..49479a79 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ KUBECTLCMD=$(shell which kubectl) SWAGGER := $(DOCKERCMD) run --rm -it -v $(HOME):$(HOME) -w $(shell pwd) quay.io/goswagger/swagger REGISTRY ?= projects.registry.vmware.com/cnsi -IMG_TAG = 0.3.2 +IMG_TAG = 0.4.0 # Image URL to use all building/pushing image targets IMG_MANAGER ?= $(REGISTRY)/manager:$(IMG_TAG) IMG_EXPORTER ?= $(REGISTRY)/exporter:$(IMG_TAG) @@ -96,9 +96,12 @@ build-risk: generate fmt vet ## Build risk binary. build-workloadscanner: generate fmt vet ## Build workloadscanner binary. CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/workloadscanner cnsi-inspector/cmd/workload-scanner/main.go +build-trivy: generate fmt vet ## Build trivy binary. + CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o bin/trivy cnsi-scanner-trivy/cmd/scanner-trivy/main.go + ##@ Build OCI images -docker-build-backend: docker-build-manager docker-build-exporter docker-build-inspector docker-build-kubebench docker-build-risk docker-build-workloadscanner +docker-build-backend: docker-build-manager docker-build-exporter docker-build-inspector docker-build-kubebench docker-build-risk docker-build-workloadscanner docker-build-scanner-trivy docker-build-all: docker-build-backend docker-build-portal @@ -198,3 +201,4 @@ gen-harbor-api: run: manifests generate fmt vet ## Run a controller from your host. go run cnsi-manager/cmd/main.go + diff --git a/cnsi-portal/scripts/cloud-native-security-inspector-portal.yaml b/cnsi-portal/scripts/cloud-native-security-inspector-portal.yaml index 7cc6195d..ec8b9214 100644 --- a/cnsi-portal/scripts/cloud-native-security-inspector-portal.yaml +++ b/cnsi-portal/scripts/cloud-native-security-inspector-portal.yaml @@ -18,7 +18,7 @@ spec: serviceAccountName: cnsi-portal-serviceaccount containers: - name: cloud-native-security-inspector-frontend - image: projects.registry.vmware.com/cnsi/portal:0.3.2 + image: projects.registry.vmware.com/cnsi/portal:0.4.0 imagePullPolicy: Always ports: - containerPort: 3800 diff --git a/deployments/yaml/data-exporter.yaml b/deployments/yaml/data-exporter.yaml index 0c491f61..1991df54 100644 --- a/deployments/yaml/data-exporter.yaml +++ b/deployments/yaml/data-exporter.yaml @@ -14,7 +14,7 @@ spec: control-plane: cnsi-exporter spec: containers: - - image: projects.registry.vmware.com/cnsi/exporter:0.3.2 + - image: projects.registry.vmware.com/cnsi/exporter:0.4.0 imagePullPolicy: IfNotPresent ports: - containerPort: 6780 diff --git a/deployments/yaml/manager.yaml b/deployments/yaml/manager.yaml index b15b378a..c7a1b7db 100644 --- a/deployments/yaml/manager.yaml +++ b/deployments/yaml/manager.yaml @@ -1323,7 +1323,7 @@ spec: - --leader-elect command: - /manager - image: projects.registry.vmware.com/cnsi/manager:0.3.2 + image: projects.registry.vmware.com/cnsi/manager:0.4.0 livenessProbe: httpGet: path: /healthz diff --git a/deployments/yaml/scanner-trivy.yaml b/deployments/yaml/scanner-trivy.yaml index 40e31b42..04b12dfa 100644 --- a/deployments/yaml/scanner-trivy.yaml +++ b/deployments/yaml/scanner-trivy.yaml @@ -14,7 +14,7 @@ spec: control-plane: cnsi-scanner-trivy spec: containers: - - image: projects.registry.vmware.com/cnsi/trivy:0.3.2 + - image: projects.registry.vmware.com/cnsi/trivy:0.4.0 imagePullPolicy: Always ports: - containerPort: 8081 @@ -58,4 +58,4 @@ spec: targetPort: 8081 nodePort: 30003 selector: - control-plane: cnsi-scanner-trivy \ No newline at end of file + control-plane: cnsi-scanner-trivy