Switch from StatefulSet to Deployment

We can do this now that we dropped RabbitMQ.
This commit is contained in:
Shane McDonald
2020-03-31 12:59:32 -04:00
parent 344a4bb238
commit 3060505110
2 changed files with 7 additions and 8 deletions

View File

@@ -30,7 +30,7 @@
kubectl_or_oc: "{{ openshift_oc_bin if openshift_oc_bin is defined else 'kubectl' }}" kubectl_or_oc: "{{ openshift_oc_bin if openshift_oc_bin is defined else 'kubectl' }}"
- set_fact: - set_fact:
deployment_object: "sts" deployment_object: "deployment"
- name: Record deployment size - name: Record deployment size
shell: | shell: |
@@ -137,7 +137,7 @@
shell: | shell: |
POD=$({{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \ POD=$({{ kubectl_or_oc }} -n {{ kubernetes_namespace }} \
get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}") get pods -l=name=postgresql --field-selector status.phase=Running -o jsonpath="{.items[0].metadata.name}")
oc exec $POD -n {{ kubernetes_namespace }} -- bash -c "psql -tAc 'select version()'" {{ kubectl_or_oc }} exec $POD -n {{ kubernetes_namespace }} -- bash -c "psql -tAc 'select version()'"
register: pg_version register: pg_version
- name: Upgrade postgres if necessary - name: Upgrade postgres if necessary
block: block:
@@ -200,9 +200,9 @@
when: kubernetes_web_image is not defined when: kubernetes_web_image is not defined
when: docker_registry is defined when: docker_registry is defined
- name: Determine StatefulSet api version - name: Determine Deployment api version
set_fact: set_fact:
kubernetes_statefulset_api_version: "{{ 'apps/v1' if kube_api_version is version('1.9', '>=') else 'apps/v1beta1' }}" kubernetes_deployment_api_version: "{{ 'apps/v1' if kube_api_version is version('1.9', '>=') else 'apps/v1beta1' }}"
- name: Render deployment templates - name: Render deployment templates
set_fact: set_fact:

View File

@@ -16,8 +16,8 @@ imagePullSecrets:
{% endif %} {% endif %}
--- ---
apiVersion: {{ kubernetes_statefulset_api_version }} apiVersion: {{ kubernetes_deployment_api_version }}
kind: StatefulSet kind: Deployment
metadata: metadata:
name: {{ kubernetes_deployment_name }} name: {{ kubernetes_deployment_name }}
namespace: {{ kubernetes_namespace }} namespace: {{ kubernetes_namespace }}
@@ -26,9 +26,8 @@ metadata:
app: {{ kubernetes_deployment_name }} app: {{ kubernetes_deployment_name }}
{% endif %} {% endif %}
spec: spec:
serviceName: {{ kubernetes_deployment_name }}
replicas: 1 replicas: 1
{% if kubernetes_statefulset_api_version == "apps/v1" %} {% if kubernetes_deployment_api_version == "apps/v1" %}
selector: selector:
matchLabels: matchLabels:
app: {{ kubernetes_deployment_name }} app: {{ kubernetes_deployment_name }}