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

Commit 6c36f6e

Browse files
Revert "feat: upgrade Ansible sample to use 0.18.1 SDK version (#128)" (#135)
This reverts commit d2c1fe1.
1 parent 4381d13 commit 6c36f6e

12 files changed

Lines changed: 8 additions & 173 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.18.1
1+
FROM quay.io/operator-framework/ansible-operator:v0.17.0
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/v1
1+
apiVersion: apiextensions.k8s.io/v1beta1
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
1319
versions:
1420
- name: v1alpha1
15-
schema:
16-
openAPIV3Schema:
17-
type: object
18-
x-kubernetes-preserve-unknown-fields: true
1921
served: true
2022
storage: true
21-
subresources:
22-
status: {}

ansible/memcached-operator/deploy/operator.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ 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
4842
volumes:
4943
- name: runner
5044
emptyDir: {}

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,6 @@ 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-
4538
volumes:
4639
- name: runner
4740
emptyDir: {}

ansible/memcached-operator/roles/memcached/README.md

Lines changed: 0 additions & 43 deletions
This file was deleted.

ansible/memcached-operator/roles/memcached/defaults/main.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

ansible/memcached-operator/roles/memcached/handlers/main.yml

Lines changed: 0 additions & 2 deletions
This file was deleted.

ansible/memcached-operator/roles/memcached/meta/main.yml

Lines changed: 0 additions & 64 deletions
This file was deleted.

ansible/memcached-operator/roles/memcached/tasks/main.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

ansible/memcached-operator/roles/memcached/tests/inventory

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)