Skip to content

Commit de82a09

Browse files
tinyzimmertinyzimmer
committed
update bundle - experimental ability to supply all variables as a map[string]interface{}
1 parent 9531f12 commit de82a09

File tree

3 files changed

+156
-136
lines changed

3 files changed

+156
-136
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ dist-konfig: $(GOX) ## Build release artifacts for the CLI
208208

209209
REFDOCS = $(CURDIR)/bin/refdocs
210210
$(REFDOCS):
211-
cd hack/gen-crd-reference-docs && go build -o $(REFDOCS) .
211+
cd hack/gen-crd-reference-docs && GO111MODULE=off go build -o $(REFDOCS) .
212212

213213
api-docs: $(REFDOCS) ## Generate API documentation
214214
go mod vendor

‎doc/konfigurations.md‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -483,20 +483,32 @@ arguments.
483483
<p>Values of external variables with values supplied as Jsonnet code.</p></td>
484484
</tr>
485485
<tr class="odd">
486+
<td><code>extVars</code><br />
487+
<em>k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON</em></td>
488+
<td><em>(Optional)</em>
489+
<p>Values for external variables. They will be used as strings or code depending on the types encountered.</p></td>
490+
</tr>
491+
<tr class="even">
486492
<td><code>tlaStr</code><br />
487493
<em>map[string]string</em></td>
488494
<td><em>(Optional)</em>
489-
<p>Values of top level arguments with string values.</p></td>
495+
<p>Values of top-level-arguments with string values.</p></td>
490496
</tr>
491-
<tr class="even">
497+
<tr class="odd">
492498
<td><code>tlaCode</code><br />
493499
<em>map[string]string</em></td>
494500
<td><em>(Optional)</em>
495-
<p>Values of top level arguments with values supplied as Jsonnet code.</p></td>
501+
<p>Values of top-level-arguments with values supplied as Jsonnet code.</p></td>
502+
</tr>
503+
<tr class="even">
504+
<td><code>tlaVars</code><br />
505+
<em>k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.JSON</em></td>
506+
<td><em>(Optional)</em>
507+
<p>Values for top level arguments. They will be used as strings or code depending on the types encountered.</p></td>
496508
</tr>
497509
</tbody>
498510
</table>
499511

500512
------------------------------------------------------------------------
501513

502-
*Generated with `gen-crd-api-reference-docs` on git commit `90d4d40`.*
514+
*Generated with `gen-crd-api-reference-docs` on git commit `03dee2e`.*

‎pkg/cmd/manifest.yaml‎

Lines changed: 139 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,133 @@
11
---
2+
apiVersion: apps/v1
3+
kind: Deployment
4+
metadata:
5+
annotations: {}
6+
labels:
7+
app: jsonnet-controller
8+
control_plane: manager
9+
name: jsonnet-controller
10+
namespace: flux-system
11+
spec:
12+
minReadySeconds: 30
13+
replicas: 1
14+
revisionHistoryLimit: 10
15+
selector:
16+
matchLabels:
17+
app: jsonnet-controller
18+
control_plane: manager
19+
strategy:
20+
rollingUpdate:
21+
maxSurge: 25%
22+
maxUnavailable: 25%
23+
type: RollingUpdate
24+
template:
25+
metadata:
26+
annotations: {}
27+
labels:
28+
app: jsonnet-controller
29+
control_plane: manager
30+
spec:
31+
containers:
32+
- args:
33+
- --leader-elect
34+
- --events-addr=http://notification-controller/
35+
command:
36+
- /manager
37+
env:
38+
- name: POD_NAMESPACE
39+
valueFrom:
40+
fieldRef:
41+
fieldPath: metadata.namespace
42+
image: ghcr.io/pelotech/jsonnet-controller:latest
43+
imagePullPolicy: IfNotPresent
44+
livenessProbe:
45+
httpGet:
46+
path: /healthz
47+
port: 8081
48+
initialDelaySeconds: 15
49+
periodSeconds: 20
50+
name: manager
51+
ports:
52+
- containerPort: 9443
53+
name: http
54+
- containerPort: 8080
55+
name: metrics
56+
readinessProbe:
57+
httpGet:
58+
path: /readyz
59+
port: 8081
60+
initialDelaySeconds: 5
61+
periodSeconds: 10
62+
resources:
63+
limits:
64+
cpu: 100m
65+
memory: 128Mi
66+
requests:
67+
cpu: 100m
68+
memory: 64Mi
69+
securityContext:
70+
allowPrivilegeEscalation: false
71+
stdin: false
72+
tty: false
73+
volumeMounts:
74+
- mountPath: /cache
75+
name: manager-cache
76+
- mountPath: /tmp
77+
name: manager-tmp
78+
imagePullSecrets: []
79+
initContainers: []
80+
securityContext:
81+
runAsNonRoot: true
82+
serviceAccountName: jsonnet-controller-sa
83+
terminationGracePeriodSeconds: 10
84+
volumes:
85+
- emptyDir: {}
86+
name: manager-cache
87+
- emptyDir: {}
88+
name: manager-tmp
89+
---
90+
apiVersion: rbac.authorization.k8s.io/v1
91+
kind: ClusterRole
92+
metadata:
93+
annotations: {}
94+
labels:
95+
app: jsonnet-controller
96+
control_plane: manager
97+
name: jsonnet-controller-leader-election-role
98+
rules:
99+
- apiGroups:
100+
- ""
101+
resources:
102+
- configmaps
103+
verbs:
104+
- create
105+
- delete
106+
- get
107+
- list
108+
- patch
109+
- update
110+
- watch
111+
- apiGroups:
112+
- coordination.k8s.io
113+
resources:
114+
- leases
115+
verbs:
116+
- create
117+
- delete
118+
- get
119+
- list
120+
- patch
121+
- update
122+
- watch
123+
- apiGroups:
124+
- ""
125+
resources:
126+
- events
127+
verbs:
128+
- create
129+
- patch
130+
---
2131
apiVersion: rbac.authorization.k8s.io/v1
3132
kind: ClusterRoleBinding
4133
metadata:
@@ -104,47 +233,6 @@ subjects:
104233
name: jsonnet-controller-sa
105234
namespace: flux-system
106235
---
107-
apiVersion: rbac.authorization.k8s.io/v1
108-
kind: ClusterRole
109-
metadata:
110-
annotations: {}
111-
labels:
112-
app: jsonnet-controller
113-
control_plane: manager
114-
name: jsonnet-controller-leader-election-role
115-
rules:
116-
- apiGroups:
117-
- ""
118-
resources:
119-
- configmaps
120-
verbs:
121-
- create
122-
- delete
123-
- get
124-
- list
125-
- patch
126-
- update
127-
- watch
128-
- apiGroups:
129-
- coordination.k8s.io
130-
resources:
131-
- leases
132-
verbs:
133-
- create
134-
- delete
135-
- get
136-
- list
137-
- patch
138-
- update
139-
- watch
140-
- apiGroups:
141-
- ""
142-
resources:
143-
- events
144-
verbs:
145-
- create
146-
- patch
147-
---
148236
apiVersion: v1
149237
kind: Service
150238
metadata:
@@ -391,17 +479,25 @@ spec:
391479
type: string
392480
description: Values of external variables with string values.
393481
type: object
482+
extVars:
483+
description: Values for external variables. They will be used
484+
as strings or code depending on the types encountered.
485+
x-kubernetes-preserve-unknown-fields: true
394486
tlaCode:
395487
additionalProperties:
396488
type: string
397-
description: Values of top level arguments with values supplied
489+
description: Values of top-level-arguments with values supplied
398490
as Jsonnet code.
399491
type: object
400492
tlaStr:
401493
additionalProperties:
402494
type: string
403-
description: Values of top level arguments with string values.
495+
description: Values of top-level-arguments with string values.
404496
type: object
497+
tlaVars:
498+
description: Values for top level arguments. They will be used
499+
as strings or code depending on the types encountered.
500+
x-kubernetes-preserve-unknown-fields: true
405501
type: object
406502
required:
407503
- interval
@@ -533,91 +629,3 @@ status:
533629
plural: ""
534630
conditions: []
535631
storedVersions: []
536-
---
537-
apiVersion: apps/v1
538-
kind: Deployment
539-
metadata:
540-
annotations: {}
541-
labels:
542-
app: jsonnet-controller
543-
control_plane: manager
544-
name: jsonnet-controller
545-
namespace: flux-system
546-
spec:
547-
minReadySeconds: 30
548-
replicas: 1
549-
revisionHistoryLimit: 10
550-
selector:
551-
matchLabels:
552-
app: jsonnet-controller
553-
control_plane: manager
554-
strategy:
555-
rollingUpdate:
556-
maxSurge: 25%
557-
maxUnavailable: 25%
558-
type: RollingUpdate
559-
template:
560-
metadata:
561-
annotations: {}
562-
labels:
563-
app: jsonnet-controller
564-
control_plane: manager
565-
spec:
566-
containers:
567-
- args:
568-
- --leader-elect
569-
- --events-addr=http://notification-controller/
570-
command:
571-
- /manager
572-
env:
573-
- name: POD_NAMESPACE
574-
valueFrom:
575-
fieldRef:
576-
fieldPath: metadata.namespace
577-
image: ghcr.io/pelotech/jsonnet-controller:latest
578-
imagePullPolicy: IfNotPresent
579-
livenessProbe:
580-
httpGet:
581-
path: /healthz
582-
port: 8081
583-
initialDelaySeconds: 15
584-
periodSeconds: 20
585-
name: manager
586-
ports:
587-
- containerPort: 9443
588-
name: http
589-
- containerPort: 8080
590-
name: metrics
591-
readinessProbe:
592-
httpGet:
593-
path: /readyz
594-
port: 8081
595-
initialDelaySeconds: 5
596-
periodSeconds: 10
597-
resources:
598-
limits:
599-
cpu: 100m
600-
memory: 128Mi
601-
requests:
602-
cpu: 100m
603-
memory: 64Mi
604-
securityContext:
605-
allowPrivilegeEscalation: false
606-
stdin: false
607-
tty: false
608-
volumeMounts:
609-
- mountPath: /cache
610-
name: manager-cache
611-
- mountPath: /tmp
612-
name: manager-tmp
613-
imagePullSecrets: []
614-
initContainers: []
615-
securityContext:
616-
runAsNonRoot: true
617-
serviceAccountName: jsonnet-controller-sa
618-
terminationGracePeriodSeconds: 10
619-
volumes:
620-
- emptyDir: {}
621-
name: manager-cache
622-
- emptyDir: {}
623-
name: manager-tmp

0 commit comments

Comments
 (0)