revert timeout bumps

Author: asmacdo

CHANGELOG.md

@@ -500,5 +500,3 @@
 ### Fixed
 
 - The cache of available clients is being reset every minute for discovery of newely added resources to a cluster. [#280](https://github.com/operator-framework/operator-sdk/pull/280)
-
-

doc/ansible/user-guide.md

@@ -66,8 +66,7 @@ be monitored for updates and cached.
 * **manageStatus** (optional): When true (default), the operator will manage
   the status of the CR generically. Set to false, the status of the CR is
   managed elsewhere, by the specified role/playbook or in a separate controller.
-* **blacklist**: This is a list of child resources (by GVK) that should not have
-  watches created and should not be cached.
+* **blacklist**: A list of child resources (by GVK) that will not be watched or cached.
 
 An example Watches file:
 
@@ -98,7 +97,6 @@ An example Watches file:
     foo: bar
 
 # ConfigMaps owned by a Memcached CR will not be watched or cached.
----
 - version: v1alpha1
   group: cache.example.com
   kind: Memcached

hack/tests/e2e-ansible.sh

@@ -68,7 +68,7 @@ test_operator() {
     fi
 
     header_text "verify that the metrics endpoint exists (Port 8383)"
-    if ! timeout 90s bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sfo /dev/null http://memcached-operator-metrics:8383/metrics; do sleep 1; done";
+    if ! timeout 1m bash -c -- "until kubectl run --attach --rm --restart=Never test-metrics --image=$metrics_test_image -- curl -sfo /dev/null http://memcached-operator-metrics:8383/metrics; do sleep 1; done";
     then
         error_text "FAIL: Failed to verify that metrics endpoint exists"
         operator_logs
@@ -85,15 +85,15 @@ test_operator() {
 
     header_text "create custom resource (Memcached CR)"
     kubectl create -f deploy/crds/ansible.example.com_v1alpha1_memcached_cr.yaml
-    if ! timeout 90s bash -c -- 'until kubectl get deployment -l app=memcached | grep memcached; do sleep 1; done';
+    if ! timeout 60s bash -c -- 'until kubectl get deployment -l app=memcached | grep memcached; do sleep 1; done';
     then
         error_text "FAIL: Failed to verify to create memcached Deployment"
         operator_logs
         exit 1
     fi
 
     header_text "Verify that a config map owned by the CR has been created."
-    if ! timeout 90s bash -c -- "until kubectl get configmap test-blacklist-watches > /dev/null 2>&1; do sleep 1; done";
+    if ! timeout 1m bash -c -- "until kubectl get configmap test-blacklist-watches > /dev/null 2>&1; do sleep 1; done";
     then
         error_text "FAIL: Unable to retrieve config map test-blacklist-watches."
         operator_logs
@@ -110,7 +110,7 @@ test_operator() {
 
 
     header_text "verify that metrics reflect cr creation"
-    if ! timeout 90s bash -c -- "until kubectl run -it --rm --restart=Never test-metrics --image=$metrics_test_image -- curl http://memcached-operator-metrics:8686/metrics | grep example-memcached; do sleep 1; done";
+    if ! timeout 60s bash -c -- "until kubectl run -it --rm --restart=Never test-metrics --image=$metrics_test_image -- curl http://memcached-operator-metrics:8686/metrics | grep example-memcached; do sleep 1; done";
     then
         error_text "FAIL: Failed to verify custom resource metrics"
         operator_logs

internal/scaffold/ansible/molecule_test_cluster_playbook.go

@@ -59,7 +59,7 @@ const moleculeTestClusterPlaybookAnsibleTmpl = `---
     debug:
       msg: "{{ lookup('k8s', group='[[.Resource.FullGroup]]', api_version='[[.Resource.Version]]', kind='[[.Resource.Kind]]', namespace=namespace, resource_name=custom_resource.metadata.name) }}"
 
-  - name: Wait 4m for reconciliation to run
+  - name: Wait 2m for reconciliation to run
     k8s_info:
       api_version: '[[.Resource.Version]]'
       kind: '[[.Resource.Kind]]'
@@ -68,7 +68,7 @@ const moleculeTestClusterPlaybookAnsibleTmpl = `---
     register: reconcile_cr
     until:
     - "'Successful' in (reconcile_cr | json_query('resources[].status.conditions[].reason'))"
-    delay: 24 
+    delay: 12
     retries: 10
 
 - import_playbook: '{{ playbook_dir }}/../default/asserts.yml'

internal/scaffold/ansible/molecule_test_local_playbook.go

@@ -101,7 +101,7 @@ const moleculeTestLocalPlaybookAnsibleTmpl = `---
         namespace: '{{ namespace }}'
         definition: '{{ custom_resource }}'
 
-    - name: Wait 4m for reconciliation to run
+    - name: Wait 2m for reconciliation to run
       k8s_info:
         api_version: '{{ custom_resource.apiVersion }}'
         kind: '{{ custom_resource.kind }}'
@@ -110,7 +110,7 @@ const moleculeTestLocalPlaybookAnsibleTmpl = `---
       register: cr
       until:
       - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
-      delay: 24 
+      delay: 12
       retries: 10
     rescue:
     - name: debug cr

pkg/ansible/proxy/proxy.go

@@ -249,7 +249,7 @@ func addWatchToController(owner kubeconfig.NamespacedOwnerReference, cMap *contr
 			}
 		}
 	} else {
-		log.Info("Resource will not be watched/cached because it is blacklisted.", "GVK", resource.GroupVersionKind())
+		log.Info("Resource will not be watched/cached.", "GVK", resource.GroupVersionKind())
 	}
 	return nil
 }

test/ansible-inventory/molecule/test-local/playbook.yml

@@ -59,7 +59,7 @@
       namespace: '{{ namespace }}'
       definition: "{{ custom_resource }}"
 
-  - name: Wait 4m for reconciliation to run
+  - name: Wait 2m for reconciliation to run
     k8s_info:
       api_version: '{{ custom_resource.apiVersion }}'
       kind: '{{ custom_resource.kind }}'
@@ -68,7 +68,7 @@
     register: cr
     until:
     - "'Successful' in (cr | json_query('resources[].status.conditions[].reason'))"
-    delay: 24
+    delay: 12
     retries: 10
 
 - import_playbook: asserts.yml

test/ansible-memcached/asserts.yml

@@ -118,7 +118,7 @@
           debug:
             var: service
           until: service
-          retries: 24
+          retries: 12
           delay: 10
           vars:
             service: '{{ lookup("k8s",

test/ansible-memcached/tasks.yml

@@ -76,5 +76,4 @@
         namespace: "{{ meta.namespace }}"
       data:
         arbitrary: afdasdfsajsafj
-        # namespace: default
     state: present