Skip to content

Fix local deployment #942

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.

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 1 commit into from
Sep 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ slim-deploy: clean-helm-rendered
helm template scanner chart/ --set scannerImage=quay.io/stackrox-io/scanner-slim,scannerDBImage=quay.io/stackrox-io/scanner-db-slim,tag=$(TAG),logLevel=$(LOGLEVEL),updateInterval=2m --output-dir rendered-chart
kubectl apply -R -f rendered-chart

# deploy-local deploys locally-built full-images (i.e. stackrox/scanner:<TAG> and stackrox/scanner-db:<TAG>)
# deploy-local deploys locally-built full-images (i.e. scanner:<TAG> and scanner-db:<TAG>)
.PHONY: deploy-local
deploy-local: clean-helm-rendered
@echo "+ $@"
kubectl create namespace stackrox || true
helm template scanner chart/ --set tag=$(TAG),logLevel=$(LOGLEVEL),updateInterval=2m,scannerImage=stackrox/scanner,scannerDBImage=stackrox/scanner-db --output-dir rendered-chart
helm template scanner chart/ --set tag=$(TAG),logLevel=$(LOGLEVEL),updateInterval=2m,scannerImage=scanner,scannerDBImage=scanner-db,imagePullPolicy=Never --output-dir rendered-chart
kubectl apply -R -f rendered-chart

.PHONY: ossls-notice
Expand Down
2 changes: 2 additions & 0 deletions chart/templates/db-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
initContainers:
- name: init-db
image: {{.Values.scannerDBImage}}:{{.Values.tag}}
imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: POSTGRES_PASSWORD_FILE
value: "/run/secrets/stackrox.io/secrets/password"
Expand All @@ -42,6 +43,7 @@ spec:
containers:
- name: db
image: {{.Values.scannerDBImage}}:{{.Values.tag}}
imagePullPolicy: {{ .Values.imagePullPolicy }}
ports:
- name: postgresql
protocol: TCP
Expand Down
1 change: 1 addition & 0 deletions chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ spec:
containers:
- name: scanner
image: {{ .Values.scannerImage}}:{{ .Values.tag }}
imagePullPolicy: {{ .Values.imagePullPolicy }}
env:
- name: POD_NAME
valueFrom:
Expand Down
1 change: 1 addition & 0 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ namespace: stackrox
scannerImage: quay.io/stackrox-io/scanner
scannerDBImage: quay.io/stackrox-io/scanner-db
tag: latest
imagePullPolicy: IfNotPresent

logLevel: info
updateInterval: 1h