Merge lp://staging/~ricardokirkner/isitdeployable/in-tree-k8s-config into lp://staging/isitdeployable
Proposed by
Ricardo Kirkner
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | 271 |
| Merge reported by: | Otto Co-Pilot |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~ricardokirkner/isitdeployable/in-tree-k8s-config |
| Merge into: | lp://staging/isitdeployable |
| Diff against target: |
1900 lines (+884/-798) 27 files modified
.bzrignore (+2/-0) Makefile.k8s (+1/-109) README.k8s (+8/-68) deployment/.gitignore (+2/-0) deployment/Makefile (+154/-0) deployment/README (+44/-0) deployment/config/configmaps.yaml.tpl (+17/-0) deployment/config/deployments.yaml.tpl (+265/-0) deployment/config/devel/namespace.yaml.tpl (+6/-0) deployment/config/devel/registry.yaml (+125/-0) deployment/config/devel/services.yaml.tpl (+113/-0) deployment/config/ingress.yaml.tpl (+23/-0) deployment/config/namespace.yaml.tpl (+6/-0) deployment/config/services.yaml.tpl (+41/-0) deployment/configmaps.yaml.tpl (+0/-17) deployment/deployments.yaml.tpl (+0/-265) deployment/dev.mk (+39/-0) deployment/envrc (+1/-0) deployment/envrc.mk (+24/-0) deployment/ingress.yaml.tpl (+0/-23) deployment/namespace.yaml.tpl (+0/-6) deployment/registry.yaml (+0/-125) deployment/secrets.yaml.tpl (+13/-6) deployment/services-dev.yaml.tpl (+0/-113) deployment/services.yaml.tpl (+0/-41) envrc (+0/-1) envrc.mk (+0/-24) |
| To merge this branch: | bzr merge lp://staging/~ricardokirkner/isitdeployable/in-tree-k8s-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Guillermo Gonzalez | Approve | ||
|
Review via email:
|
|||
Commit message
reworked k8s deployment config/tooling to reduce dev/prod gap
- droppped custom devel tooling for k8s deployments
- added production-ready config/tooling for k8s deployments
- added devel-specific overrides
Description of the change
Replaced custom deployment tooling/config in-tree with the one currently used for production deployments (in ols-k8s project).
The general idea is that the ols-k8s project will stop having the Makefile and overall deployment configs and only keep the environment-
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1