Fixes #37: Update to operator-sdk 0.16.0, add galaxy requirements.

This commit is contained in:
Jeff Geerling
2020-03-18 10:19:23 -05:00
parent 0f5fdc3862
commit e22296a0d7
5 changed files with 16 additions and 6 deletions

View File

@@ -121,11 +121,11 @@ Each of these must be appropriately built in preparation for a new tag:
Run the following command inside this directory:
operator-sdk build geerlingguy/tower-operator:0.2.4
operator-sdk build geerlingguy/tower-operator:0.2.5
Then push the generated image to Docker Hub:
docker push geerlingguy/tower-operator:0.2.4
docker push geerlingguy/tower-operator:0.2.5
#### Build a new version of the `tower-operator.yaml` file
@@ -141,6 +141,7 @@ Once the versions are updated, run the playbook in the `build/` directory:
After it is built, test it on a local cluster:
minikube start --memory 6g --cpus 4
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

View File

@@ -1,8 +1,13 @@
FROM quay.io/operator-framework/ansible-operator:v0.14.0
FROM quay.io/operator-framework/ansible-operator:v0.16.0
# Install kubectl.
COPY --from=lachlanevenson/k8s-kubectl:v1.16.5 /usr/local/bin/kubectl /usr/local/bin/kubectl
# Install Ansible requirements.
COPY requirements.yml ${HOME}/requirements.yml
RUN ansible-galaxy collection install -r ${HOME}/requirements.yml \
&& chmod -R ug+rwx ${HOME}/.ansible
COPY watches.yaml ${HOME}/watches.yaml
COPY main.yml ${HOME}/main.yml

View File

@@ -6,7 +6,7 @@
gather_facts: false
vars:
operator_image: geerlingguy/tower-operator:0.2.3
operator_image: geerlingguy/tower-operator:0.2.5
pull_policy: Always
operator_file_path: "../deploy/tower-operator.yaml"
operator_template: "../deploy/operator.yaml"

View File

@@ -107,14 +107,14 @@ spec:
- /usr/local/bin/ao-logs
- /tmp/ansible-operator/runner
- stdout
image: "geerlingguy/tower-operator:0.2.3"
image: "geerlingguy/tower-operator:0.2.5"
imagePullPolicy: "Always"
volumeMounts:
- mountPath: /tmp/ansible-operator/runner
name: runner
readOnly: true
- name: operator
image: "geerlingguy/tower-operator:0.2.3"
image: "geerlingguy/tower-operator:0.2.5"
imagePullPolicy: "Always"
volumeMounts:
- mountPath: /tmp/ansible-operator/runner

4
requirements.yml Normal file
View File

@@ -0,0 +1,4 @@
---
collections:
- community.kubernetes
- operator_sdk.util