From 4c89ecbe2db6d0c3508e8949ce597bfb8d4b78c9 Mon Sep 17 00:00:00 2001
From: kurokobo <2920259+kurokobo@users.noreply.github.com>
Date: Fri, 17 Nov 2023 22:25:22 +0900
Subject: [PATCH] feat: bump eda-server-operator version to 0.0.9

---
 rulebooks/README.md                   | 16 ++++++++--------
 rulebooks/operator/kustomization.yaml |  4 ++--
 rulebooks/server/eda.yaml             |  9 ++++++++-
 rulebooks/webhook/ingress.yaml        |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/rulebooks/README.md b/rulebooks/README.md
index 05aa1f4..9d936a5 100644
--- a/rulebooks/README.md
+++ b/rulebooks/README.md
@@ -319,25 +319,25 @@ The new Job is created on `eda` namespace.
 ```bash
 $ ACTIVATION_ID=1
 $ kubectl -n eda get job -l activation-id=${ACTIVATION_ID}
-NAME               COMPLETIONS   DURATION   AGE
-activation-job-1   0/1           8m45s      11m
+NAME                 COMPLETIONS   DURATION   AGE
+activation-job-1-1   0/1           7m3s       7m3s
 ```
 
 By this Job, new Pod that `ansible-rulebook` running on is also created.
 
 ```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}
-NAME                     READY   STATUS    RESTARTS   AGE
-activation-job-1-h9kjt   1/1     Running   0          11m
+NAME                       READY   STATUS    RESTARTS   AGE
+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.
 
 ```bash
 $ kubectl -n eda get service -l job-name=${JOB_NAME}
-NAME                    TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)    AGE
-activation-job-1-5000   ClusterIP   10.43.221.234   <none>        5000/TCP   11m
+NAME                      TYPE        CLUSTER-IP     EXTERNAL-IP   PORT(S)    AGE
+activation-job-1-1-5000   ClusterIP   10.43.82.223   <none>        5000/TCP   7m40s
 ```
 
 #### Deploy Ingress resource for the webhook
@@ -363,7 +363,7 @@ spec:
             pathType: ImplementationSpecific
             backend:
               service:
-                name: activation-job-1-5000     👈👈👈
+                name: activation-job-1-1-5000     👈👈👈
                 port:
                   number: 5000
 ```
diff --git a/rulebooks/operator/kustomization.yaml b/rulebooks/operator/kustomization.yaml
index 6e00b71..dc2302b 100644
--- a/rulebooks/operator/kustomization.yaml
+++ b/rulebooks/operator/kustomization.yaml
@@ -12,8 +12,8 @@ secretGenerator:
       - operator=eda
 
 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:
   - name: quay.io/ansible/eda-server-operator
-    newTag: 0.0.6
+    newTag: 0.0.9
diff --git a/rulebooks/server/eda.yaml b/rulebooks/server/eda.yaml
index a08f521..b81a3d8 100644
--- a/rulebooks/server/eda.yaml
+++ b/rulebooks/server/eda.yaml
@@ -14,8 +14,15 @@ spec:
   automation_server_url: https://awx.example.com/
   automation_server_ssl_verify: no
 
+  image: quay.io/ansible/eda-server
+  image_version: sha-70529ad
+
   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:
     replicas: 1
diff --git a/rulebooks/webhook/ingress.yaml b/rulebooks/webhook/ingress.yaml
index 846cee5..c38ae5c 100644
--- a/rulebooks/webhook/ingress.yaml
+++ b/rulebooks/webhook/ingress.yaml
@@ -17,6 +17,6 @@ spec:
             pathType: ImplementationSpecific
             backend:
               service:
-                name: activation-job-1-5000
+                name: activation-job-1-1-5000
                 port:
                   number: 5000