Skip to content
This repository was archived by the owner on Nov 18, 2020. It is now read-only.

Commit 3b4c749

Browse files
upgrade Ansible sample to use SDK 0.18.1 (#136)
1 parent 6c36f6e commit 3b4c749

12 files changed

Lines changed: 21 additions & 8 deletions

File tree

ansible/memcached-operator/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/operator-framework/ansible-operator:v0.17.0
1+
FROM quay.io/operator-framework/ansible-operator:v0.18.1
22

33
COPY requirements.yml ${HOME}/requirements.yml
44
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: apiextensions.k8s.io/v1beta1
1+
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
name: memcacheds.cache.example.com
@@ -10,13 +10,13 @@ spec:
1010
plural: memcacheds
1111
singular: memcached
1212
scope: Namespaced
13-
subresources:
14-
status: {}
15-
validation:
16-
openAPIV3Schema:
17-
type: object
18-
x-kubernetes-preserve-unknown-fields: true
1913
versions:
2014
- name: v1alpha1
15+
schema:
16+
openAPIV3Schema:
17+
type: object
18+
x-kubernetes-preserve-unknown-fields: true
2119
served: true
2220
storage: true
21+
subresources:
22+
status: {}

ansible/memcached-operator/deploy/operator.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ spec:
3939
value: "4"
4040
- name: ANSIBLE_DEBUG_LOGS
4141
value: "True"
42+
livenessProbe:
43+
httpGet:
44+
path: /healthz
45+
port: 6789
46+
initialDelaySeconds: 5
47+
periodSeconds: 3
4248
volumes:
4349
- name: runner
4450
emptyDir: {}

ansible/memcached-operator/molecule/templates/operator.yaml.j2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ spec:
3535
value: "memcached-operator"
3636
- name: ANSIBLE_GATHERING
3737
value: explicit
38+
livenessProbe:
39+
httpGet:
40+
path: /healthz
41+
port: 6789
42+
initialDelaySeconds: 5
43+
periodSeconds: 3
44+
3845
volumes:
3946
- name: runner
4047
emptyDir: {}
File renamed without changes.

ansible/memcached-operator/roles/Memcached/defaults/main.yml renamed to ansible/memcached-operator/roles/memcached/defaults/main.yml

File renamed without changes.

ansible/memcached-operator/roles/Memcached/handlers/main.yml renamed to ansible/memcached-operator/roles/memcached/handlers/main.yml

File renamed without changes.

ansible/memcached-operator/roles/Memcached/meta/main.yml renamed to ansible/memcached-operator/roles/memcached/meta/main.yml

File renamed without changes.

ansible/memcached-operator/roles/Memcached/tasks/main.yml renamed to ansible/memcached-operator/roles/memcached/tasks/main.yml

File renamed without changes.

ansible/memcached-operator/roles/Memcached/tests/inventory renamed to ansible/memcached-operator/roles/memcached/tests/inventory

File renamed without changes.

0 commit comments

Comments
 (0)