Skip to content

Commit d56e533

Browse files
andrewstuckiandrewstucki
committed
Fix up tests and linter
1 parent d9cc172 commit d56e533

File tree

12 files changed

+1344
-64
lines changed

12 files changed

+1344
-64
lines changed

‎operator/chart/deployment.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ func Deployment(dot *helmette.Dot) *appsv1.Deployment {
5050
if values.Multicluster.Enabled {
5151
return MulticlusterDeployment(dot)
5252
}
53-
return SingleDeployment(dot)
53+
return SingleClusterDeployment(dot)
5454
}
5555

56-
func SingleDeployment(dot *helmette.Dot) *appsv1.Deployment {
56+
func SingleClusterDeployment(dot *helmette.Dot) *appsv1.Deployment {
5757
values := helmette.Unwrap[Values](dot.Values)
5858

5959
dep := &appsv1.Deployment{

‎operator/chart/multicluster_deployment.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// the Business Source License, use of this software will be governed
88
// by the Apache License, Version 2.0
99

10-
// +gotohelm:filename=_deployment.go.tpl
10+
// +gotohelm:filename=_multicluster_deployment.go.tpl
1111
package operator
1212

1313
import (

‎operator/chart/templates/_deployment.go.tpl‎

Lines changed: 105 additions & 42 deletions
Large diffs are not rendered by default.

‎operator/chart/templates/_multicluster_deployment.go.tpl‎

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
{{- /* GENERATED FILE DO NOT EDIT */ -}}
2+
{{- /* Transpiled by gotohelm from "github.com/redpanda-data/redpanda-operator/operator/chart/multicluster_deployment.go" */ -}}
3+
4+
{{- define "operator.MulticlusterDeployment" -}}
5+
{{- $dot := (index .a 0) -}}
6+
{{- range $_ := (list 1) -}}
7+
{{- $_is_returning := false -}}
8+
{{- $values := $dot.Values.AsMap -}}
9+
{{- if (eq $values.multicluster.apiServerExternalAddress "") -}}
10+
{{- $_ := (fail "apiServerExternalAddress must be specified in multicluster mode") -}}
11+
{{- end -}}
12+
{{- if (eq ((get (fromJson (include "_shims.len" (dict "a" (list $values.multicluster.peers)))) "r") | int) (0 | int)) -}}
13+
{{- $_ := (fail "peers must be specified in multicluster mode") -}}
14+
{{- end -}}
15+
{{- $dep := (mustMergeOverwrite (dict "metadata" (dict) "spec" (dict "selector" (coalesce nil) "template" (dict "metadata" (dict) "spec" (dict "containers" (coalesce nil))) "strategy" (dict)) "status" (dict)) (mustMergeOverwrite (dict) (dict "apiVersion" "apps/v1" "kind" "Deployment")) (dict "metadata" (mustMergeOverwrite (dict) (dict "name" (get (fromJson (include "operator.Fullname" (dict "a" (list $dot)))) "r") "labels" (get (fromJson (include "operator.Labels" (dict "a" (list $dot)))) "r") "namespace" $dot.Release.Namespace "annotations" $values.annotations)) "spec" (mustMergeOverwrite (dict "selector" (coalesce nil) "template" (dict "metadata" (dict) "spec" (dict "containers" (coalesce nil))) "strategy" (dict)) (dict "replicas" ($values.replicaCount | int) "selector" (mustMergeOverwrite (dict) (dict "matchLabels" (get (fromJson (include "operator.SelectorLabels" (dict "a" (list $dot)))) "r"))) "strategy" $values.strategy "template" (get (fromJson (include "operator.StrategicMergePatch" (dict "a" (list (mustMergeOverwrite (dict "metadata" (dict) "spec" (dict "containers" (coalesce nil))) (dict "metadata" (mustMergeOverwrite (dict) (dict "labels" $values.podTemplate.metadata.labels "annotations" $values.podTemplate.metadata.annotations)) "spec" $values.podTemplate.spec)) (mustMergeOverwrite (dict "metadata" (dict) "spec" (dict "containers" (coalesce nil))) (dict "metadata" (mustMergeOverwrite (dict) (dict "annotations" $values.podAnnotations "labels" (merge (dict) (get (fromJson (include "operator.SelectorLabels" (dict "a" (list $dot)))) "r") $values.podLabels))) "spec" (mustMergeOverwrite (dict "containers" (coalesce nil)) (dict "automountServiceAccountToken" false "terminationGracePeriodSeconds" ((10 | int64) | int64) "imagePullSecrets" $values.imagePullSecrets "serviceAccountName" (get (fromJson (include "operator.ServiceAccountName" (dict "a" (list $dot)))) "r") "nodeSelector" $values.nodeSelector "tolerations" $values.tolerations "volumes" (get (fromJson (include "operator.multiclusterOperatorPodVolumes" (dict "a" (list $dot)))) "r") "containers" (get (fromJson (include "operator.multiclusterOperatorContainers" (dict "a" (list $dot (coalesce nil))))) "r"))))))))) "r"))))) -}}
16+
{{- if (not (empty $values.affinity)) -}}
17+
{{- $_ := (set $dep.spec.template.spec "affinity" $values.affinity) -}}
18+
{{- end -}}
19+
{{- $_is_returning = true -}}
20+
{{- (dict "r" $dep) | toJson -}}
21+
{{- break -}}
22+
{{- end -}}
23+
{{- end -}}
24+
25+
{{- define "operator.multiclusterOperatorContainers" -}}
26+
{{- $dot := (index .a 0) -}}
27+
{{- $podTerminationGracePeriodSeconds := (index .a 1) -}}
28+
{{- range $_ := (list 1) -}}
29+
{{- $_is_returning := false -}}
30+
{{- $values := $dot.Values.AsMap -}}
31+
{{- $_is_returning = true -}}
32+
{{- (dict "r" (list (mustMergeOverwrite (dict "name" "" "resources" (dict)) (dict "name" "manager" "image" (get (fromJson (include "operator.containerImage" (dict "a" (list $dot)))) "r") "imagePullPolicy" $values.image.pullPolicy "command" (list "/manager") "args" (get (fromJson (include "operator.multiclusterOperatorArguments" (dict "a" (list $dot)))) "r") "securityContext" (mustMergeOverwrite (dict) (dict "allowPrivilegeEscalation" false)) "ports" (list (mustMergeOverwrite (dict "containerPort" 0) (dict "name" "webhook-server" "containerPort" (9443 | int) "protocol" "TCP")) (mustMergeOverwrite (dict "containerPort" 0) (dict "name" "https" "containerPort" (8443 | int) "protocol" "TCP"))) "volumeMounts" (get (fromJson (include "operator.multiclusterOperatorPodVolumesMounts" (dict "a" (list $dot)))) "r") "livenessProbe" (get (fromJson (include "operator.livenessProbe" (dict "a" (list $dot $podTerminationGracePeriodSeconds)))) "r") "readinessProbe" (get (fromJson (include "operator.readinessProbe" (dict "a" (list $dot $podTerminationGracePeriodSeconds)))) "r") "resources" $values.resources)))) | toJson -}}
33+
{{- break -}}
34+
{{- end -}}
35+
{{- end -}}
36+
37+
{{- define "operator.multiclusterOperatorPodVolumes" -}}
38+
{{- $dot := (index .a 0) -}}
39+
{{- range $_ := (list 1) -}}
40+
{{- $_is_returning := false -}}
41+
{{- $values := $dot.Values.AsMap -}}
42+
{{- $vol := (list (get (fromJson (include "operator.serviceAccountTokenVolume" (dict "a" (list)))) "r") (get (fromJson (include "operator.multiclusterTLSVolume" (dict "a" (list $dot)))) "r")) -}}
43+
{{- if (not $values.webhook.enabled) -}}
44+
{{- $_is_returning = true -}}
45+
{{- (dict "r" $vol) | toJson -}}
46+
{{- break -}}
47+
{{- end -}}
48+
{{- $vol = (concat (default (list) $vol) (list (mustMergeOverwrite (dict "name" "") (mustMergeOverwrite (dict) (dict "secret" (mustMergeOverwrite (dict) (dict "defaultMode" ((420 | int) | int) "secretName" $values.webhookSecretName)))) (dict "name" "cert")))) -}}
49+
{{- $_is_returning = true -}}
50+
{{- (dict "r" $vol) | toJson -}}
51+
{{- break -}}
52+
{{- end -}}
53+
{{- end -}}
54+
55+
{{- define "operator.multiclusterOperatorPodVolumesMounts" -}}
56+
{{- $dot := (index .a 0) -}}
57+
{{- range $_ := (list 1) -}}
58+
{{- $_is_returning := false -}}
59+
{{- $values := $dot.Values.AsMap -}}
60+
{{- $volMount := (list (get (fromJson (include "operator.serviceAccountTokenVolumeMount" (dict "a" (list)))) "r") (get (fromJson (include "operator.multiclusterTLSVolumeMount" (dict "a" (list $dot)))) "r")) -}}
61+
{{- if (not $values.webhook.enabled) -}}
62+
{{- $_is_returning = true -}}
63+
{{- (dict "r" $volMount) | toJson -}}
64+
{{- break -}}
65+
{{- end -}}
66+
{{- $volMount = (concat (default (list) $volMount) (list (mustMergeOverwrite (dict "name" "" "mountPath" "") (dict "name" "cert" "mountPath" "/tmp/k8s-webhook-server/serving-certs" "readOnly" true)))) -}}
67+
{{- $_is_returning = true -}}
68+
{{- (dict "r" $volMount) | toJson -}}
69+
{{- break -}}
70+
{{- end -}}
71+
{{- end -}}
72+
73+
{{- define "operator.multiclusterOperatorArguments" -}}
74+
{{- $dot := (index .a 0) -}}
75+
{{- range $_ := (list 1) -}}
76+
{{- $_is_returning := false -}}
77+
{{- $values := $dot.Values.AsMap -}}
78+
{{- $defaults := (dict "--health-probe-bind-address" ":8081" "--metrics-bind-address" ":8443" "--log-level" $values.logLevel "--base-tag" (get (fromJson (include "operator.containerTag" (dict "a" (list $dot)))) "r") "--base-image" $values.image.repository "--raft-address" "0.0.0.0:9443" "--ca-file" "/tls/ca.crt" "--certificate-file" "/tls/tls.crt" "--private-key-file" "/tls/tls.key" "--kubernetes-api-address" $values.multicluster.apiServerExternalAddress "--kubeconfig-namespace" $dot.Release.Namespace "--kubeconfig-name" (get (fromJson (include "operator.Fullname" (dict "a" (list $dot)))) "r")) -}}
79+
{{- if $values.webhook.enabled -}}
80+
{{- $_ := (set $defaults "--webhook-cert-path" (printf "%s%s" "/tmp/k8s-webhook-server/serving-certs" "/tls.crt")) -}}
81+
{{- $_ := (set $defaults "--webhook-key-path" (printf "%s%s" "/tmp/k8s-webhook-server/serving-certs" "/tls.key")) -}}
82+
{{- end -}}
83+
{{- $userProvided := (get (fromJson (include "chartutil.ParseFlags" (dict "a" (list $values.additionalCmdFlags)))) "r") -}}
84+
{{- $flags := (list "multicluster") -}}
85+
{{- range $key, $value := (merge (dict) $defaults $userProvided) -}}
86+
{{- if (eq $value "") -}}
87+
{{- $flags = (concat (default (list) $flags) (list $key)) -}}
88+
{{- else -}}
89+
{{- $flags = (concat (default (list) $flags) (list (printf "%s=%s" $key $value))) -}}
90+
{{- end -}}
91+
{{- end -}}
92+
{{- if $_is_returning -}}
93+
{{- break -}}
94+
{{- end -}}
95+
{{- range $_, $peer := $values.multicluster.peers -}}
96+
{{- $flags = (concat (default (list) $flags) (list (printf "--peer=%s://%s:9443" $peer.name $peer.address))) -}}
97+
{{- end -}}
98+
{{- if $_is_returning -}}
99+
{{- break -}}
100+
{{- end -}}
101+
{{- $_is_returning = true -}}
102+
{{- (dict "r" $flags) | toJson -}}
103+
{{- break -}}
104+
{{- end -}}
105+
{{- end -}}
106+
107+
{{- define "operator.multiclusterTLSVolume" -}}
108+
{{- $dot := (index .a 0) -}}
109+
{{- range $_ := (list 1) -}}
110+
{{- $_is_returning := false -}}
111+
{{- $_is_returning = true -}}
112+
{{- (dict "r" (mustMergeOverwrite (dict "name" "") (mustMergeOverwrite (dict) (dict "secret" (mustMergeOverwrite (dict) (dict "secretName" (printf "%s-multicluster-certificates" (get (fromJson (include "operator.Fullname" (dict "a" (list $dot)))) "r")) "items" (list (mustMergeOverwrite (dict "key" "" "path" "") (dict "key" "tls.crt" "path" "tls.crt")) (mustMergeOverwrite (dict "key" "" "path" "") (dict "key" "tls.key" "path" "tls.key")) (mustMergeOverwrite (dict "key" "" "path" "") (dict "key" "ca.crt" "path" "ca.crt"))))))) (dict "name" (printf "%s-multicluster-certificates" (get (fromJson (include "operator.Fullname" (dict "a" (list $dot)))) "r"))))) | toJson -}}
113+
{{- break -}}
114+
{{- end -}}
115+
{{- end -}}
116+
117+
{{- define "operator.multiclusterTLSVolumeMount" -}}
118+
{{- $dot := (index .a 0) -}}
119+
{{- range $_ := (list 1) -}}
120+
{{- $_is_returning := false -}}
121+
{{- $_is_returning = true -}}
122+
{{- (dict "r" (mustMergeOverwrite (dict "name" "" "mountPath" "") (dict "name" (printf "%s-multicluster-certificates" (get (fromJson (include "operator.Fullname" (dict "a" (list $dot)))) "r")) "readOnly" true "mountPath" "/tls"))) | toJson -}}
123+
{{- break -}}
124+
{{- end -}}
125+
{{- end -}}
126+

0 commit comments

Comments
 (0)