fix(lint): errors with role variable namming

hiteshnayak305 · Dec 7, 2024 · dc5080a · dc5080a
1 parent f78e21f
commit dc5080a
Show file tree

Hide file tree

Showing 131 changed files with 501 additions and 504 deletions.
diff --git a/roles/k8s_gitea/defaults/main.yml b/roles/k8s_gitea/defaults/main.yml
@@ -1,20 +1,17 @@
 ---
 # defaults file for k8s_gitea
 
-# tmpdir
-tmpdir: /tmp
+k8s_gitea_nfs_server: "{{ nfs_server | default('nfs.domain.com') }}"
 
-nfs_server: nfs.domain.com
-
-kubernetes_ingress_root_domain: domain.com
+k8s_gitea_ingress_root_domain: "{{ kubernetes_ingress_root_domain | default('domain.com') }}"
 
 # admin user
-gitea_admin_username: admin
-gitea_admin_password: password
+k8s_gitea_admin_username: admin
+k8s_gitea_admin_password: password
 
 # system gpg key
-gitea_gpg_key: ""
+k8s_gitea_gpg_key: ""
 
 # oauth secret
-gitea_oauth_key: key
-gitea_oauth_secret: secret
+k8s_gitea_oauth_key: key
+k8s_gitea_oauth_secret: secret
diff --git a/roles/k8s_gitea/tasks/main.yml b/roles/k8s_gitea/tasks/main.yml
@@ -23,7 +23,7 @@
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - pv/pv_gitea.j2
           - pv/pv_gitea_postgresql_ha_primary.j2
 
@@ -32,7 +32,7 @@
         name: utility
         tasks_from: k8s_install_yml
       vars:
-        k8s_install_ymls:
+        utility_k8s_install_ymls:
           - files/gitea_namespace.yml
           - files/pvc_gitea.yml
           - files/pvc_gitea_postgresql_ha_primary.yml
@@ -42,7 +42,7 @@
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - secret/gitea_admin_secret.j2
           - secret/gitea_gpg_key.j2
           - secret/gitea_oauth_secret.j2
@@ -55,14 +55,14 @@
     - name: Copy values file
       ansible.builtin.copy:
         src: files/gitea_values.yml
-        dest: "{{ tmpdir }}/gitea_values.yml"
+        dest: "{{ k8s_gitea_tmpdir }}/gitea_values.yml"
         mode: preserve
       changed_when: false
 
     - name: Copy values file
       ansible.builtin.template:
         src: values/gitea_values_var.j2
-        dest: "{{ tmpdir }}/gitea_values_var.yml"
+        dest: "{{ k8s_gitea_tmpdir }}/gitea_values_var.yml"
         mode: preserve
       changed_when: false
 
@@ -75,8 +75,8 @@
         release_namespace: gitea-system
         create_namespace: false
         values_files:
-          - "{{ tmpdir }}/gitea_values.yml"
-          - "{{ tmpdir }}/gitea_values_var.yml"
+          - "{{ k8s_gitea_tmpdir }}/gitea_values.yml"
+          - "{{ k8s_gitea_tmpdir }}/gitea_values_var.yml"
         wait: true
         timeout: "10m0s"
       when: not ansible_check_mode
@@ -86,22 +86,22 @@
         path: "{{ item }}"
         state: absent
       with_items:
-        - "{{ tmpdir }}/gitea_values.yml"
-        - "{{ tmpdir }}/gitea_values_var.yml"
+        - "{{ k8s_gitea_tmpdir }}/gitea_values.yml"
+        - "{{ k8s_gitea_tmpdir }}/gitea_values_var.yml"
       changed_when: false
 
     - name: Install ingress internal
       ansible.builtin.include_role:
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - ingress/gitea_ingress_internal.j2
 
     - name: Install grafana dashboard for gitea
       ansible.builtin.include_role:
         name: utility
         tasks_from: k8s_install_yml
       vars:
-        k8s_install_ymls:
+        utility_k8s_install_ymls:
           - files/gitea_grafana_dashboard.yml
diff --git a/roles/k8s_gitea/templates/ingress/gitea_ingress_internal.j2 b/roles/k8s_gitea/templates/ingress/gitea_ingress_internal.j2
@@ -5,7 +5,7 @@ metadata:
   namespace: gitea-system
   annotations:
     cert-manager.io/cluster-issuer: ca-cluster-issuer
-    cert-manager.io/common-name: "gitea.{{ kubernetes_ingress_root_domain }}"
+    cert-manager.io/common-name: "gitea.{{ k8s_gitea_ingress_root_domain }}"
     cert-manager.io/email-sans: hiteshnayak305@gmail.com
     cert-manager.io/private-key-algorithm: RSA
     cert-manager.io/private-key-size: '4096'
@@ -21,10 +21,10 @@ spec:
   ingressClassName: nginx-internal
   tls:
     - hosts:
-        - "gitea.{{ kubernetes_ingress_root_domain }}"
+        - "gitea.{{ k8s_gitea_ingress_root_domain }}"
       secretName: gitea-tls-internal
   rules:
-    - host: "gitea.{{ kubernetes_ingress_root_domain }}"
+    - host: "gitea.{{ k8s_gitea_ingress_root_domain }}"
       http:
         paths:
           - path: /

diff --git a/roles/k8s_gitea/templates/pv/pv_gitea.j2 b/roles/k8s_gitea/templates/pv/pv_gitea.j2
@@ -8,7 +8,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   nfs:
-    server: {{ nfs_server }}
+    server: {{ k8s_gitea_nfs_server }}
     path: "/mnt/nfs/ssd_0/pv-gitea"
   mountOptions:
     - nfsvers=4.2
diff --git a/roles/k8s_gitea/templates/pv/pv_gitea_postgresql_ha_primary.j2 b/roles/k8s_gitea/templates/pv/pv_gitea_postgresql_ha_primary.j2
@@ -8,7 +8,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   nfs:
-    server: {{ nfs_server }}
+    server: {{ k8s_gitea_nfs_server }}
     path: "/mnt/nfs/ssd_0/pv-gitea-postgresql-ha-primary"
   mountOptions:
     - nfsvers=4.2
diff --git a/roles/k8s_gitea/templates/secret/gitea_admin_secret.j2 b/roles/k8s_gitea/templates/secret/gitea_admin_secret.j2
@@ -5,5 +5,5 @@ metadata:
   namespace: gitea-system
 type: Opaque
 stringData:
-  username: {{ gitea_admin_username }}
-  password: {{ gitea_admin_password }}
+  username: {{ k8s_gitea_admin_username }}
+  password: {{ k8s_gitea_admin_password }}
diff --git a/roles/k8s_gitea/templates/secret/gitea_gpg_key.j2 b/roles/k8s_gitea/templates/secret/gitea_gpg_key.j2
@@ -7,4 +7,4 @@ metadata:
 type: Opaque
 stringData:
   privateKey: |-
-{{ gitea_gpg_key | indent(width=4, first=True) }}
+{{ k8s_gitea_gpg_key | indent(width=4, first=True) }}
diff --git a/roles/k8s_gitea/templates/secret/gitea_oauth_secret.j2 b/roles/k8s_gitea/templates/secret/gitea_oauth_secret.j2
@@ -5,5 +5,5 @@ metadata:
   namespace: gitea-system
 type: Opaque
 stringData:
-  key: {{ gitea_oauth_key }}
-  secret: {{ gitea_oauth_secret }}
+  key: {{ k8s_gitea_oauth_key }}
+  secret: {{ k8s_gitea_oauth_secret }}
diff --git a/roles/k8s_gitea/templates/values/gitea_values_var.j2 b/roles/k8s_gitea/templates/values/gitea_values_var.j2
@@ -1,7 +1,7 @@
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: ca-cluster-issuer
-    cert-manager.io/common-name: "gitea.{{ kubernetes_ingress_root_domain }}"
+    cert-manager.io/common-name: "gitea.{{ k8s_gitea_ingress_root_domain }}"
     cert-manager.io/email-sans: hiteshnayak305@gmail.com
     cert-manager.io/subject-organizations: DEV
     cert-manager.io/subject-organizationalunits: DEV
@@ -14,31 +14,31 @@ ingress:
     nginx.ingress.kubernetes.io/proxy-body-size: 200m
     nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
   hosts:
-    - host: gitea.{{ kubernetes_ingress_root_domain }}
+    - host: gitea.{{ k8s_gitea_ingress_root_domain }}
       paths:
         - path: /
           pathType: Prefix
   tls:
     - secretName: gitea-tls
       hosts:
-        - "gitea.{{ kubernetes_ingress_root_domain }}"
+        - "gitea.{{ k8s_gitea_ingress_root_domain }}"
 gitea:
   admin:
-    email: gitea@gitea.{{ kubernetes_ingress_root_domain }}
+    email: gitea@gitea.{{ k8s_gitea_ingress_root_domain }}
   # Either specify inline `key` and `secret` or refer to them via `existingSecret`
   ## @param gitea.oauth OAuth configuration
   oauth:
     - name: "keycloak"
       provider: "openidConnect"
       existingSecret: gitea-oauth-secret
       iconUrl: "https://www.keycloak.org/resources/images/icon.svg"
-      autoDiscoverUrl: "https://keycloak.{{ kubernetes_ingress_root_domain }}/realms/main/.well-known/openid-configuration"
+      autoDiscoverUrl: "https://keycloak.{{ k8s_gitea_ingress_root_domain }}/realms/main/.well-known/openid-configuration"
   config:
     server:
-      DOMAIN: gitea.{{ kubernetes_ingress_root_domain }}
-      ROOT_URL: https://gitea.{{ kubernetes_ingress_root_domain }}/
-      SSH_DOMAIN: gitea.{{ kubernetes_ingress_root_domain }}
+      DOMAIN: gitea.{{ k8s_gitea_ingress_root_domain }}
+      ROOT_URL: https://gitea.{{ k8s_gitea_ingress_root_domain }}/
+      SSH_DOMAIN: gitea.{{ k8s_gitea_ingress_root_domain }}
     repository.signing:
-      SIGNING_EMAIL: gitea@gitea.{{ kubernetes_ingress_root_domain }}
+      SIGNING_EMAIL: gitea@gitea.{{ k8s_gitea_ingress_root_domain }}
     webhook:
-      ALLOWED_HOST_LIST: "*.{{ kubernetes_ingress_root_domain }}"
+      ALLOWED_HOST_LIST: "*.{{ k8s_gitea_ingress_root_domain }}"
diff --git a/roles/k8s_gitea/vars/main.yml b/roles/k8s_gitea/vars/main.yml
@@ -1,2 +1,4 @@
 ---
 # vars file for k8s_gitea
+# k8s_gitea_tmpdir
+k8s_gitea_tmpdir: /tmp
diff --git a/roles/k8s_grafana/defaults/main.yml b/roles/k8s_grafana/defaults/main.yml
@@ -1,13 +1,13 @@
 ---
 # defaults file for k8s_authentik
 
-# tmpdir
-tmpdir: /tmp
+# k8s_grafana_tmpdir
+k8s_grafana_tmpdir: /tmp
 
-nfs_server: nfs.domain.com
-kubernetes_ingress_root_domain: domain.com
+k8s_grafana_nfs_server: "{{ nfs_server | default('nfs.domain.com') }}"
+k8s_grafana_ingress_root_domain: "{{ kubernetes_ingress_root_domain | default('domain.com') }}"
 
-grafana_admin_user: user
-grafana_admin_password: password
+k8s_grafana_admin_user: user
+k8s_grafana_admin_password: password
 
-grafana_oauth_client_secret: secret
+k8s_grafana_oauth_client_secret: secret
diff --git a/roles/k8s_grafana/tasks/main.yml b/roles/k8s_grafana/tasks/main.yml
@@ -22,15 +22,15 @@
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - pv/pv_grafana.j2
 
     - name: Install prereq for grafana
       ansible.builtin.include_role:
         name: utility
         tasks_from: k8s_install_yml
       vars:
-        k8s_install_ymls:
+        utility_k8s_install_ymls:
           - files/grafana_namespace.yml
           - files/pvc_grafana.yml
 
@@ -39,7 +39,7 @@
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - secret/grafana_admin_secret.j2
 
     - name: Add Grafana helm repository
@@ -50,7 +50,7 @@
     - name: Copy values file
       ansible.builtin.copy:
         src: "files/{{ item }}"
-        dest: "{{ tmpdir }}/{{ item }}"
+        dest: "{{ k8s_grafana_tmpdir }}/{{ item }}"
         mode: preserve
       changed_when: false
       with_items:
@@ -59,7 +59,7 @@
     - name: Copy values file
       ansible.builtin.template:
         src: values/grafana_values_var.j2
-        dest: "{{ tmpdir }}/grafana_values_var.yml"
+        dest: "{{ k8s_grafana_tmpdir }}/grafana_values_var.yml"
         mode: preserve
       changed_when: false
 
@@ -72,8 +72,8 @@
         release_namespace: grafana-system
         create_namespace: false
         values_files:
-          - "{{ tmpdir }}/grafana_values.yml"
-          - "{{ tmpdir }}/grafana_values_var.yml"
+          - "{{ k8s_grafana_tmpdir }}/grafana_values.yml"
+          - "{{ k8s_grafana_tmpdir }}/grafana_values_var.yml"
         wait: true
         timeout: "10m0s"
       when: not ansible_check_mode
@@ -83,24 +83,24 @@
         path: "{{ item }}"
         state: absent
       with_items:
-        - "{{ tmpdir }}/grafana_values.yml"
-        - "{{ tmpdir }}/grafana_values_var.yml"
+        - "{{ k8s_grafana_tmpdir }}/grafana_values.yml"
+        - "{{ k8s_grafana_tmpdir }}/grafana_values_var.yml"
       changed_when: false
 
     - name: Install ingress internal
       ansible.builtin.include_role:
         name: utility
         tasks_from: k8s_install_j2
       vars:
-        k8s_install_j2s:
+        utility_k8s_install_j2s:
           - ingress/grafana_ingress_internal.j2
 
     - name: Install common dashboards grafana
       ansible.builtin.include_role:
         name: utility
         tasks_from: k8s_install_yml
       vars:
-        k8s_install_ymls:
+        utility_k8s_install_ymls:
           - dashboards/kubernetes_views_global_dashboard.yml
           - dashboards/kubernetes_views_namespace_dashboard.yml
           - dashboards/kubernetes_views_nodes_dashboard.yml

diff --git a/roles/k8s_grafana/templates/ingress/grafana_ingress_internal.j2 b/roles/k8s_grafana/templates/ingress/grafana_ingress_internal.j2
@@ -5,7 +5,7 @@ metadata:
   namespace: grafana-system
   annotations:
     cert-manager.io/cluster-issuer: ca-cluster-issuer
-    cert-manager.io/common-name: "grafana.{{ kubernetes_ingress_root_domain }}"
+    cert-manager.io/common-name: "grafana.{{ k8s_grafana_ingress_root_domain }}"
     cert-manager.io/email-sans: hiteshnayak305@gmail.com
     cert-manager.io/private-key-algorithm: RSA
     cert-manager.io/private-key-size: '4096'
@@ -20,10 +20,10 @@ spec:
   ingressClassName: nginx-internal
   tls:
     - hosts:
-        - "grafana.{{ kubernetes_ingress_root_domain }}"
+        - "grafana.{{ k8s_grafana_ingress_root_domain }}"
       secretName: grafana-tls-internal
   rules:
-    - host: "grafana.{{ kubernetes_ingress_root_domain }}"
+    - host: "grafana.{{ k8s_grafana_ingress_root_domain }}"
       http:
         paths:
           - path: /

diff --git a/roles/k8s_grafana/templates/pv/pv_grafana.j2 b/roles/k8s_grafana/templates/pv/pv_grafana.j2
@@ -8,7 +8,7 @@ spec:
   accessModes:
     - ReadWriteOnce
   nfs:
-    server: {{ nfs_server }}
+    server: {{ k8s_grafana_nfs_server }}
     path: "/mnt/nfs/ssd_0/pv-grafana"
   mountOptions:
     - nfsvers=4.2
diff --git a/roles/k8s_grafana/templates/secret/grafana_admin_secret.j2 b/roles/k8s_grafana/templates/secret/grafana_admin_secret.j2
@@ -5,6 +5,6 @@ metadata:
   namespace: grafana-system
 type: Opaque
 stringData:
-  admin-user: {{ grafana_admin_user }}
-  admin-password: {{ grafana_admin_password }}
+  admin-user: {{ k8s_grafana_admin_user }}
+  admin-password: {{ k8s_grafana_admin_password }}