Skip to content

Commit

Permalink
Update deployment files (#249)
Browse files Browse the repository at this point in the history
  • Loading branch information
4everming authored Jun 12, 2023
1 parent c0acd4e commit 84b8430
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion deployments/yaml/data-exporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployments/yaml/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions deployments/yaml/scanner-trivy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -58,4 +58,4 @@ spec:
targetPort: 8081
nodePort: 30003
selector:
control-plane: cnsi-scanner-trivy
control-plane: cnsi-scanner-trivy

0 comments on commit 84b8430

Please sign in to comment.