Yaml lint

RedHatGov · Feb 16, 2021 · fbaa10c · fbaa10c
1 parent d9a7bd6
commit fbaa10c
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 37 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -23,29 +23,29 @@ spec:
         control-plane: controller-manager
     spec:
       containers:
-        - name: manager
-          args:
-            - "--enable-leader-election"
-            - "--leader-election-id=gitea-operator"
-          image: controller:latest
-          env:
-          - name: ANSIBLE_GATHERING
-            value: explicit
-          - name: WATCH_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.annotations['olm.targetNamespaces']
-          livenessProbe:
-            httpGet:
-              path: /readyz
-              port: 6789
-            initialDelaySeconds: 15
-            periodSeconds: 20
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: 6789
-            initialDelaySeconds: 5
-            periodSeconds: 10
+      - name: manager
+        args:
+        - "--enable-leader-election"
+        - "--leader-election-id=gitea-operator"
+        image: controller:latest
+        env:
+        - name: ANSIBLE_GATHERING
+          value: explicit
+        - name: WATCH_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.annotations['olm.targetNamespaces']
+        livenessProbe:
+          httpGet:
+            path: /readyz
+            port: 6789
+          initialDelaySeconds: 15
+          periodSeconds: 20
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 6789
+          initialDelaySeconds: 5
+          periodSeconds: 10
       terminationGracePeriodSeconds: 10
       serviceAccountName: gitea-operator-sa
diff --git a/molecule/kind-cluster/create.yml b/molecule/kind-cluster/create.yml
@@ -5,4 +5,7 @@
   gather_facts: false
   tasks:
   - name: Install nginx Ingress onto kind
-    command: helm install kind-ingress stable/nginx-ingress --set controller.service.type=NodePort --set controller.service.nodePorts.http=30080
+    command: >
+      helm install kind-ingress stable/nginx-ingress
+      --set controller.service.type=NodePort
+      --set controller.service.nodePorts.http=30080
diff --git a/roles/gitea-ocp/tasks/main.yml b/roles/gitea-ocp/tasks/main.yml
@@ -85,7 +85,7 @@
     kind: Pod
     namespace: '{{ _gitea_namespace }}'
     label_selectors:
-      - "app={{ _gitea_name }}"
+    - "app={{ _gitea_name }}"
   register: gitea_pod
 
 - set_fact:
@@ -100,16 +100,22 @@
 
 - name: Generate administrator password
   block:
-    - set_fact:
-        gitea_admin_password: "{{ lookup('password', '/dev/null length=15 chars=ascii_letters') }}"
+  - set_fact:
+      gitea_admin_password: "{{ lookup('password', '/dev/null length=15 chars=ascii_letters') }}"
 
-    - name: Create gitea-admin-credentials Secret
-      k8s:
-        definition: "{{ lookup('template', 'secret.yml.j2') | from_yaml }}"
+  - name: Create gitea-admin-credentials Secret
+    k8s:
+      definition: "{{ lookup('template', 'secret.yml.j2') | from_yaml }}"
 
-    - name: Create Gitea admin user
-      community.kubernetes.k8s_exec:
-        namespace: "{{ _gitea_namespace }}"
-        pod: '{{ gitea_pod_name }}'
-        command: /home/gitea/gitea --config=/home/gitea/conf/app.ini admin create-user --username '{{ _gitea_admin_user }}' --password '{{ gitea_admin_password }}' --admin --email '{{ _gitea_admin_email }}' --access-token --must-change-password=false
+  - name: Create Gitea admin user
+    community.kubernetes.k8s_exec:
+      namespace: "{{ _gitea_namespace }}"
+      pod: '{{ gitea_pod_name }}'
+      command: >
+        /home/gitea/gitea --config=/home/gitea/conf/app.ini
+        admin create-user --admin --access-token
+        --username '{{ _gitea_admin_user }}'
+        --password '{{ gitea_admin_password }}'
+        --email '{{ _gitea_admin_email }}'
+        --must-change-password=false
   when: not gitea_admin_credentials.resources
diff --git a/roles/gitea-ocp/tasks/user.yml b/roles/gitea-ocp/tasks/user.yml
@@ -17,4 +17,10 @@
   community.kubernetes.k8s_exec:
     namespace: "{{ _gitea_namespace }}"
     pod: '{{ gitea_pod_name }}'
-    command: /home/gitea/gitea --config=/home/gitea/conf/app.ini admin create-user --username '{{ _giteauser.username }}' --password '{{ _giteauser.password }}' --email '{{ _giteauser.email }}' --access-token --must-change-password=false
+    command: >
+      /home/gitea/gitea --config=/home/gitea/conf/app.ini
+      admin create-user --access-token
+      --username '{{ _giteauser.username }}'
+      --password '{{ _giteauser.password }}'
+      --email '{{ _giteauser.email }}'
+      --must-change-password=false