Merge pull request #91 from camilamacedo86/up-ansible-012

camilamacedo86 · web-flow · commit 27342c7c656a · 2019-11-18T16:28:40.000Z
Migrate Ansible Sample to use SDK 0.12
diff --git a/ansible/memcached-operator/Makefile b/ansible/memcached-operator/Makefile
@@ -8,20 +8,20 @@ install: ## Install all resources (CR/CRD's, RBCA and Operator)
 	@echo ....... Creating namespace ....... 
 	- kubectl create namespace ${NAMESPACE}
 	@echo ....... Applying CRDS and Operator .......
-	- kubectl apply -f deploy/crds/cache_v1alpha1_memcached_crd.yaml -n ${NAMESPACE}
+	- kubectl apply -f deploy/crds/cache.example.com_memcacheds_crd.yaml -n ${NAMESPACE}
 	@echo ....... Applying Rules and Service Account .......
 	- kubectl apply -f deploy/role.yaml -n ${NAMESPACE}
 	- kubectl apply -f deploy/role_binding.yaml  -n ${NAMESPACE}
 	- kubectl apply -f deploy/service_account.yaml  -n ${NAMESPACE}
 	@echo ....... Applying Operator .......
 	- kubectl apply -f deploy/operator.yaml -n ${NAMESPACE}
 	@echo ....... Creating the Database .......
-	- kubectl apply -f deploy/crds/cache_v1alpha1_memcached_cr.yaml -n ${NAMESPACE}
+	- kubectl apply -f deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml -n ${NAMESPACE}
 
 uninstall: ## Uninstall all that all performed in the $ make install
 	@echo ....... Uninstalling .......
 	@echo ....... Deleting CRDs.......
-	- kubectl delete -f deploy/crds/cache_v1alpha1_memcached_crd.yaml -n ${NAMESPACE}
+	- kubectl delete -f deploy/crds/cache.example.com_memcacheds_crd.yaml -n ${NAMESPACE}
 	@echo ....... Deleting Rules and Service Account .......
 	- kubectl delete -f deploy/role.yaml -n ${NAMESPACE}
 	- kubectl delete -f deploy/role_binding.yaml -n ${NAMESPACE}
diff --git a/ansible/memcached-operator/README.md b/ansible/memcached-operator/README.md
@@ -7,9 +7,9 @@ This Memcached operator is a simple example operator for the [Operator SDK][oper
 ## Prerequisites
 
 - [docker][docker_tool] version 17.03+
-- [kubectl][kubectl_tool] v1.11.3+
+- [kubectl][kubectl_tool] v1.12+
 - [operator_sdk][operator_install]
-- Access to a Kubernetes v1.11.3+ cluster
+- Access to a Kubernetes v1.12+ cluster
 
 ## Getting Started
 
diff --git a/ansible/memcached-operator/build/Dockerfile b/ansible/memcached-operator/build/Dockerfile
@@ -1,5 +1,5 @@
-FROM quay.io/operator-framework/ansible-operator:v0.11.0
+FROM quay.io/operator-framework/ansible-operator:v0.12.0
 
 COPY watches.yaml ${HOME}/watches.yaml
 
-COPY roles/ ${HOME}/roles/
+COPY roles/ ${HOME}/roles/
diff --git a/ansible/memcached-operator/build/test-framework/Dockerfile b/ansible/memcached-operator/build/test-framework/Dockerfile
@@ -6,11 +6,11 @@ USER 0
 # yum clean all && rm -rf /var/yum/cache/* first
 RUN yum clean all && rm -rf /var/cache/yum/* \
  && yum -y update \ 
- && yum install -y python36-devel gcc libffi-devel python36-pip
+ && yum install -y python36-devel gcc libffi-devel python3-pip
 RUN pip3 install --user molecule==2.22
 ARG NAMESPACEDMAN
 ADD $NAMESPACEDMAN /namespaced.yaml
 ADD build/test-framework/ansible-test.sh /ansible-test.sh
 RUN chmod +x /ansible-test.sh
 USER 1001
-ADD . /opt/ansible/project
+ADD . /opt/ansible/project
diff --git a/ansible/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml b/ansible/memcached-operator/deploy/crds/cache.example.com_memcacheds_crd.yaml
@@ -13,6 +13,6 @@ spec:
   subresources:
     status: {}
   versions:
-    - name: v1alpha1
-      served: true
-      storage: true
+  - name: v1alpha1
+    served: true
+    storage: true
diff --git a/ansible/memcached-operator/deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml b/ansible/memcached-operator/deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml
diff --git a/ansible/memcached-operator/deploy/operator.yaml b/ansible/memcached-operator/deploy/operator.yaml
@@ -16,23 +16,23 @@ spec:
       containers:
         - name: ansible
           command:
-            - /usr/local/bin/ao-logs
-            - /tmp/ansible-operator/runner
-            - stdout
+          - /usr/local/bin/ao-logs
+          - /tmp/ansible-operator/runner
+          - stdout
           # Replace this with the built image name
           image: "REPLACE_IMAGE"
           imagePullPolicy: "Always"
           volumeMounts:
-            - mountPath: /tmp/ansible-operator/runner
-              name: runner
-              readOnly: true
+          - mountPath: /tmp/ansible-operator/runner
+            name: runner
+            readOnly: true
         - name: operator
           # Replace this with the built image name
           image: "REPLACE_IMAGE"
           imagePullPolicy: "Always"
           volumeMounts:
-            - mountPath: /tmp/ansible-operator/runner
-              name: runner
+          - mountPath: /tmp/ansible-operator/runner
+            name: runner
           env:
             - name: WATCH_NAMESPACE
               valueFrom:
diff --git a/ansible/memcached-operator/deploy/role.yaml b/ansible/memcached-operator/deploy/role.yaml
@@ -51,6 +51,7 @@ rules:
   - apps
   resources:
   - replicasets
+  - deployments
   verbs:
   - get
 - apiGroups:
diff --git a/ansible/memcached-operator/molecule/default/molecule.yml b/ansible/memcached-operator/molecule/default/molecule.yml
@@ -10,7 +10,7 @@ platforms:
 - name: kind-default
   groups:
   - k8s
-  image: bsycorp/kind:latest-1.14
+  image: bsycorp/kind:latest-1.15
   privileged: True
   override_command: no
   exposed_ports:
diff --git a/ansible/memcached-operator/molecule/test-cluster/playbook.yml b/ansible/memcached-operator/molecule/test-cluster/playbook.yml
@@ -7,12 +7,12 @@
     ansible_python_interpreter: '{{ ansible_playbook_python }}'
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     image_name: cache.example.com/memcached-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache_v1alpha1_memcached_cr.yaml'])) | from_yaml }}"
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache.example.com_v1alpha1_memcached_cr.yaml'])) | from_yaml }}"
   tasks:
   - name: Create the cache.example.com/v1alpha1.Memcached
     k8s:
       namespace: '{{ namespace }}'
-      definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache_v1alpha1_memcached_cr.yaml'])) }}"
+      definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache.example.com_v1alpha1_memcached_cr.yaml'])) }}"
 
   - name: Get the newly created Custom Resource
     debug:
diff --git a/ansible/memcached-operator/molecule/test-local/molecule.yml b/ansible/memcached-operator/molecule/test-local/molecule.yml
@@ -10,7 +10,7 @@ platforms:
 - name: kind-test-local
   groups:
   - k8s
-  image: bsycorp/kind:latest-1.14
+  image: bsycorp/kind:latest-1.15
   privileged: True
   override_command: no
   exposed_ports:
diff --git a/ansible/memcached-operator/molecule/test-local/playbook.yml b/ansible/memcached-operator/molecule/test-local/playbook.yml
@@ -24,7 +24,7 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     pull_policy: Never
     REPLACE_IMAGE: cache.example.com/memcached-operator:testing
-    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache_v1alpha1_memcached_cr.yaml'])) | from_yaml }}"
+    custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache.example.com_v1alpha1_memcached_cr.yaml'])) | from_yaml }}"
   tasks:
   - block:
     - name: Delete the Operator Deployment
diff --git a/ansible/memcached-operator/molecule/test-local/prepare.yml b/ansible/memcached-operator/molecule/test-local/prepare.yml
@@ -10,7 +10,7 @@
   tasks:
   - name: Create Custom Resource Definition
     k8s:
-      definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache_v1alpha1_memcached_cr.yaml'])) }}"
+      definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/cache.example.com_memcacheds_crd.yaml'])) }}"
 
   - name: Ensure specified namespace is present
     k8s:
diff --git a/ansible/memcached-operator/roles/Memcached/README.md b/ansible/memcached-operator/roles/Memcached/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/ansible/memcached-operator/watches.yaml b/ansible/memcached-operator/watches.yaml
@@ -2,4 +2,4 @@
 - version: v1alpha1
   group: cache.example.com
   kind: Memcached
-  role: /opt/ansible/roles/Memcached
+  role: /opt/ansible/roles/Memcached
