Merge branch 'affinity' into 'main'

add affinity settings

Closes hcdc/kubernetes/maintenance#4

See merge request !11

hooks/post_gen_project.py

@@ -9,6 +9,7 @@ os.remove("templates/{{cookiecutter.template_base_name}}-deploymentconfig.yaml")
 os.remove("templates/{{cookiecutter.template_base_name}}-deployment.yaml")
 os.remove("templates/_{{cookiecutter.template_base_name}}_builtin_resources.tpl")
 os.remove("templates/_{{cookiecutter.template_base_name}}_pod_template.tpl")
+os.remove("templates/_{{cookiecutter.template_base_name}}_builtin_affinity.tpl")
 {% if cookiecutter.__include_build_config == "no" %}
 os.remove("templates/{{cookiecutter.template_base_name}}-imagestream.yaml")
 {% endif %}

{{cookiecutter.project_slug}}/templates/_{{cookiecutter.template_base_name}}_builtin_affinity.tpl

+{%- if cookiecutter.__include_deployment != "no" %}
+
+{%- raw %}
+{{- define "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.affinity" -}}
+{%- endraw %}
+{%- if cookiecutter.__include_volume == 'many' or cookiecutter.__include_volume == 'one' %}
+{% raw %}{{- $requiredPodAffinity := "false" | toYaml }}{% endraw %}
+{%- if cookiecutter.__include_volume == 'many' %}
+{%- raw %}
+{{- $builtinVolumes := include "{% endraw %}{{ cookiecutter.template_base_name }}{% raw %}.builtinVolumes" . | fromYaml }}
+{{- $allVolumes := mustMergeOverwrite (dict) $builtinVolumes .Values.volumes }}
+{{- range $name, $options := $allVolumes }}
+  # Check the necessity of podAffinity
+  {{- if $options.accessModes }}
+    {{- range $options.accessModes }}
+      {{- if eq . "ReadWriteOnce" }}
+        {{- $requiredPodAffinity := "true" | toYaml }}
+      {{- end }}
+    {{- end }}
+  {{- else }}
+    {{- $requiredPodAffinity := "true" | toYaml }}
+  {{- end }}
+{{- end }}
+{%- endraw %}
+{% else %}
+{%- raw %}
+{{- if .Values.volumeAccessModes }}
+  {{- range .Values.volumeAccessModes }}
+    {{- if eq . "ReadWriteOnce" }}
+      {{- $requiredPodAffinity := "true" | toYaml }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- $requiredPodAffinity := "true" | toYaml }}
+{{- end }}
+{%- endraw %}
+{%- endif %}
+{%- endif %}
+podAffinity:
+  requiredDuringSchedulingIgnoredDuringExecution:
+    {%- if cookiecutter.__include_volume == 'many' or cookiecutter.__include_volume == 'one' %}
+    {% raw %}{{- if $requiredPodAffinity }}{% endraw %}
+    - labelSelector:
+        matchLabels:
+          io.kompose.service: {% raw %}{{ .Values.baseName }}{% endraw %}
+          {{ "{{-" }} include "{{ cookiecutter.template_base_name }}.selectorLabels" . | nindent 10 {{ "}}" }}
+      topologyKey: kubernetes.io/hostname
+    {% raw %}{{- end }}{% endraw %}
+    {%- endif %}
+{%- raw %}
+{{- end }}
+{%- endraw %}
+{%- endif %}
\ No newline at end of file

{{cookiecutter.project_slug}}/templates/_{{cookiecutter.template_base_name}}_pod_template.tpl

@@ -18,6 +18,7 @@ metadata:
     access: public
     {%- endif %}
 spec:
+  affinity: {{ "{{-" }} include "{{ cookiecutter.template_base_name }}.affinity" . | nindent 4 {{ "}}" }}
   containers:
     - name: {% raw %}{{ .Values.baseName }}{% endraw %}
       {%- if cookiecutter.__deployment_type == "DeploymentConfig" %}