expand/awx-on-k3s
1
0
Fork 0
mirror of https://github.com/Expand-sys/awx-on-k3s synced 2025-12-16 05:52:15 +11:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: bump eda-server-operator version to 0.0.9

Browse source
This commit is contained in:
kurokobo 2023-11-17 22:25:22 +09:00
parent ebe3206c62
commit 4c89ecbe2d
4 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rulebooks/README.md
View file

@ -319,25 +319,25 @@ The new Job is created on `eda` namespace.
```bash ```bash
$ ACTIVATION_ID=1 $ ACTIVATION_ID=1
$ kubectl -n eda get job -l activation-id=${ACTIVATION_ID} $ kubectl -n eda get job -l activation-id=${ACTIVATION_ID}
NAME COMPLETIONS DURATION AGE NAME COMPLETIONS DURATION AGE
activation-job-1 0/1 8m45s 11m activation-job-1-1 0/1 7m3s 7m3s
``` ```
By this Job, new Pod that `ansible-rulebook` running on is also created. By this Job, new Pod that `ansible-rulebook` running on is also created.
```bash ```bash
$ JOB_NAME=activation-job-${ACTIVATION_ID} $ JOB_NAME=$(kubectl -n eda get job -l activation-id=${ACTIVATION_ID} -o jsonpath='{.items[*].metadata.name}')
$ kubectl -n eda get pod -l job-name=${JOB_NAME} $ kubectl -n eda get pod -l job-name=${JOB_NAME}
NAME READY STATUS RESTARTS AGE NAME READY STATUS RESTARTS AGE
activation-job-1-h9kjt 1/1 Running 0 11m activation-job-1-1-ctz24 1/1 Running 0 7m16s
``` ```
The new Service is also created by EDA Server. This service provides the endpoint for the webhook. The new Service is also created by EDA Server. This service provides the endpoint for the webhook.
```bash ```bash
$ kubectl -n eda get service -l job-name=${JOB_NAME} $ kubectl -n eda get service -l job-name=${JOB_NAME}
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
activation-job-1-5000 ClusterIP 10.43.221.234 <none> 5000/TCP 11m activation-job-1-1-5000 ClusterIP 10.43.82.223 <none> 5000/TCP 7m40s
``` ```
#### Deploy Ingress resource for the webhook #### Deploy Ingress resource for the webhook
@ -363,7 +363,7 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
backend: backend:
service: service:
name: activation-job-1-5000 👈👈👈 name: activation-job-1-1-5000 👈👈👈
port: port:
number: 5000 number: 5000
``` ```

4
rulebooks/operator/kustomization.yaml
View file

@ -12,8 +12,8 @@ secretGenerator:
- operator=eda - operator=eda
resources: resources:
- github.com/ansible/eda-server-operator/config/default?ref=0.0.6 - github.com/ansible/eda-server-operator/config/default?ref=0.0.9
images: images:
- name: quay.io/ansible/eda-server-operator - name: quay.io/ansible/eda-server-operator
newTag: 0.0.6 newTag: 0.0.9

9
rulebooks/server/eda.yaml
View file

@ -14,8 +14,15 @@ spec:
automation_server_url: https://awx.example.com/ automation_server_url: https://awx.example.com/
automation_server_ssl_verify: no automation_server_ssl_verify: no
image: quay.io/ansible/eda-server
image_version: sha-70529ad
image_web: quay.io/ansible/eda-ui image_web: quay.io/ansible/eda-ui
image_web_version: "2.4.454" image_web_version: 2.4.716
extra_settings:
- setting: EDA_CSRF_TRUSTED_ORIGINS
value: http://eda-api:8000
api: api:
replicas: 1 replicas: 1

2
rulebooks/webhook/ingress.yaml
View file

@ -17,6 +17,6 @@ spec:
pathType: ImplementationSpecific pathType: ImplementationSpecific
backend: backend:
service: service:
name: activation-job-1-5000 name: activation-job-1-1-5000
port: port:
number: 5000 number: 5000