Skip to content

Commit 1667364

Browse files
committed
WIP: tilt support
Signed-off-by: Todd Short <[email protected]>
1 parent 0576a71 commit 1667364

6 files changed

+36
-2
lines changed

.tilt-support

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,4 @@ def deploy_repo(data, tags="", debug=True):
150150
local_port = repo['starting_debug_port']
151151
build_binary(reponame, repo['binary'], repo['deps'], repo['image'], tags, debug)
152152
k8s_resource(repo['deployment'], port_forwards=['{}:30000'.format(local_port)])
153-
process_yaml(kustomize(data['yaml']))
153+
process_yaml(helm('helm/olmv1', name="olmv1", values=[data['yaml']]))

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ olmv1 = {
1717
'starting_debug_port': 30000,
1818
},
1919
},
20-
'yaml': 'config/overlays/tilt-local-dev',
20+
'yaml': 'helm/tilt.yaml',
2121
}
2222

2323
deploy_repo(olmv1, '-tags containers_image_openpgp')

helm/olmv1/templates/29-deployment-olmv1-system-catalogd-controller-manager.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ spec:
5454
- linux
5555
containers:
5656
- args:
57+
{{- if not .Values.features.tilt.enabled }}
5758
- --leader-elect
59+
{{- end }}
5860
- --metrics-bind-address=:7443
5961
- --external-address=catalogd-service.{{ .Values.namespaces.olmv1.name }}.svc
6062
{{- if .Values.features.apiV1MetasHandler.enabled }}
@@ -82,19 +84,23 @@ spec:
8284
{{- end }}
8385
image: "{{ .Values.components.catalogd.deployment.image }}"
8486
imagePullPolicy: {{ .Values.components.catalogd.deployment.imagePullPolicy }}
87+
{{- if not .Values.features.tilt.enabled }}
8588
livenessProbe:
8689
httpGet:
8790
path: /healthz
8891
port: 8081
8992
initialDelaySeconds: 15
9093
periodSeconds: 20
94+
{{- end }}
9195
name: manager
96+
{{- if not .Values.features.tilt.enabled }}
9297
readinessProbe:
9398
httpGet:
9499
path: /readyz
95100
port: 8081
96101
initialDelaySeconds: 5
97102
periodSeconds: 10
103+
{{- end }}
98104
resources:
99105
requests:
100106
cpu: 100m

helm/olmv1/templates/30-deployment-olmv1-system-operator-controller-controller-manager.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ spec:
5555
- args:
5656
- --health-probe-bind-address=:8081
5757
- --metrics-bind-address=:8443
58+
{{- if not .Values.features.tilt.enabled }}
5859
- --leader-elect
60+
{{- end }}
5961
{{- if .Values.features.apiV1MetasHandler.enabled }}
6062
- --feature-gates=WebhookProviderCertManager=true
6163
{{- end }}
@@ -92,19 +94,23 @@ spec:
9294
image: "{{ .Values.components.operatorController.deployment.image }}"
9395
image: quay.io/operator-framework/operator-controller:devel
9496
imagePullPolicy: {{ .Values.components.operatorController.deployment.imagePullPolicy }}
97+
{{- if not .Values.features.tilt.enabled }}
9598
livenessProbe:
9699
httpGet:
97100
path: /healthz
98101
port: 8081
99102
initialDelaySeconds: 15
100103
periodSeconds: 20
104+
{{- end }}
101105
name: manager
106+
{{- if not .Values.features.tilt.enabled }}
102107
readinessProbe:
103108
httpGet:
104109
path: /readyz
105110
port: 8081
106111
initialDelaySeconds: 5
107112
periodSeconds: 10
113+
{{- end }}
108114
resources:
109115
requests:
110116
cpu: 10m

helm/olmv1/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ components:
5252
enabled: false
5353

5454
features:
55+
tilt:
56+
enabled: false
5557
apiV1MetasHandler:
5658
enabled: false
5759
webhookProviderCertManager:

helm/tilt.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# experimental values for OLMv1.
2+
# This is a YAML-formatted file.
3+
# Declare variables to be passed into your templates.
4+
5+
features:
6+
tilt:
7+
enabled: true
8+
apiV1MetasHandler:
9+
enabled: true
10+
webhookProviderCertManager:
11+
enabled: true
12+
singleOwnNamespaceInstallSupport:
13+
enabled: true
14+
preflightPermissions:
15+
enabled: true
16+
helmChartSupport:
17+
enabled: true
18+
19+
# This can be one of: standard or experimental
20+
featureSet: experimental

0 commit comments

Comments
 (0)