Skip to content

Commit

Permalink
generate default deployment manifest (pomerium#266)
Browse files Browse the repository at this point in the history
  • Loading branch information
wasaga authored Jul 1, 2022
1 parent bfec681 commit 150b51f
Show file tree
Hide file tree
Showing 6 changed files with 524 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
- id: end-of-file-fixer
exclude: "(docs/.*|integration/tpl/files/.*)"
- id: check-yaml
exclude: "examples/.*"
exclude: "deployment.yaml"
- id: check-added-large-files
- repo: https://github.com/syntaqx/git-hooks
rev: v0.0.17
Expand Down
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,11 @@ $(ENVTEST): $(LOCALBIN)
@echo "==> $@"
@GOARCH= GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest

.PHONY: deployment
deployment:
@echo "==> $@"
@$(KUSTOMIZE) build config/default > deployment.yaml

#
# --- internal development targets
#
Expand Down
2 changes: 1 addition & 1 deletion config/gen_secrets/job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: controller:latest
image: pomerium/ingress-controller:main
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
Expand Down
6 changes: 2 additions & 4 deletions config/pomerium/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ spec:
runAsUser: 1000
containers:
- name: pomerium
command:
- /manager
args:
- all-in-one
- --global-settings=$(POMERIUM_NAMESPACE)/settings
- --update-status-from-service=$(POMERIUM_NAMESPACE)/pomerium-proxy
- --metrics-bind-address=$(POD_IP):9090
image: controller:latest
image: pomerium/ingress-controller:main
ports:
- containerPort: 443
name: https
Expand Down Expand Up @@ -50,7 +48,7 @@ spec:
cpu: 5000m
memory: 1Gi
requests:
cpu: 1000m
cpu: 300m
memory: 200Mi
serviceAccountName: pomerium-controller
terminationGracePeriodSeconds: 10
10 changes: 0 additions & 10 deletions config/samples/settings.yaml

This file was deleted.

Loading

0 comments on commit 150b51f

Please sign in to comment.