mirror of
https://github.com/ansible/awx.git
synced 2026-02-22 05:30:18 -03:30
remove memcache from everywhere and add djagno-redis to cover it
This commit is contained in:
@@ -27,12 +27,6 @@ kubernetes_redis_image: "redis"
|
||||
kubernetes_redis_image_tag: "latest"
|
||||
kubernetes_redis_config_mount_path: "/usr/local/etc/redis/redis.conf"
|
||||
|
||||
memcached_mem_request: 1
|
||||
memcached_cpu_request: 500
|
||||
|
||||
kubernetes_memcached_version: "latest"
|
||||
kubernetes_memcached_image: "memcached"
|
||||
|
||||
openshift_pg_emptydir: false
|
||||
openshift_pg_pvc_name: postgresql
|
||||
|
||||
|
||||
@@ -161,9 +161,6 @@ spec:
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
mountPath: "/var/run/redis"
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
|
||||
resources:
|
||||
requests:
|
||||
memory: "{{ web_mem_request }}Gi"
|
||||
@@ -236,9 +233,6 @@ spec:
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
mountPath: "/var/run/redis"
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
env:
|
||||
- name: SUPERVISOR_WEB_CONFIG_PATH
|
||||
value: "/etc/supervisord.conf"
|
||||
@@ -293,31 +287,6 @@ spec:
|
||||
{% endif %}
|
||||
{% if redis_cpu_limit is defined %}
|
||||
cpu: "{{ redis_cpu_limit }}m"
|
||||
{% endif %}
|
||||
- name: {{ kubernetes_deployment_name }}-memcached
|
||||
image: "{{ kubernetes_memcached_image }}:{{ kubernetes_memcached_version }}"
|
||||
imagePullPolicy: Always
|
||||
command:
|
||||
- 'memcached'
|
||||
- '-s'
|
||||
- '/var/run/memcached/memcached.sock'
|
||||
- '-a'
|
||||
- '0666'
|
||||
volumeMounts:
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
mountPath: "/var/run/memcached"
|
||||
resources:
|
||||
requests:
|
||||
memory: "{{ memcached_mem_request }}Gi"
|
||||
cpu: "{{ memcached_cpu_request }}m"
|
||||
{% if memcached_mem_limit is defined or memcached_cpu_limit is defined %}
|
||||
limits:
|
||||
{% endif %}
|
||||
{% if memcached_mem_limit is defined %}
|
||||
memory: "{{ memcached_mem_limit }}Gi"
|
||||
{% endif %}
|
||||
{% if memcached_cpu_limit is defined %}
|
||||
cpu: "{{ memcached_cpu_limit }}m"
|
||||
{% endif %}
|
||||
{% if tolerations is defined %}
|
||||
tolerations:
|
||||
@@ -424,9 +393,6 @@ spec:
|
||||
- name: {{ kubernetes_deployment_name }}-redis-socket
|
||||
emptyDir: {}
|
||||
|
||||
- name: {{ kubernetes_deployment_name }}-memcached-socket
|
||||
emptyDir: {}
|
||||
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
|
||||
Reference in New Issue
Block a user