@@ -264,7 +264,7 @@ spec:
264264 subjects :
265265 - kind : ServiceAccount
266266 name : couchbase-operator
267- namespace : ' {{ registry "namespace" | json }}'
267+ namespace : ' {{ registry "namespace" }}'
268268 - name : couchbase-operator-deployment
269269 singleton : true
270270 template :
@@ -309,116 +309,116 @@ spec:
309309 apiVersion : v1
310310 kind : Secret
311311 metadata :
312- name : ' {{ printf "%v-admin" (registry "instance-name") | json }}'
312+ name : ' {{ printf "%v-admin" (registry "instance-name") }}'
313313 stringData :
314314 username : Administrator
315- password : ' {{ parameter "/password" | json }}'
315+ password : ' {{ parameter "/password" }}'
316316 - name : couchbase-operator-tls-secret
317317 template :
318318 apiVersion : v1
319319 kind : Secret
320320 metadata :
321- name : ' {{ printf "%v-operator-tls" (registry "instance-name") | json }}'
321+ name : ' {{ printf "%v-operator-tls" (registry "instance-name") }}'
322322 stringData :
323- ca.crt : ' {{ registry "ca-cert" | json }}'
323+ ca.crt : ' {{ registry "ca-cert" }}'
324324 - name : couchbase-server-tls-secret
325325 template :
326326 apiVersion : v1
327327 kind : Secret
328328 metadata :
329- name : ' {{ printf "%v-server-tls" (registry "instance-name") | json }}'
329+ name : ' {{ printf "%v-server-tls" (registry "instance-name") }}'
330330 stringData :
331- pkey.key : ' {{ registry "server-key" | json }}'
332- chain.pem : ' {{ registry "server-cert" | json }}'
331+ pkey.key : ' {{ registry "server-key" }}'
332+ chain.pem : ' {{ registry "server-cert" }}'
333333 - name : selector-snippet
334334 template :
335335 matchLabels :
336- cluster : ' {{ registry "instance-name" | json }}'
336+ cluster : ' {{ registry "instance-name" }}'
337337 - name : couchbase-developer-private
338338 template :
339339 apiVersion : couchbase.com/v2
340340 kind : CouchbaseCluster
341341 metadata :
342- name : ' {{ registry "instance-name" | json }}'
342+ name : ' {{ registry "instance-name" }}'
343343 spec :
344- image : ' {{ parameter "/image" | default "couchbase/server:6.5.0" | json }}'
344+ image : ' {{ parameter "/image" | default "couchbase/server:6.5.0" }}'
345345 security :
346- adminSecret : ' {{ printf "%v-admin" (registry "instance-name") | json }}'
346+ adminSecret : ' {{ printf "%v-admin" (registry "instance-name") }}'
347347 rbac :
348348 managed : true
349- selector : ' {{ snippet "selector-snippet" | json }}'
349+ selector : ' {{ snippet "selector-snippet" }}'
350350 networking :
351351 tls :
352352 static :
353- operatorSecret : ' {{ printf "%v-operator-tls" (registry "instance-name") | json }}'
354- serverSecret : ' {{ printf "%v-server-tls" (registry "instance-name") | json }}'
353+ operatorSecret : ' {{ printf "%v-operator-tls" (registry "instance-name") }}'
354+ serverSecret : ' {{ printf "%v-server-tls" (registry "instance-name") }}'
355355 buckets :
356356 managed : true
357- selector : ' {{ snippet "selector-snippet" | json }}'
357+ selector : ' {{ snippet "selector-snippet" }}'
358358 servers :
359359 - name : default
360360 services :
361361 - data
362362 - index
363363 - query
364- size : ' {{ parameter "/size" | default 3 | json }}'
364+ size : ' {{ parameter "/size" | default 3 }}'
365365 - name : couchbase-bucket
366366 template :
367367 apiVersion : couchbase.com/v2
368368 kind : CouchbaseBucket
369369 metadata :
370- name : ' {{ registry "binding-name" | json }}'
371- labels : ' {{ snippet "selector-snippet" | json }}'
370+ name : ' {{ registry "binding-name" }}'
371+ labels : ' {{ snippet "selector-snippet" }}'
372372 - name : couchbase-user-secret
373373 template :
374374 apiVersion : v1
375375 kind : Secret
376376 metadata :
377- name : ' {{ registry "binding-name" | json }}'
377+ name : ' {{ registry "binding-name" }}'
378378 data :
379- password : ' {{ registry "password" | json }}'
379+ password : ' {{ registry "password" }}'
380380 - name : couchbase-user
381381 template :
382382 apiVersion : couchbase.com/v2
383383 kind : CouchbaseUser
384384 metadata :
385- name : ' {{ registry "binding-name" | json }}'
386- labels : ' {{ snippet "selector-snippet" | json }}'
385+ name : ' {{ registry "binding-name" }}'
386+ labels : ' {{ snippet "selector-snippet" }}'
387387 spec :
388388 authDomain : local
389- authSecret : ' {{ registry "binding-name" | json }}'
389+ authSecret : ' {{ registry "binding-name" }}'
390390 - name : couchbase-group
391391 template :
392392 apiVersion : couchbase.com/v2
393393 kind : CouchbaseGroup
394394 metadata :
395- name : ' {{ registry "binding-name" | json }}'
396- labels : ' {{ snippet "selector-snippet" | json }}'
395+ name : ' {{ registry "binding-name" }}'
396+ labels : ' {{ snippet "selector-snippet" }}'
397397 spec :
398398 roles :
399399 - name : bucket_admin
400- bucket : ' {{ registry "binding-name" | json }}'
400+ bucket : ' {{ registry "binding-name" }}'
401401 - name : couchbase-role-binding
402402 template :
403403 apiVersion : couchbase.com/v2
404404 kind : CouchbaseRoleBinding
405405 metadata :
406- name : ' {{ registry "binding-name" | json }}'
407- labels : ' {{ snippet "selector-snippet" | json }}'
406+ name : ' {{ registry "binding-name" }}'
407+ labels : ' {{ snippet "selector-snippet" }}'
408408 spec :
409409 subjects :
410410 - kind : CouchbaseUser
411- name : ' {{ registry "binding-name" | json }}'
411+ name : ' {{ registry "binding-name" }}'
412412 roleRef :
413413 kind : CouchbaseGroup
414- name : ' {{ registry "binding-name" | json }}'
414+ name : ' {{ registry "binding-name" }}'
415415 - name : credentials
416416 template :
417- connection-string : ' {{ printf "couchbases://%v-srv.%v" (registry "instance-name") (registry "namespace") | json }}'
418- ca.pem : ' {{ registry "ca-cert" | json }}'
419- username : ' {{ registry "username" | json }}'
420- password : ' {{ registry "password" | json }}'
421- bucket : ' {{ registry "binding-name" | json }}'
417+ connection-string : ' {{ printf "couchbases://%v-srv.%v" (registry "instance-name") (registry "namespace") }}'
418+ ca.pem : ' {{ registry "ca-cert" }}'
419+ username : ' {{ registry "username" }}'
420+ password : ' {{ registry "password" }}'
421+ bucket : ' {{ registry "binding-name" }}'
422422 # Bindings bind templates to service plans. These allow the specification of
423423 # exactly what templates are created when a plan is instantiated or bound to.
424424 bindings :
@@ -428,17 +428,17 @@ spec:
428428 serviceInstance :
429429 registry :
430430 - name : instance-name
431- value : ' {{ printf "instance-%s" (generatePassword 8 "abcdefghijklmnopqrstuvwxyz0123456789") | json }}'
431+ value : ' {{ printf "instance-%s" (generatePassword 8 "abcdefghijklmnopqrstuvwxyz0123456789") }}'
432432 - name : dashboard-url
433- value : ' {{ printf "https://%s.%s:18091" (registry "instance-name") (registry "namespace") | json }}'
433+ value : ' {{ printf "https://%s.%s:18091" (registry "instance-name") (registry "namespace") }}'
434434 - name : ca-key
435- value : ' {{ generatePrivateKey "RSA" "PKCS#8" 2048 | json }}'
435+ value : ' {{ generatePrivateKey "RSA" "PKCS#8" 2048 }}'
436436 - name : ca-cert
437- value : ' {{ generateCertificate (registry "ca-key") "Couchbase Server CA" "87600h" "CA" nil nil nil | json }}'
437+ value : ' {{ generateCertificate (registry "ca-key") "Couchbase Server CA" "87600h" "CA" nil nil nil }}'
438438 - name : server-key
439- value : ' {{ generatePrivateKey "RSA" "PKCS#1" 2048 | json }}'
439+ value : ' {{ generatePrivateKey "RSA" "PKCS#1" 2048 }}'
440440 - name : server-cert
441- value : ' {{ generateCertificate (registry "server-key") "Couchbase Server" "87600h" "Server" (list (printf "DNS:%s-srv" (registry "instance-name")) (printf "DNS:%s-srv.%s" (registry "instance-name") (registry "namespace")) (printf "DNS:%s-srv.%s.svc" (registry "instance-name") (registry "namespace")) (printf "DNS:*.%s" (registry "instance-name")) (printf "DNS:*.%s.%s" (registry "instance-name") (registry "namespace")) (printf "DNS:*.%s.%s.svc" (registry "instance-name") (registry "namespace")) "DNS:localhost") (registry "ca-key") (registry "ca-cert") | json }}'
441+ value : ' {{ generateCertificate (registry "server-key") "Couchbase Server" "87600h" "Server" (list (printf "DNS:%s-srv" (registry "instance-name")) (printf "DNS:%s-srv.%s" (registry "instance-name") (registry "namespace")) (printf "DNS:%s-srv.%s.svc" (registry "instance-name") (registry "namespace")) (printf "DNS:*.%s" (registry "instance-name")) (printf "DNS:*.%s.%s" (registry "instance-name") (registry "namespace")) (printf "DNS:*.%s.%s.svc" (registry "instance-name") (registry "namespace")) "DNS:localhost") (registry "ca-key") (registry "ca-cert") }}'
442442 templates :
443443 - couchbase-operator-serviceaccount
444444 - couchbase-operator-role
@@ -453,18 +453,18 @@ spec:
453453 condition :
454454 apiVersion : couchbase.com/v2
455455 kind : CouchbaseCluster
456- namespace : ' {{ registry "namespace" | json }}'
457- name : ' {{ registry "instance-name" | json }}'
456+ namespace : ' {{ registry "namespace" }}'
457+ name : ' {{ registry "instance-name" }}'
458458 type : Available
459459 status : " True"
460460 serviceBinding :
461461 registry :
462462 - name : binding-name
463- value : ' {{ printf "binding-%s" (registry "binding-id") | json }}'
463+ value : ' {{ printf "binding-%s" (registry "binding-id") }}'
464464 - name : password
465- value : ' {{ generatePassword 32 nil | json }}'
465+ value : ' {{ generatePassword 32 nil }}'
466466 - name : credentials
467- value : ' {{ snippet "credentials" | json }}'
467+ value : ' {{ snippet "credentials" }}'
468468 templates :
469469 - couchbase-bucket
470470 - couchbase-group
0 commit comments