Skip to content
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
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ load('.tilt-support', 'deploy_repo')

operator_controller = {
'image': 'quay.io/operator-framework/operator-controller',
'yaml': 'config/overlays/cert-manager',
'yaml': 'config/overlays/tilt-local-dev',
'binaries': {
'./cmd/operator-controller': 'operator-controller-controller-manager',
},
Expand Down
16 changes: 16 additions & 0 deletions config/overlays/tilt-local-dev/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# kustomization file for secure operator-controller
# DO NOT ADD A NAMESPACE HERE
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../base
components:
- ../../components/tls
# ca must be last or tls will overwrite the namespaces
- ../../components/ca

patches:
- target:
kind: Deployment
name: controller-manager
path: patches/dev-deployment.yaml
13 changes: 13 additions & 0 deletions config/overlays/tilt-local-dev/patches/dev-deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# remove livenessProbe and readinessProbe so container doesn't restart during breakpoints
- op: replace
path: /spec/template/spec/containers/0/livenessProbe
value: null
- op: replace
path: /spec/template/spec/containers/0/readinessProbe
value: null
- op: remove
# remove --leader-elect so container doesn't restart during breakpoints
path: /spec/template/spec/containers/0/args/2
- op: add
path: /spec/template/spec/containers/0/args/-
value: --feature-gates=PreflightPermissions=true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably ok for now, but we may want to start to think about how to handle this when we have multiple fgs. Maybe one patch / fg?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is a good thought

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's a good idea. I also just wasn't sure if we wanted to auto enable the feature flags for dev env or have individual devs manually write patches for them locally but thought i'd just throw this one in and see. I can separate it out into its own patch now before merge if you want, but you also approved it so can hold off until we have another one in the future.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Saw this yesterday afternoon, but it was too late in the day for me to say "hey please also add APIV1MetasHandler for catalogd". :)

IMHO merge this and then I'll add that separately. Would be good for me to learn more about overlays anyway.

Loading