From d31c971d6dd13aede19bad78ee3579c77b55c0dc Mon Sep 17 00:00:00 2001 From: Jeev B Date: Thu, 15 Dec 2022 09:54:11 -0800 Subject: [PATCH] Refactor renderTemplate calls in flyte-binary chart (#3156) Signed-off-by: Jeev B Signed-off-by: Jeev B --- charts/flyte-binary/templates/_helpers.tpl | 11 ---- .../templates/admin-auth-secret.yaml | 4 +- .../templates/auth-client-secret.yaml | 4 +- .../templates/cluster-resource-templates.yaml | 8 +-- .../flyte-binary/templates/clusterrole.yaml | 8 +-- .../templates/clusterrolebinding.yaml | 8 +-- charts/flyte-binary/templates/configmap.yaml | 14 ++--- .../templates/db-password-secret.yaml | 4 +- charts/flyte-binary/templates/deployment.yaml | 48 +++++++++--------- .../flyte-binary/templates/ingress/grpc.yaml | 12 ++--- .../flyte-binary/templates/ingress/http.yaml | 12 ++--- .../flyte-binary/templates/service/main.yaml | 10 ++-- .../templates/service/webhook.yaml | 8 +-- .../templates/serviceaccount.yaml | 8 +-- charts/flyte-sandbox/Chart.lock | 2 +- .../charts/flyte-binary-0.1.0.tgz | Bin 10353 -> 10195 bytes .../sandbox-bundled/manifests/compiled.yaml | 4 +- 17 files changed, 77 insertions(+), 88 deletions(-) diff --git a/charts/flyte-binary/templates/_helpers.tpl b/charts/flyte-binary/templates/_helpers.tpl index c97d89f4cf..650a53db03 100644 --- a/charts/flyte-binary/templates/_helpers.tpl +++ b/charts/flyte-binary/templates/_helpers.tpl @@ -61,17 +61,6 @@ Create the name of the service account to use {{- end }} {{- end }} -{{/* -Renders a value that contains template. -*/}} -{{- define "flyte-binary.renderTemplate" -}} -{{- if typeIs "string" .value }} - {{- tpl .value .context }} -{{- else }} - {{- tpl (.value | toYaml) .context }} -{{- end }} -{{- end -}} - {{/* Get the Flyte configuration ConfigMap name. */}} diff --git a/charts/flyte-binary/templates/admin-auth-secret.yaml b/charts/flyte-binary/templates/admin-auth-secret.yaml index 55cdeb4564..3e164c1f10 100644 --- a/charts/flyte-binary/templates/admin-auth-secret.yaml +++ b/charts/flyte-binary/templates/admin-auth-secret.yaml @@ -6,11 +6,11 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} type: Opaque {{- end }} diff --git a/charts/flyte-binary/templates/auth-client-secret.yaml b/charts/flyte-binary/templates/auth-client-secret.yaml index d58fecc193..f373bde567 100644 --- a/charts/flyte-binary/templates/auth-client-secret.yaml +++ b/charts/flyte-binary/templates/auth-client-secret.yaml @@ -6,11 +6,11 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} type: Opaque stringData: diff --git a/charts/flyte-binary/templates/cluster-resource-templates.yaml b/charts/flyte-binary/templates/cluster-resource-templates.yaml index f60e95a4e6..ba40b5ee8e 100644 --- a/charts/flyte-binary/templates/cluster-resource-templates.yaml +++ b/charts/flyte-binary/templates/cluster-resource-templates.yaml @@ -6,17 +6,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.clusterResourceTemplates.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.clusterResourceTemplates.labels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.clusterResourceTemplates.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.clusterResourceTemplates.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.clusterResourceTemplates.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.clusterResourceTemplates.annotations | toYaml ) . | nindent 4 }} {{- end }} data: {{- if .Values.clusterResourceTemplates.inline }} diff --git a/charts/flyte-binary/templates/clusterrole.yaml b/charts/flyte-binary/templates/clusterrole.yaml index c9a6642f5a..85f882ef5a 100644 --- a/charts/flyte-binary/templates/clusterrole.yaml +++ b/charts/flyte-binary/templates/clusterrole.yaml @@ -6,17 +6,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.rbac.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.rbac.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.rbac.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.rbac.annotations | toYaml ) . | nindent 4 }} {{- end }} rules: - apiGroups: diff --git a/charts/flyte-binary/templates/clusterrolebinding.yaml b/charts/flyte-binary/templates/clusterrolebinding.yaml index 089f597bdb..3c13b302ad 100644 --- a/charts/flyte-binary/templates/clusterrolebinding.yaml +++ b/charts/flyte-binary/templates/clusterrolebinding.yaml @@ -6,17 +6,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.rbac.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.rbac.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.rbac.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.rbac.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.rbac.annotations | toYaml ) . | nindent 4 }} {{- end }} roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/charts/flyte-binary/templates/configmap.yaml b/charts/flyte-binary/templates/configmap.yaml index 77af0868a9..ad42579ef6 100644 --- a/charts/flyte-binary/templates/configmap.yaml +++ b/charts/flyte-binary/templates/configmap.yaml @@ -6,17 +6,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.configuration.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.configuration.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.configuration.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.configuration.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.configuration.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.configuration.annotations | toYaml ) . | nindent 4 }} {{- end }} data: 000-core.yaml: | @@ -83,7 +83,7 @@ data: region: {{ required "Region required for S3 storage provider" .region }} disable-ssl: {{ .disableSSL }} {{- if .endpoint }} - endpoint: {{ include "flyte-binary.renderTemplate" ( dict "value" .endpoint "context" $ ) }} + endpoint: {{ tpl .endpoint $ }} {{- end }} {{- if eq "iam" .authType }} auth-type: "iam" @@ -167,7 +167,7 @@ data: - all authorizedUris: {{- if .Values.ingress.host }} - - https://{{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }} + - https://{{ tpl .Values.ingress.host . }} {{- end }} - http://{{ include "flyte-binary.fullname" . }}:{{ include "flyte-binary.service.httpPort" . }} - http://{{ include "flyte-binary.fullname" . }}.{{ .Release.Namespace }}:{{ include "flyte-binary.service.httpPort" . }} @@ -186,7 +186,7 @@ data: {{- end }} {{- if .Values.configuration.inline }} 010-inline-config.yaml: | - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.configuration.inline "context" $ ) | nindent 4 }} + {{- tpl ( .Values.configuration.inline | toYaml ) . | nindent 4 }} {{- else if .Values.configuration.sourcePath }} {{- (tpl (.Files.Glob .Values.configuration.sourcePath).AsConfig . ) | nindent 2 }} {{- end }} diff --git a/charts/flyte-binary/templates/db-password-secret.yaml b/charts/flyte-binary/templates/db-password-secret.yaml index 2bfde16dc6..856aa0b63d 100644 --- a/charts/flyte-binary/templates/db-password-secret.yaml +++ b/charts/flyte-binary/templates/db-password-secret.yaml @@ -6,11 +6,11 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} type: Opaque stringData: diff --git a/charts/flyte-binary/templates/deployment.yaml b/charts/flyte-binary/templates/deployment.yaml index 3959c8511d..48fe0b9201 100644 --- a/charts/flyte-binary/templates/deployment.yaml +++ b/charts/flyte-binary/templates/deployment.yaml @@ -5,17 +5,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.deployment.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.deployment.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.deployment.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.deployment.annotations | toYaml ) . | nindent 4 }} {{- end }} spec: replicas: 1 @@ -27,10 +27,10 @@ spec: metadata: labels: {{- include "flyte-binary.selectorLabels" . | nindent 8 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.deployment.podLabels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.podLabels "context" $) | nindent 8 }} + {{- tpl ( .Values.deployment.podLabels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if not .Values.configuration.existingConfigmap }} @@ -47,14 +47,14 @@ spec: checksum/auth-client-secret: {{ include (print $.Template.BasePath "/auth-client-secret.yaml") . | sha256sum }} {{- end }} {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.deployment.podAnnotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.podAnnotations "context" $) | nindent 8 }} + {{- tpl ( .Values.deployment.podAnnotations | toYaml ) . | nindent 4 }} {{- end }} spec: {{- if .Values.deployment.extraPodSpec }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraPodSpec "context" $) | nindent 6 }} + {{- tpl ( .Values.deployment.extraPodSpec | toYaml ) . | nindent 6 }} {{- end }} {{- if .Values.deployment.podSecurityContext.enabled }} securityContext: {{- omit .Values.deployment.podSecurityContext "enabled" | toYaml | nindent 12 }} @@ -70,14 +70,14 @@ spec: {{- end }} command: {{- if .Values.deployment.waitForDB.command }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.waitForDB.command "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.waitForDB.command | toYaml ) . | nindent 12 }} {{- else }} - sh - -ec {{- end }} args: {{- if .Values.deployment.waitForDB.args }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.waitForDB.args "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.waitForDB.args | toYaml ) . | nindent 12 }} {{- else }} {{- with .Values.configuration.database }} - | @@ -103,14 +103,14 @@ spec: {{- end }} command: {{- if .Values.deployment.genAdminAuthSecret.command }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.genAdminAuthSecret.command "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.genAdminAuthSecret.command | toYaml ) . | nindent 12 }} {{- else }} - sh - -ec {{- end }} args: {{- if .Values.deployment.genAdminAuthSecret.args }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.genAdminAuthSecret.args "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.genAdminAuthSecret.args | toYaml ) . | nindent 12 }} {{- else }} - | flyteadmin --config=/etc/flyte/config.d/*.yaml \ @@ -133,7 +133,7 @@ spec: {{- end }} {{- end }} {{- if .Values.deployment.initContainers }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.initContainers "context" $ ) | nindent 8 }} + {{- tpl ( .Values.deployment.initContainers | toYaml ) . | nindent 8 }} {{- end }} {{- end }} containers: @@ -143,11 +143,11 @@ spec: imagePullPolicy: {{ .pullPolicy | quote }} {{- end }} {{- if .Values.deployment.command }} - command: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.command "context" $) | nindent 12 }} + command: {{- tpl ( .Values.deployment.command | toYaml ) . | nindent 12 }} {{- end }} args: {{- if .Values.deployment.args }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.args "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.args | toYaml ) . | nindent 12 }} {{- else }} - start - --config @@ -163,7 +163,7 @@ spec: fieldRef: fieldPath: metadata.namespace {{- if .Values.deployment.extraEnvVars }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraEnvVars "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.extraEnvVars | toYaml ) . | nindent 12 }} {{- end }} {{- if or .Values.deployment.extraEnvVarsConfigMap .Values.deployment.extraEnvVarsSecret }} envFrom: @@ -184,11 +184,11 @@ spec: - name: webhook containerPort: 9443 {{- if .Values.deployment.startupProbe }} - startupProbe: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.customStartupProbe "context" $) | nindent 12 }} + startupProbe: {{- tpl ( .Values.deployment.customStartupProbe | toYaml ) . | nindent 12 }} {{- end }} livenessProbe: {{- if .Values.deployment.livenessProbe }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.livenessProbe "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.livenessProbe | toYaml ) . | nindent 12 }} {{- else }} httpGet: path: /healthcheck @@ -196,7 +196,7 @@ spec: {{- end }} readinessProbe: {{- if .Values.deployment.readinessProbe }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.readinessProbe "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.readinessProbe | toYaml ) . | nindent 12 }} {{- else }} httpGet: path: /healthcheck @@ -206,7 +206,7 @@ spec: resources: {{- toYaml .Values.deployment.resources | nindent 12 }} {{- end }} {{- if .Values.deployment.lifecycleHooks }} - lifecycle: {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.lifecycleHooks "context" $) | nindent 12 }} + lifecycle: {{- tpl ( .Values.deployment.lifecycleHooks | toYaml ) . | nindent 12 }} {{- end }} volumeMounts: {{- if .Values.configuration.auth.enabled }} @@ -225,10 +225,10 @@ spec: - name: state mountPath: /var/run/flyte {{- if .Values.deployment.extraVolumeMounts }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.deployment.extraVolumeMounts "context" $) | nindent 12 }} + {{- tpl ( .Values.deployment.extraVolumeMounts | toYaml ) . | nindent 12 }} {{- end }} {{- if .Values.deployment.sidecars }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.sidecars "context" $ ) | nindent 8 }} + {{- tpl ( .Values.deployment.sidecars | toYaml ) . | nindent 8 }} {{- end }} volumes: {{- if .Values.configuration.auth.enabled }} @@ -254,5 +254,5 @@ spec: - name: state emptyDir: {} {{- if .Values.deployment.extraVolumes }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.deployment.extraVolumes "context" $ ) | nindent 8 }} + {{- tpl ( .Values.deployment.extraVolumes | toYaml ) . | nindent 8 }} {{- end }} diff --git a/charts/flyte-binary/templates/ingress/grpc.yaml b/charts/flyte-binary/templates/ingress/grpc.yaml index 6ddcd97851..8cde3dab41 100644 --- a/charts/flyte-binary/templates/ingress/grpc.yaml +++ b/charts/flyte-binary/templates/ingress/grpc.yaml @@ -6,20 +6,20 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.commonAnnotations "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.grpcAnnotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.grpcAnnotations "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.grpcAnnotations | toYaml ) . | nindent 4 }} {{- end }} spec: rules: @@ -96,6 +96,6 @@ spec: path: /grpc.health.v1.Health/* pathType: ImplementationSpecific {{- if .Values.ingress.host }} - host: {{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }} + host: {{ tpl .Values.ingress.host . | quote }} {{- end }} {{- end }} diff --git a/charts/flyte-binary/templates/ingress/http.yaml b/charts/flyte-binary/templates/ingress/http.yaml index 875a4e25ac..696b10b206 100644 --- a/charts/flyte-binary/templates/ingress/http.yaml +++ b/charts/flyte-binary/templates/ingress/http.yaml @@ -6,20 +6,20 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.commonAnnotations "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.ingress.httpAnnotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.ingress.httpAnnotations "context" $) | nindent 4 }} + {{- tpl ( .Values.ingress.httpAnnotations | toYaml ) . | nindent 4 }} {{- end }} spec: rules: @@ -159,6 +159,6 @@ spec: path: /oauth2/* pathType: ImplementationSpecific {{- if .Values.ingress.host }} - host: {{ include "flyte-binary.renderTemplate" ( dict "value" .Values.ingress.host "context" $ ) }} + host: {{ tpl .Values.ingress.host . | quote }} {{- end }} {{- end }} diff --git a/charts/flyte-binary/templates/service/main.yaml b/charts/flyte-binary/templates/service/main.yaml index 8224c34d65..9c93ff38d5 100644 --- a/charts/flyte-binary/templates/service/main.yaml +++ b/charts/flyte-binary/templates/service/main.yaml @@ -5,17 +5,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.service.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.service.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.service.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }} {{- end }} spec: type: {{ .Values.service.type }} @@ -49,6 +49,6 @@ spec: nodePort: null {{- end }} {{- if .Values.service.extraPorts }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }} + {{- tpl ( .Values.service.extraPorts | toYaml ) . | nindent 4 }} {{- end }} selector: {{- include "flyte-binary.selectorLabels" . | nindent 4 }} diff --git a/charts/flyte-binary/templates/service/webhook.yaml b/charts/flyte-binary/templates/service/webhook.yaml index 9cdb819461..f5375b1f70 100644 --- a/charts/flyte-binary/templates/service/webhook.yaml +++ b/charts/flyte-binary/templates/service/webhook.yaml @@ -5,17 +5,17 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.service.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.service.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.service.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.service.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.service.annotations | toYaml ) . | nindent 4 }} {{- end }} spec: type: ClusterIP diff --git a/charts/flyte-binary/templates/serviceaccount.yaml b/charts/flyte-binary/templates/serviceaccount.yaml index f22399d77f..a32b268361 100644 --- a/charts/flyte-binary/templates/serviceaccount.yaml +++ b/charts/flyte-binary/templates/serviceaccount.yaml @@ -6,16 +6,16 @@ metadata: namespace: {{ .Release.Namespace | quote }} labels: {{- include "flyte-binary.labels" . | nindent 4 }} {{- if .Values.commonLabels }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonLabels | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.serviceAccount.labels }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.serviceAccount.labels "context" $) | nindent 4 }} + {{- tpl ( .Values.serviceAccount.labels | toYaml ) . | nindent 4 }} {{- end }} annotations: {{- if .Values.commonAnnotations }} - {{- include "flyte-binary.renderTemplate" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- tpl ( .Values.commonAnnotations | toYaml ) . | nindent 4 }} {{- end }} {{- if .Values.serviceAccount.annotations }} - {{- include "flyte-binary.renderTemplate" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }} + {{- tpl ( .Values.serviceAccount.annotations | toYaml ) . | nindent 4 }} {{- end }} {{- end }} diff --git a/charts/flyte-sandbox/Chart.lock b/charts/flyte-sandbox/Chart.lock index 9b192cad1d..e29ae65037 100644 --- a/charts/flyte-sandbox/Chart.lock +++ b/charts/flyte-sandbox/Chart.lock @@ -15,4 +15,4 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 12.1.0 digest: sha256:ce2d6bd1488364f3ca98cc306554e479f1190ac828925af78a468a52f752449c -generated: "2022-12-14T20:07:29.49547-08:00" +generated: "2022-12-15T00:28:40.428989-08:00" diff --git a/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz b/charts/flyte-sandbox/charts/flyte-binary-0.1.0.tgz index 9e4bbebd6ed700d832caf14c43a23700426858f2..e96900e1fe09627a76c7b7705deea8164cbc1ee8 100644 GIT binary patch literal 10195 zcmV;^CoI?>iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PKDHbK5x5;QspQufQt1-zIY*C0VwURn^>`V`nn1&1770GFw}F zTN#LiB(5of1AunC_T1n86`ll0@FClA9u{jVBa`Sx188(N9^Ji2FBuBvNe0Q~=x_xI z3oqe1{li^82`KOT>({~zz{?Ehi1JKf#i+uPfDHu=MNGToo-`~i&bl!}I@ zpbU~fjBj06wQ*m`1M}n;L}-Gu893h=z&tm9PQuB4I3C1^MkL9ZcqcdnEHD9cNRtTA zBwMBk{J^;gppPgj7@VgF#3)bk@r6)0P{ReBFGUB&UK~Za1xFO zpSxEc&g0DgbC?#0-njs1pZ`0%yW^e8{NEk#ZRh{JJdXgMpFf`?LXsGPQ$~_(2^a=g zzp^pX=F4Q$XE7!C)Iz@kXgjWB9}5^EKO!W`lC8fUNJ9HkT-#4$+aPlf?Z zQ@~bQ>Yx}9L~%hPL%|MPRTM|SSwj5G=fk_Nb^p6Ha7YSP_nBxVYh&=@moT7*z1}>5`1#<)< zf*?b&C=1vsp+HC<0J9jZagp(F3@go&<5=L+6bP1Zi8_I71%BdyIsb(hV3DMvdl*bI z&Vso`^&9~h$95H##c)i4z~1h3M*+t3auDr08Rml}3dtf$&nhsS8}?54FPMTTO;E|x8ytYF*LWqDD zMRbNlj|dPoFuI%os{zfxaD5qIvV>XkA5nE6#Y?1146V6v)T2HzLrjG=sQwk^1fM4{ zBH(AMAIi6nPm7$7G>RqX^KPC#18!HK4@KBA}7>Y(z6PBlEoK+uvGKluBp{s|elSS8U4%w>lYM3Y!a75>O#GcYV@ zfFNbTWN6`2Ja>Bf8k}AvELsURl`jE*E17t`E;3s8c`PKILR1z|MoSXZ|#_LX(J^h5?HX+yUQE_@ef{z7bs)O;#G6kGXuS~ z`M4#4>!$!l5u)@AT|O~&>zZd^n839|lPLT*bO{c`FK~t~1qC*3{rb4M%3ofoM2Jp6~=t|a+u;GHZPN`on2Kqk04k^d7!=y zg^Wz`a>-lUEF)9AqyViG#z%I3scZwFA+@kf(K$-NDVJ6QY6;;Z;I14hfF#WKmL zsS}n`LX)G4NI@WfmlEKtm?M%QhA22x{@hv!1FQycGX$g78xL2;d}+z|Y4= zhyCjY0;uFiZjHPrsSw5-OkmUMOO;Y(DxAVio#R;7Q|>lsE9m&h@PRDqfmc$j5r-5~ z4ju_&8I4KCxJ8{B1}Xc%eDZXI{xWLI6UycPQ&S9-<&;W zYVrL}iM&#~G4qDE*wQ^_y$;w4GC)_jNMn29$;)TxLa#8T+NOi18fUj;ZfgWp6^2Bs z5vFGhd4{li<^4tqKMfzZRrkg5WVusdY5eLY0?=zOIkn0Ul8=%#UpklI@^5QRpyi$T zpj9zJIi`u|P+6Y@D_@Ip<)1UKTty^I@JK9CFOgjo#CK5L8?ut*JNM0Ak>(7#HfkSu8%B>&ENpDfEBO_Ot! zAxcjOo})HkU64zzxm4Mw2+hEXv7F9EqjC|z88gNa9WhAH=twIg6y!KAw^OY58g)Pr zj1%#TGDuhuAUf$cB~1fd*i!JxswF}rMD=S4Z5g_z2C)@Zf*O2j zvOv*gl%gLoJ}WicO8mtzAVtO(4Hax)jux08E@9z<3sHqz^n{Jj>I$tHwUPsAvQ8Kk zd#?ojRv^k~1LX!-$|MP>Ez~ty3#l`Cl_*Ihap~_-UdVOoBaq|x6h#F|*ySP482ZRe zgQg69wO5{H9Z5c{e5U2_`*VO5mHLYq$ksZ+Y6posT;%rKMfKGq zZ~+tc113i=Z0VmRHU}~+N{MzKy#R3`PEc|jTVwkOyyHqfp?W7P1{W)oNi(Eod?b`B z79lpN>SZ&ujsa+>(<-M^QE`Z1fk_b0EA5brm{NaLG}y7*Xs;@Bm6>xKp%s@Gjn-gF zhfVeZnC3}_45X#Lya=j#tW}e>%Hzt|mO{BImYW501%;B%75ThG*+INcvV(%H^a`pZN(IiF@Hw*n66q1@cE)8bzaAr6x%X_f7>{3VRVsIOKf@6-cdl#jy z$%Ph+V8&PGLPd$Qf;bi{#KnTwdifMEoFa*WJ{5MF3Q+t?rdM{;{5#p0C{WaP_9*vPX_u(m#QY|;^LiNu4mXR1yTG|Pfoeq z#DpN4<4iQRoT(aK{9lSjZt9plyCumZvku5`j7|g*Z*Z*Ywz^r3RoQn&8JLAm_S)oXe@Q`H1y3i{;T>U~OgxYA8l> z2PDvB2fSIqT-7mpqzFv1Wx!S_kPQfA1A-*CHk+IVn@Lma>r(;x7G_H%29F?0^^P4R z2*5PO7uvKnyxh_MHqxq`;SP$kM0M#DVtfmWu1|7MeX>$~9OrN(=^N!)#5EboV#m#iTlfGP%qnah)Y zn0ZMb<_dR!(g6daZ_)~TRX!cA7?U$ku}JcR(Sj3;LsXuUeGtvisj$pRNiT_ z{(g~2k?&&yMv4|55OudOK!+@>fqQm074siN5w~h;JDjJ^=Yd<=*AFg$v%S@?&6OHA zZF3F0+UC!F1M~Af&i!Ar?LK<*^ShU)A^XVgqK>Zn|NOUm|95XX-roPcm#1O;Kdexi zBSJ%#-~K9i`}j|Gp6yO5FR6 z!iBP!{~QPsl{SHLW`{ifD%>g-j%OUf(H zVtorKfP#2MZF}$PyYOWXCkxY|wY&DJNaOcDot{#I=TD*mv+w(lYDuH%3W+3qEBi^p zYC4^l8xoh3Bx4IO{4)*yOotU*veN!M=Ktw%o;9R=t|*5kKAd7$6_3bL!b0g9T2Ztd z*J^w0u9m-*V-~mu1m!7=5E%ZiAsBubZa$f$Z7mI{4l-pSN#_cs>yWNSg7g`7;bTn>1xDhMs^Q7t|&-e~+A%=6G))Ecj`t1A!4HTbQ-3{`rdj%5uq zxI}RZy_@O(>LVp{y_kr62d$Rd>x+?JX3L7e8 zUHKPuHO@A$-!us;w^*na2^F>R*x&S03WiUb5N38;Ejgi457m!hF9Z#;;FY?7>p48L zPTTqjb_Z7d^%Kk+yU#6OzlOv?006)hCBu#2P1pI61ro=w*C+*6_f>y)_oeZ0F+Mx$ z1ZnfG)u=*^N}go79c?u-o(H_-&02YjmIIT1L@X8oz|*faZHTs=q#iox)` zsolQgA-^`YwOVJ1+M1f^H!!5rE)>S!r^;(|Ivb7tOh=rwp|2IrlvMRCqsH;+tZ+&D zR@igS>RawE9UBdPTdQfip zEI6cF?<=(1Uv5Oa?R8P3-lnHd#|wuE@yhIf%!KM=_#becniAI_OR^Yc4D7T{mF8)4 zS}HNy10r50S=BvEiRR5_6UPxk_sT}2qARaw+=Z@dXqww7$7kXuZL^&Y8XKmMrDQF4 zsK}eIZEtA%HC!?8V+J;X-oPT<3{|IbDA5JFcg)1T;Rtk%hF+`u`0m|_ILGVibp;Tv z7|Tzvz4X?G(ev^1=hf9gD2@mP&_-mvdV6xX5m`%;M~!6twSg>g9M*@d3p8J0d}he& z!=?&GSJ^nf<;XRXGs>%l;$7k z$PBXq03AD7eT^2e*Cnyh9Qro5#A|z_&pI9E4f9r?nhnR&qT2Ctug}e%+vgKMP4b^he#el$ zg#zf3|9jI(RsQenKHJLw`*^+(`CnhyZH52m5&l%fYdcaSDaYjlRnCXb_RO*N7IBvK zWdZ4rruB4rT>yl=59?=t9jYRt}u@i|E*24fl4u42eM8j7p zo^OKTNqC^bB{+vDE>Zqk^tFvPl{ETJbk(r4n%b?7&n(t>gw3lOjcQHV6RB6A_rhL?#KO$7UtE34d?+kD6Dy6z4lwzE%g$ z0|3qunOi92d@_G7O$@yNqzNtm$gR+n0VwjALv2KCj^pn7W0ayBlcWC>w?j4~4xOW{ zNB307>)$Cd_CtEPV4OYuG>9@6n4B$Ae6cYt^3MpTsfoD0Q6J{m`qaNeVV>}%SH|Tq zRYKR_Jb6<^e-KBH!qxQ#OzEd2UMG~3LC`XxjM!?xPtm$yBH*t&d382a?s}?h4ZF>s zZu@U8y;VQm{{PPS*|@s@zq`A;wg2wpQF<6=vDXIdyuE*O3sHGNZ(=A~7ahRwzdM&B z0>!3Vi*ai)-lfHeQ}h-sc;mG?Y~k|(0QH5?ZI(Z@5TWcv=LbNaw^bb4J1g*c=!Ckl zo6MH2g8k;6CjBq$v^C7{A{khR|M%Yhv+DlO{@!$Z|La~J-}z66tJvKh`n37MJ;W`b zimyv&#h%jNii)qCzV{=c3FHQ+H{PO3sF(MvPpLv1Ba8O&ms;tU;?p~#(tB3k&% zNb4iSBIOs@eDES5Q@mW3*-GdNU#N&+4!J5x&DE8;);{TQ?~*BR)ac{{=O|6fdQ_w` zXFn&1NNiQAwj2xuBJ3z3Gho~wRr8Pxw+T}lFqxoJwFW& z-o8Efhk2`pScC-@RdZ%-!ar-M%Dnvm34xchN<9^#Q@m`I`5kVDwn%th_V?Ly8pzrW zX`&*FP>J}Cs-CFR%JFz7F#fjHW8fCoNaJ0sTHxk`1SW!V*?=`QQYagT zW$T-pC9$WH@Ag>!Q?>r`fViPv*D1LQojF9yFmD`4M2EA{VindxxYyWUbb3YpO=V-W zzM4FV{Ikxj=olpxLdN51p#632;jM`|0xxjE@`44@b-H&aH+fBmHa#tzq_aD!(oXKi ztBU`#@i;bJQX+Tr42E=C7LpoFB{u|CBGZyPb!I^4V&7YtRnTz=J)N3-l)A$Cs+LO7gWF09*aLT&Ot3>9*j`h|**Q!T zl_s$Xc`X~`WsXAd@?(x7hGKv-5fkNcCB@=XFfSNbVm1T9lhXA1HCVtTZ5@4&satpK zug@ekNf^E;JD1@LTLa0}*HWZ1tSct#4FLb9BG2Z~d8slCeMsWUV7)p#F-Z}f(Ry`w z>Km@gTwg{s)ZkXnh$cjs8w4g+?Zw4KC>sFtL@XqP2f`>u=UR{v1mh1EBvGeBRW4}f zfGV+`q1L%qt7B}2#2w?>_*(Xi(}_Q+wXi?>L_G<<+3Y0_uOTR$>;|F z%<}{5Pd;7Kg>=3mPU1nJq9DsubJXP}p?qoz%W&W37so}uxleX`Tx7PZ=;ZQQ5}2_M zH8T~c^Zo@vboGJZGnCc7s+L9saT6|qDXkRY^UCe4N&y)KoT8@sef6ptR4WV9wDt}! z7HOIM!YV5So2OYSp>dj2@!z7Goc;0-5ss_$m~P?~SH9)NJWV2JQKlb)WR|fH1xY+a ziMZvXQMs<(o9_K}I*MSL&S7-cU4F7N-Q8;{-!*ccW`3^Wj9B_vMl)j77HkL8dbiPF zvQ@%YI7H+qswj8S*-}uuHJ8avz2l*~Tx5~mq=S8}^tZ=uxn>*`zqf|Cvhk;ab63`9 zfiV}f;q5CPHkw=(NAx^lo^>6mS-~X2n^zP1ceOu%{UJS%z62Wd>1Zez^M(}hm9T5} z;2dSgvCY9Ik8s_SOl+&XfBX9GoXB)yW3N$C&e}$&w&SC_c4#|}{lwI#IybiQB5@WR zf#}dgW+|eMDXBBAIr~mxFtir%*t-ox+rARx$vBXItKfunpNW>^0plmpb~4~~nsB#D ze4Y}bUaz}E1FYq|5P~Q7=D^T!{;OgEUSJY`djId~{e2XGqHv4$MUo}9Y9y43kJ$$xW5dUAgg)sq&Klh^*eT6y6dhoH}$JAeSnFN>PkZH8w$5dQtnN(pXXM;h7OdGe*qJD zhcljA+q|`lV^*s;#1EJpy$EGOd}kL~ruygISq3MQWR z@g}W&VqAkk(F%*%mSjtDUrD#AR+6R&Bd%I;4au>?Zt5;v7tU3Al=);?XpI)Ax92~x^)GRKf{y^}$dN&Bj{Ikl_ z-1|+sI_T}B&}^$(<8pW?$Pc&QHeHUpJu!h-O z+n8&+`)yqow#G@1(L!a%x3M)Tr!QF(HIIZ>!)V3TJ{lWpm0K%@jkUmCiG0c+VO6yk zc;;{5o3u*w-hmkVv=Zz~lc1fuC@-_~Um)3xB^_^==y0w=g(U*UYt{BTJbQ#4W zU4);HpFj74E=eABg8tPDs(h5&q5mqKle(~*Ht3rQ;1}OHUz~Z|&aevR;Q-Tgx}#6!P-VEE#`M#iMfZk39nEF zS#>Md9y})=$tKpzFV?Kt+$43NZ)2CXXm=Sdr2lH$0NiMuEu~2P9PDPh#udS#T$xd2 zZ?zIzrMRcuZG)B#9-l`b!fBXhVtexi9A4)6;POTe(z@_&V{{ zH^4jmf1d5^j%)cp_O|&y?&Z1id*1p3JZFeqU~-mZ%UWRPV+nYRXwGU&;z8XP*WKN9 zS-ev2Te&H2xUD}4%^-I}3g^O&2&n?xK~mu&guSOnx^TS4OOjt9pd zVl68VdcyNb_@nr>?E|*jloJ|EXFFPxiLu)fr>QwW?!()L`D{$A4L*4)J#@sV@M}#wq({IlN@73yW z(9&*iH_VfV*Ww2^%Dy{u52NMhlLt50;RQ<5;4H%z*~4x5gB$e}FO!Eh-lEM9ainp< z9%Q2*+*sGbxj(FCKe+K;KfraDeckgRHTuCZH--gU?L5dvZ_jPE&uyQE^B={Aqcu#j zPksM)cW-~EcK)-wjsJfyPeW{ed0}E3_qpfkftK1`=Qx#e-^w|TZdR{w&%VMpI5d&* zoGt%*jhC4;sAaT-$LKeIx#4RJ;}&NlU>uI2L)ghsyUx`{cYMaIr`tJ6uWy z-doaT|0_@S8<@o#(4Aoh9t)qEIpZfD0QEp0f|Wi)RXATK#3$~q-hv{zB&~Od7swY(GP1Hq8>V$`=Ep&hPR2r4y z-&-rGfdE3*3lvV$9vPgiu~Ul?`-A&y*!V=31keB zi~@#%9DA8fd|o7JoMcOo!{`hy5e)~Az`IpK0WET2U;(;9X$qDpp3D4sNw$0n2udMK z&XG8iwBExk9y|gWTFUI?k8^?+$ww5+;MRY95`v$z^b+7qKys2mjtEGT426U6==8%W z!vqZ;fkPp7z%PfVAWjG!gv*4D#J`gKK{)>p8Hs=Oi`8<(|IvTa^K4Win#1U<$iX5> z5gmLN(u;iXT{wqlgYQDN=D#sXmV@v9|KJh$1(F086dWJDq=QgJ1RI1&jNnKXC-~ok z@SH|CMx(DmmN@hOCwPW)^{y>@fcL6swf>=cg8y0V z3DIKyLG-{v{vENDzmiElzP4`hamm*pukZSC4A=49*3seryF1;huK%Z# zz42E5-^cR^*c>nz{PCY=nLiFE;rL&VSB&L!HX0@CWk^>EN@Fp><}hBOkt!UBvO$t9 zFjM^aT9zpYoC#%tfMRUa+GAUOupj_o?F`&rKsH;bgzF z6(v9*%Xii?7#yx3VIo=E9MU8LG|84J0zU{Lh(4mIU~rxyP==!%3?6X{k}q2agKO|N zbP28jZy&e@M`!_yl!;$7B1tX;)%D;y;E()Q|Ihg){u*3^#_*`_iWtwi#R{&$uUEhS z3a$ZYg{^0ayatpJz9_f`zYd4p7?O!c zZPHv5xHg`Pd}0oekb9kw;?AoBH`#d>j>B;{>4e3(<^~I#(sYeu^nILAKJuMNOnl(Y zTCBm^Cxagp6W-(`6YRUUJKgDmFv%{RigHXDH`1Ca>@Qs$unv*plhlqkPR<2iUj~>gVWt*A zfi%oaVx2DRIl<>iTt!N!ec|LZ43`nr8(Zzh+X_HvbUZ2b#&>Z$e&U_F7#r2AdH;!EPuqcvqb{Px1l`D{0a z>pL_}xt84olvXz$FWz8wLJ&n6^LA+?Mk^VngE1nZ;NK9Fr3|5HeuzXIo7E!IY+C5g zC*dUAd*;P*%ci!sYq^RDU+}t33MkCtIsVv!u+{_tsCI}a<8ebnfk)xX0?y1!!L-x@AvMRFH&S^3FjYS*ID(4!xkS2rlx{THW8S}wP)t}-dl!ZcYYjD~Bpt}*rGRpRBo5}2Uh3Pc$VqrC9h^#0UC?aWHu zJcC^=xqu1#0h6N_{lsTkysy+OA#N!_s)(9oNqu40f}|!tCVK%)^CYvDzS?>0=W|3z z5~C(v*%tiGI}DX@hE0>KIhKDb*81K+oz!}GxK@Dc zVQyr3R8em|NM&qo0PKDHbKEx4;Qso}Ux6KGzqNBFXGSl3rz&?ROOB&j$5B~!wzhIx z4u-_cV8tOA0F7OtnBgB0WtgN>aIrIhS!Vy7gp-4CJctpCD9*TiCnW^T2?aCAa0D1m z7YPF23Mm5UGm3H!X9)r^$`W$5LMb1laD}G8m9qiA%Fq(VlsdOAp!tvm@ zZk5OLl*a!BOmf6Ft^nG{|IXgtc&9S{_r`nM@&6#t6ClRt4;P4193ybXDNYxF6F|%> zS3*Kj7;v=863EfO1)YN7aPS1o^CVddqX8(eR#9lo5m~KB`WDVm!oXo1gGBx01i&N# zd}*`}iUCE87D6KMf{+ zT2zopFatCN8DV@u5!2W*$k-*JF*r3p8W3G#zSJ-$bHEUP4j?!~5k(wa;v@kx1R{zc zN3kpm_!2W9wGV)43|1sh#Wzm0Wywe^@fixFNR){>g?tIV7l4`gMdo0R6WKf*;#7!W z=1@ID0LHOfg=4YYngm*>wk2U4d`B3UtxDzv&p2fqrV)|_MX@QE?7Rra;W(TaQVHeY zRQ%J_0lIEN`4sH$?e1v6cvf_xTPG)?vt%JvMB7;nMlvhjSp0$sh!TuaZodeLFao3o zslhE#=wegASh6B9`X| z$rh0yx?@Z^304D|g5l~aAans!{2y6$pwvrbN(`N`aNMIlIYMlOHK_g-W|Umu7*X(p z(+luOG+I-T2 z;p#bnQG^&fM_12m-KOR#7-G08(IgB19bJJ#`3sz*D@lP%Tfg?Rs48qTspUl#THoKk z3X96A;)xg^Z4&zC=*%agi-@^0no%N)ydgwPUyc%z$Mz*o+r?Fv^C*Hvlm+_hQ0mBp zEEa;>W*wQ31p{b>x#-#1mG%vQfi%i8K^G_iXF^*ok@%?I$glF(6j&>hY^=~B8(MN)*Ta}t|+iq!_=1)UsQIZ#DC@LG#C;!sMeghzom zP9sja@Te0jAVnM4Po8El-==<&j$8sdku?xk#rhp&OYkb9R~ZLO@te%We{K;EIsv6o zJ^|>nqCzqIJOGpL5 zHJU87I8AVhe9E#+gK%f{e3TUgJ=b%I6{3q`E`xxXnU$O_Rh679O3fjslXBW(YL_z? z>D^EiaYC;|wbg0NeUezvWE&{)O}NeE&9U7`{HD>SSfHUesvK6n7Nl4TEzz?M|dTs&IP#o+nEy>eJ4K{Q%q4t z7?usH>Qi9FYgw-Na|#yAh=!PqKb6nR$|&k_1O(Qp9VJ$@j{;w8f_2Wd4ruQ;L{cW08Z2!q@4=kB~BONGZHh>Pfx_ zD80axq_QzDAjQJFP)l=hv23H{+hVb9kNdJ1BxV7{3{?N{wAG7hS*bU?XkE)^ziK00 zt5LsSzq*p)R*RT0je%WfjnN$DiN%blDKY@&SK$=W1#5#8--YbcMbV-OzCbBr?39uj zY6CU}h31+mlYNHJ6f8N<*mN{1CILb)V-m3uhwPkQ#d&W~2Nb~=%U_H` z%5ypGnjtn4W8Njy4t)#JNxv;=87RXRiceLo5LzW_UMpzF(X}#`qHE!7wE<&d%jAb-N4kUPmIg@Lz6#bGT z##sa97Fg*d1!z3f6 zLqUmJ2fnL7nF<13fsmRyJ=3OH4b9U-_K_hv1qb{4yL-jUH83fAHXET zDYB4``SK#D+Obwk)~b&yeOoBys#<|+73wH^OT_}E0Ti%-n2QE_l6ueb5z$b3E1`9C><>xH+H!L-2`AzHi$Ac`cs*&) zhS++Jvr5EmZzagyQDf^!4OEYd( zvuX}lfs5f7MZzugFHk6I>bMM;#Uq5_s3`BjRu-2!$})yBv!^5$7`sXuwuu?VJO zW-d*X+$)GdEQAZ0R!1k|{3Vndy2;>{JlN&&}Xe(@jDtVi`## zv&Bd?@bdpkH40b9uGuYU7TI|~N@8>>iFik1UANQBh9*2OaU&dppWkWFpM~%E^IHPr zS1^HTgy_!$P$2H2ATkXiwlUl6yTDn@4s=(H)Cx#o$PNTs z!A#dNdZG!$=_24u6etD)#Xx{FXR)coupKnDwmy@f?_s(?vhyfn%&gc!iU3R!a%o&! zE6W}2?;@@0DKR>nZF4nTDr*YPMq~jc5eKG4cg@Ski_Z+!=xywrG4H_5XvoM-)Ti;^|u15m|aF$;at53?xg!(72o z&|EsN!wHz-G;V55b!ulg6#YzRFmgKCu?p{B9UeKIEeiU2T8sR9lBhFH&fl-FQu#h1 z;52WM0a+)O!uk!p` zpTPWWpVIkXyX-!C_rr(RXCeR0H&I8|`G4`deExTT=f(E??}I!I{r_o+k_=H6^6c(M z!Q1(7}mQGAJjIoB$F%N@jU@b&1|UkBIMftbAD z6oFywMEDQ{MG?995UNljx&0CTsKN?L$HH%f)=wjFuq%J!)mc8DWsU2_(`Xkk3J4O%;EuZuK(@6+fBvv|Ie3{1c2->U_UwkZ^n@V#m$1#9Rmy>-!t1Ac{>Cqe?+GsTK4Q5$bp48f?vFmFO$PM@6MazTz#VKpnXW2)GsA}3S=aFeUCg-- z_PZu!RW26lNkYYJJoU3)XuiP9ox$Y(k@hmZKL$g6zVcRYGRF}O0oct56 zl4o_OGOvMU_KiMm?Aa-Fwif$Xu@bEQ>wB0r%1XI>{mfP1Fj?r$;ac#v!TiVqg=5%D zB!f!(t=E<|oW}+z>Fu)ho7SKT4Jx&5S8iyB$#@oslDFgX4xGsVFL_LCBmBt?m{Z7? zbw_kKx`1><^K_&)I@NyQ$a3zNnOa5id|RIuu;D`>qiBvlug9Q{kqS-N(W%5yu=Q0v zifQ_dJZFI^iox)st=&D)qP{lqTCKA{?F>!y3mCH9E)+JnsVZx1cRCvVg^dJhLmwBV zA*t(IM2-E^S>b~9t+3~qHAni(bgb368bzo>E{a~2r{4UGR$xln(s2RIA${?=cpcc& zD{_g=`Cv>{kW(yuhC+mlT>>B9pA@evr)$dr4#N^HPFzCOuo%jVz>5;)#p?>?&WBr3 zUPOM>DR*e;LAev4Q6k-WU!mRoax3E95R)49EA2+ZG^cEiBdZ;>`LxnCdtz!rFEqkD=H_XKByAK~u z<)&ppYs03s^f1h{*V4?(*Hv9m*y6CFaTZp|KP=>s{eQPUTpRMLp)!I{;$t< zx61#Isr=Q>*0Gip)$gB}4sI>2h@F^dq|!=CQ9#AJl^0zwGZA}DE5}mYOrTRq?#iM> za2$PVBTwCGvT@Qxy^UmT-f}kR|K?gUSn#W<^)@gruC+gSh1nB3diybpu`?933 zk&%eXW?~9%io+;+f2k+78j0@aa3>PyP8tjRH2fAPh=p$wGFu13v+z*g^-0tF?N2 zHqSNg@{@2;3Dx&qhUYKUF-&Xri$(r*48MPaU~A^P&5Ufh&6;!<%=$ zb7Aj)3_yZe@ki!ds~Uhjiv`qL#AYP!u0KWzx-~iGPkGp9J>t*>N_#X@om^P-uhA?d~{OqZNN9Kdv zNtR*Sw-8D{CGiR~K?X$&%s6#Tn4h9m&gEs*dLzBGShMM&@>}hRbo+lZ6|H=K>;F5u z2Yc1^|GjPgmxp<@<%4PL^#MDhH*W7C>L~bi97X5s2l(~Z(s_|Ui|N*5+y(x_RxX%X|n&) z*IB`A6UpE@;{OkXv9HAc?@zY-{}1x`_J2B}=Qg|P(-s=IT>|R1Je6>v&2I1ba6eWP zU)ig_hkcyJ3U0A^GaiqFh)`78hmof&&4jhcTa}OqCi3#Dm*baz)1PrFuSqVhX96IC z942HDL@-*S4m6WyH0CBnL8?Zn&?`6MQ*9>BI80-hkQ5yk*XWm$;TXfEvIL9}k93%4 z^S+COOvqwUWZGd%a;a~#E0L=cEL~sQD1}K!w4O@WqzS<*t8_D>0=jhRs`jDQfB6-(Q{uhwtAX{?oqI zT`aG(mQ@R3ZNfiosLHMn3gq^k`U*Bq2{nF4$JcfmlBs8qNGHrJ_bfkK7b_;cr5Im2g9 z2cWi6=jRh>i*kvbXDmbCn;u+4l0sqI#nwR>cQ<~!|Z{($fDVyOxy^%lk@^6Smy_A zLS9QldX=FNy#Ab_h@%*gR9*)3w31u&Ihf@fEC`I zr>jlU;c6e-E-CkMt$!V7sMLtx>qP+nO(gZ~&p!N0Z}baJ5SD3AhAfunJT{dj05HoA zoj=8JP39`kKM3M0SFicpbh!|Jp#;O!h*WWYLRKKrYJ%VawVUpC|k@-9+ zvc5QFrDF52r89XaxQhP{%~V=!{}hq9N{?+OQE}y4md_F#m1cD2p-83I`;=4cAxd7@ zKN=O2^8MZYzwM49m?Se8op+a??CkFCHt`Vwd``?8^w>RVDI=HO+Y ziDW1}iCyux*|+QQadJWDzfe9Pql8{4xH{i(N}l%(_=34eg&Wlj3u zZnSUU09d>J-+8fr@S=MD>&4zy|3Ap%>SmZ_tT?J&oVB?95$&xGZa-7x471Ii+^Qpf ztjD&TmbiyATMgLPXl#}tnLm&snU0gG1o<*P2`%*0Pualt$VM2Mgd*zm3i4?AwsYjv z6Rs4L9e`5!zQ*eed+~G+&bBIE`ZlRs2I|8N)*5C0-D^*u+XU6OB)Utc3j7Tc)lPbC z7(3jwIq{froGy;c8F06bXo;e8maj%7n36$wDz_uSSD|4vdWf-ymn5!Ht^b0>yS7?`S$<&Cd?$r^ck+8^)dnv5GGUB%J2R!+_@(`o4KY%x zpn;8pmYto}emK*s&qoSvef+U<0p%Bv73TdAf}ve!H_53yr%AnZ*Mq`t8$o8EP|zx_ZS6`>N5!!$1Mvo=d?!ITE9 zo^{#axU1LIF!)?4c37<(;#0lJmX#L)it3s&NC&RaKIbP?e`E&<6y*aYO3Vk%3rW zTc-x!y_7j2{UdtGc~+sznmBd+z{~N=mtN2X&7w}wzj;CR{Ri#Pe^VD9 zboYYPig|WQ$*g*;*!i+q`y?;mJaa3)i>XTR1xgWPiqKw6mq0utd_xB!O0}%RqQ`y- zS$l(cbsS{M;awt_@TJ@^suqyqP?1z`J5mH=yk>i97R`A zg1#f+xU-% zc&_~y5cn_nPZ7T)^c<&)+Qt4S3h)lM`Rk>ZZM;ZJFoWry%?689us+sE5i9!}Ai1@j zTPeQ-;bH{cBiU8-w+V7lNv!Ne7uqytkT0D?Ix`rZqw)zBeTZ`{|Em^?Ry=aasN(yk z`D&&wF>AjkL$pKfo(#KAB|&hU*y8fohE9A?D*Qo4^_;A-1PO;iw(41iB0R^@BWR1! z*N?q5)ZM1!^VL>5yzQ}-5HXQA_b6_Kq^U`^a&jVXVB}jx;%$ycCm(Xwt~SiVi%IyM z{IzWZzFb!l8XRr+dOmw2`#oRGcYQxMQ+2HW2rvDf*MBCv_4_|w?2NbhpC07-a@K$J z2L5*aXS@EhUH`ci;bH{cBiU8-k9GaWdrzwMJ0g-YlKk;p@LpX10X^+@zF~$RAIFcb zmwjgs9|z|blSkLt;U!9v;5;Rl>Eq@6(e-*l7WlFCx8(UT_B6@)qh$Kg^>r$wd)mh_x^J`lI2Ejqbsxtx!#!O0?n8ZxZ4h;zyK_f^!OLwX>*7X> zr|1`dx#3#^<5w_&X@uzTSxdopBu3K2YO7=-gg#I>pX12AT&Du>Em*0lb(IyJz(Ybg@f`-=nFy4E&4)$Jy2gX zSSo#wH{}~QR1W5~+yR?lq=k~UWFLE9)Ffy7G(H{kKYgju-KKyY^S_<(?m>0_cd)me z|2@dFsrjD~6fHR0G>qG+;C3q5dn#!C3BMa%zFJOsZ^cD&u18js+*~Hn|Lp)EwDdZf{ zlmSkF>U(gxL@Ai%IEit(02z$V;R3O6@C1BVVg^{ANhcMsB}x*oNXSg(pvCFpIiM(k z9A6;0Q}4WoX*_rWQnZjF4xVNd&GBaxt8@Z?einis(&P$|R6+`pK!zwtaEih~czpKh zj1!6mPr#8J>EOqsGZ16S2H^tpk^EPYKL}_4p(FXPd9hrK#6RXwc9D(>L^Bwj=NXve z1hK)_A-l{5UxzbzKKMH1EAg99ycm4_{|8UNkC0-LGjMYJnhipI$KN2tF@hsioRWVJ z!V4CW7>#}p?sIAUe-F=*Xod~f(dGZ`)%?HR-JR|F&x1UJH?QBlet-Dk_3@`~Pu{-% zX1GAWYpexUpn;XDsjx-v9-$CP{!^P$OY!Qa1-~I6JpHm=68%X+qC3Wy$;$NEt8>nUo zIOBo3_YZ_45Tq(63JAnYVdvB6D#)`K>UXnz0fInz&VhAiK>z`r!ARbjNhto0x-8L# z(TeZB@Y<0MtQFs3hS6t^QsIR&r^u1KxZT`!d5q>b#Zt%q?|Rb~Eg)J|a&3O-mJokd zTS9UyKFAiBtG^?jh*v5N)9%-&kUx%xBvvqXD|L^VYPpbNV zvbUZ8Kgjb0xDqfJ{P`z4%^!!8aQv^QOU^Sk9gXm65waylNh}B048{vI(uD(AHo)ne z(3Kp*F!?`>UnS_9c>;OBe#s$4&%mF5Qb#vomL)in1v@GbXb$s)%U>*_IFpL%W^faTNBwL5SNbLY8r*=!3y_0q$-VCrv~d9R7k+A2X)9qyt{W0}%r z*nN;T-Y9+pW`rc7{2V3>wSnMN^-AgH?PiAi!G8x?OQY3r5FAJ03^MeQChLN!YEReU6}S^S4x&4=!#Ir2V~Q^jy(3jFrnSlHV`fU_IiYZYLbE?&GkBK4S62a{3z+Ij zP@o($n?S4!dq&9xj;l!7ZeKVx48ujl%)(YXd5b6ubip;NV7noVBE*<-f!1h2529R! z1C{Y$xLO~T*2rgPZ+i+=Gb)tE8Bq%4PTWznkbazxOv|mp7>onuZ{2k$^6fu-?Z<97+bkYx(Fh(?#@*5JmP#25ZA2PMhdbOy; z#t!<6NjM4jUwE3NLZcZ*C=HC)}{HmY&EQ{^i2^v7gBfJuf^XX>+k0_s1o=EeLN_xAccrTxEH?Lx4YbhabAb=&_? zaM$^-$#}QC|F^SyFy8L}J;>ud*K5z(dXDt|_4>Lvq6>cg^{?BJwSBhF_Srta$LD_n P0096053sD*06+l%2)