Bump version to v1beta1

This commit is contained in:
Matthew Jones
2020-06-04 10:33:12 -04:00
parent aef500d9c9
commit dbd8d4e9fb
12 changed files with 30 additions and 16 deletions

View File

@@ -32,7 +32,7 @@ Then you can create instances of Tower, for example:
```
---
apiVersion: tower.ansible.com/v1alpha1
apiVersion: tower.ansible.com/v1beta1
kind: Tower
metadata:
name: tower
@@ -177,7 +177,7 @@ After it is built, test it on a local cluster:
minikube addons enable ingress
kubectl apply -f deploy/tower-operator.yaml
kubectl create namespace example-tower
kubectl apply -f deploy/crds/tower_v1alpha1_tower_cr_awx.yaml
kubectl apply -f deploy/crds/tower_v1beta1_tower_cr_awx.yaml
<test everything>
minikube delete

View File

@@ -27,7 +27,7 @@
marker_end: ""
insertafter: "EOF"
with_file:
- "../deploy/crds/tower_v1alpha1_tower_crd.yaml"
- "../deploy/crds/tower_v1beta1_tower_crd.yaml"
- "../deploy/role.yaml"
- "../deploy/role_binding.yaml"
- "../deploy/service_account.yaml"

View File

@@ -1,5 +1,5 @@
---
apiVersion: tower.ansible.com/v1alpha1
apiVersion: tower.ansible.com/v1beta1
kind: Tower
metadata:
name: example-tower

View File

@@ -1,5 +1,5 @@
---
apiVersion: tower.ansible.com/v1alpha1
apiVersion: tower.ansible.com/v1beta1
kind: Tower
metadata:
name: example-tower

View File

@@ -1,5 +1,5 @@
---
apiVersion: tower.ansible.com/v1alpha1
apiVersion: tower.ansible.com/v1beta1
kind: Tower
metadata:
name: example-tower

View File

@@ -13,9 +13,9 @@ spec:
scope: Namespaced
subresources:
status: {}
version: v1alpha1
version: v1beta1
versions:
- name: v1alpha1
- name: v1beta1
served: true
storage: true
validation:

View File

@@ -154,8 +154,8 @@ spec:
scope: Namespaced
subresources:
status: {}
version: v1alpha1
version: v1beta1
versions:
- name: v1alpha1
- name: v1beta1
served: true
storage: true

View File

@@ -10,7 +10,7 @@
tasks:
- name: Create Custom Resource Definition
k8s:
definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_crd.yaml'])) }}"
definition: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_crd.yaml'])) }}"
- name: Ensure specified namespace is present
k8s:

View File

@@ -26,7 +26,7 @@
deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
pull_policy: Never
operator_image: tower.ansible.com/tower-operator:testing
custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_molecule.yaml'])) | from_yaml }}"
custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_cr_molecule.yaml'])) | from_yaml }}"
tasks:
@@ -66,7 +66,7 @@
kind: Namespace
api_version: v1
- name: Create the tower.ansible.com/v1alpha1.Tower
- name: Create the tower.ansible.com/Tower Resource
k8s:
state: present
namespace: '{{ custom_resource.metadata.namespace }}'

View File

@@ -35,7 +35,7 @@
pull_policy: Never
operator_image: tower.ansible.com/tower-operator:testing
# Change this to _awx to test AWX, _tower to test Tower.
custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1alpha1_tower_cr_awx.yaml'])) | from_yaml }}"
custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/tower_v1beta1_tower_cr_awx.yaml'])) | from_yaml }}"
tasks:
- block:
@@ -73,7 +73,7 @@
kind: Namespace
api_version: v1
- name: Create the tower.ansible.com/v1alpha1.Tower
- name: Create the tower.ansible.com Tower Resource
k8s:
state: present
namespace: '{{ custom_resource.metadata.namespace }}'

View File

@@ -54,3 +54,17 @@
when: (k8s_defs_result is changed) or (database_check is defined and database_check.rc != 0)
- include_tasks: initialize.yml
- name: Scale the tower deployment to 0 replicas after migration.
k8s:
definition: "{{ lookup('template', 'tower.yaml.j2') | from_yaml_all | list }}"
vars:
tower_replicas: "0"
when: migrate_result and migrate_result.changed
- name: Scale the tower deployment back to 1 replica after migration.
k8s:
definition: "{{ lookup('template', 'tower.yaml.j2') | from_yaml_all | list }}"
vars:
tower_replicas: "1"
when: migrate_result and migrate_result.changed

View File

@@ -1,5 +1,5 @@
---
- version: v1alpha1
- version: v1beta1
group: tower.ansible.com
kind: Tower
playbook: /opt/ansible/main.yml