Generalize variable names in installer

secret_key

installer/roles/kubernetes/templates/configmap.yml.j2

@@ -1,33 +1,33 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: awx-config
-  namespace: {{ awx_kubernetes_namespace }}
+  name: {{ kubernetes_deployment_name }}-config
+  namespace: {{ kubernetes_namespace }}
 data:
-  secret_key: {{ awx_secret_key }}
-  awx_settings: |
+  secret_key: {{ secret_key }}
+  {{ kubernetes_deployment_name }}_settings: |
     import os
     import socket
     ADMINS = ()
-    
+
     # Container environments don't like chroots
     AWX_PROOT_ENABLED = False
 
     # Automatically deprovision pods that go offline
     AWX_AUTO_DEPROVISION_INSTANCES = True
 
-    SYSTEM_TASK_ABS_CPU = {{ ((awx_task_cpu_request|int / 1000) * 4)|int }}
-    SYSTEM_TASK_ABS_MEM = {{ ((awx_task_mem_request|int * 1024) / 100)|int }}
+    SYSTEM_TASK_ABS_CPU = {{ ((task_cpu_request|int / 1000) * 4)|int }}
+    SYSTEM_TASK_ABS_MEM = {{ ((task_mem_request|int * 1024) / 100)|int }}
 
     #Autoprovisioning should replace this
     CLUSTER_HOST_ID = socket.gethostname()
     SYSTEM_UUID = '00000000-0000-0000-0000-000000000000'
 
     SESSION_COOKIE_SECURE = False
-    CSRF_COOKIE_SECURE = False 
+    CSRF_COOKIE_SECURE = False
 
     REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR']
-    
+
     STATIC_ROOT = '/var/lib/awx/public/static'
     PROJECTS_ROOT = '/var/lib/awx/projects'
     JOBOUTPUT_ROOT = '/var/lib/awx/job_status'
@@ -42,13 +42,13 @@ data:
     EMAIL_HOST_USER = ''
     EMAIL_HOST_PASSWORD = ''
     EMAIL_USE_TLS = False
-    
+
     LOGGING['handlers']['console'] = {
         '()': 'logging.StreamHandler',
         'level': 'DEBUG',
         'formatter': 'simple',
     }
-    
+
     LOGGING['loggers']['django.request']['handlers'] = ['console']
     LOGGING['loggers']['rest_framework.request']['handlers'] = ['console']
     LOGGING['loggers']['awx']['handlers'] = ['console']
@@ -68,7 +68,7 @@ data:
     LOGGING['handlers']['rbac_migrations'] = {'class': 'logging.NullHandler'}
     LOGGING['handlers']['system_tracking_migrations'] = {'class': 'logging.NullHandler'}
     LOGGING['handlers']['management_playbooks'] = {'class': 'logging.NullHandler'}
-    
+
     DATABASES = {
         'default': {
             'ATOMIC_REQUESTS': True,

installer/roles/kubernetes/templates/deployment.yml.j2

@@ -2,7 +2,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
   name: rabbitmq
   labels:
     app: rabbitmq
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: rabbitmq-config
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 data:
   enabled_plugins: |
       [rabbitmq_management,rabbitmq_peer_discovery_k8s].
@@ -52,7 +52,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: rabbitmq
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 
 {% if kubernetes_context is defined %}
 ---
@@ -60,7 +60,7 @@ kind: Role
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: endpoint-reader
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 rules:
 - apiGroups: [""]
   resources: ["endpoints"]
@@ -70,7 +70,7 @@ kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1beta1
 metadata:
   name: endpoint-reader
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 subjects:
 - kind: ServiceAccount
   name: rabbitmq
@@ -86,7 +86,7 @@ kind: Role
 apiVersion: v1
 metadata:
   name: endpoint-reader
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]
@@ -96,16 +96,16 @@ kind: RoleBinding
 apiVersion: v1
 metadata:
   name: endpoint-reader
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 roleRef:
   name: endpoint-reader
-  namespace: {{ awx_kubernetes_namespace }}
+  namespace: {{ kubernetes_namespace }}
 subjects:
   - kind: ServiceAccount
     name: rabbitmq
-    namespace: {{ awx_kubernetes_namespace }}
+    namespace: {{ kubernetes_namespace }}
 userNames:
-  - system:serviceaccount:{{ awx_kubernetes_namespace }}:rabbitmq
+  - system:serviceaccount:{{ kubernetes_namespace }}:rabbitmq
 {% endif %}
 
 ---
@@ -124,30 +124,30 @@ spec:
   template:
     metadata:
       labels:
-        name: awx-web-deploy
+        name: {{ kubernetes_deployment_name }}-web-deploy
         service: django
         app: rabbitmq
     spec:
       serviceAccountName: rabbitmq
       containers:
-        - name: awx-web
-          image: {{ awx_web_kubernetes_image }}
+        - name: {{ kubernetes_deployment_name }}-web
+          image: {{ web_kubernetes_image }}
           imagePullPolicy: Always
           ports:
             - containerPort: 8052
           volumeMounts:
             - mountPath: /etc/tower
-              name: awx-application-config
+              name: {{ kubernetes_deployment_name }}-application-config
           resources:
             requests:
-              memory: "{{ awx_web_mem_request }}Gi"
-              cpu: "{{ awx_web_cpu_request }}m"
-        - name: awx-celery
-          image: {{ awx_task_kubernetes_image }}
+              memory: "{{ web_mem_request }}Gi"
+              cpu: "{{ web_cpu_request }}m"
+        - name: {{ kubernetes_deployment_name }}-celery
+          image: {{ task_kubernetes_image }}
           imagePullPolicy: Always
           volumeMounts:
             - mountPath: /etc/tower
-              name: awx-application-config
+              name: {{ kubernetes_deployment_name }}-application-config
           env:
             - name: DATABASE_USER
               value: {{ pg_username }}
@@ -169,9 +169,9 @@ spec:
               value: {{ default_admin_password|default('password') }}
           resources:
             requests:
-              memory: "{{ awx_task_mem_request }}Gi"
-              cpu: "{{ awx_task_cpu_request }}m"
-        - name: awx-rabbit
+              memory: "{{ task_mem_request }}Gi"
+              cpu: "{{ task_cpu_request }}m"
+        - name: {{ kubernetes_deployment_name }}-rabbit
           image: ansible/awx_rabbitmq:{{ rabbitmq_version }}
           imagePullPolicy: Always
           ports:
@@ -209,20 +209,20 @@ spec:
               mountPath: /etc/rabbitmq
           resources:
             requests:
-              memory: "{{ awx_rabbitmq_mem_request }}Gi"
-              cpu: "{{ awx_rabbitmq_cpu_request }}m"
-        - name: awx-memcached
+              memory: "{{ rabbitmq_mem_request }}Gi"
+              cpu: "{{ rabbitmq_cpu_request }}m"
+        - name: {{ kubernetes_deployment_name }}-memcached
           image: memcached
           resources:
             requests:
-              memory: "{{ awx_memcached_mem_request }}Gi"
-              cpu: "{{ awx_memcached_cpu_request }}m"
+              memory: "{{ memcached_mem_request }}Gi"
+              cpu: "{{ memcached_cpu_request }}m"
       volumes:
-        - name: awx-application-config
+        - name: {{ kubernetes_deployment_name }}-application-config
           configMap:
-            name: awx-config
+            name: {{ kubernetes_deployment_name }}-config
             items:
-              - key: awx_settings
+              - key: {{ kubernetes_deployment_name }}_settings
                 path: settings.py
               - key: secret_key
                 path: SECRET_KEY
@@ -238,10 +238,10 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: awx-web-svc
-  namespace: {{ awx_kubernetes_namespace }}
+  name: {{ kubernetes_deployment_name }}-web-svc
+  namespace: {{ kubernetes_namespace }}
   labels:
-    name: awx-web-svc
+    name: {{ kubernetes_deployment_name }}-web-svc
 spec:
   type: "NodePort"
   ports:
@@ -249,15 +249,15 @@ spec:
       port: 80
       targetPort: 8052
   selector:
-    name: awx-web-deploy
+    name: {{ kubernetes_deployment_name }}-web-deploy
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: awx-rmq-mgmt
-  namespace: {{ awx_kubernetes_namespace }}
+  name: {{ kubernetes_deployment_name }}-rmq-mgmt
+  namespace: {{ kubernetes_namespace }}
   labels:
-    name: awx-rmq-mgmt
+    name: {{ kubernetes_deployment_name }}-rmq-mgmt
 spec:
   type: ClusterIP
   ports:
@@ -265,17 +265,17 @@ spec:
       port: 15672
       targetPort: 15672
   selector:
-    name: awx-web-deploy
+    name: {{ kubernetes_deployment_name }}-web-deploy
 {% if kubernetes_context is defined %}
 ---
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: awx-web-svc
-  namespace: {{ awx_kubernetes_namespace }}
+  name: {{ kubernetes_deployment_name }}-web-svc
+  namespace: {{ kubernetes_namespace }}
 spec:
   backend:
-    serviceName: awx-web-svc
+    serviceName: {{ kubernetes_deployment_name }}-web-svc
     servicePort: 80
 {% endif %}
 {% if openshift_host is defined %}
@@ -283,8 +283,8 @@ spec:
 apiVersion: v1
 kind: Route
 metadata:
-  name: awx-web-svc
-  namespace: {{ awx_kubernetes_namespace }}
+  name: {{ kubernetes_deployment_name }}-web-svc
+  namespace: {{ kubernetes_namespace }}
 spec:
   port:
     targetPort: http
@@ -293,7 +293,7 @@ spec:
     termination: edge
   to:
     kind: Service
-    name: awx-web-svc
+    name: {{ kubernetes_deployment_name }}-web-svc
     weight: 100
   wildcardPolicy: None
 {% endif %}