From d544705742d0fda069544b68523e60e88e583a0c Mon Sep 17 00:00:00 2001 From: George James Date: Tue, 14 Jan 2025 20:17:13 +0000 Subject: [PATCH 1/5] updated ingress-controller j2 --- .../templates/nginx-ingress-controller.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-ingress-controller.j2 b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-ingress-controller.j2 index c1aa0108173..a500a427607 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-ingress-controller.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-ingress-controller.j2 @@ -21,7 +21,7 @@ spec: hostNetwork: false dnsPolicy: ClusterFirst nginxDebug: false - logLevel: 1 + logLevel: info customPorts: [] image: repository: {{ ocp4_workload_nginxplus_registry_url }} From 56fedd25206cbefc262a1732b9cb303266e769bc Mon Sep 17 00:00:00 2001 From: George James Date: Wed, 15 Jan 2025 22:44:56 +0000 Subject: [PATCH 2/5] added license secret for nginxplus --- .../ocp4_workload_nginxplus/tasks/workload.yml | 11 ++++++++++- .../templates/nginx-license-secret.j2 | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml index be704f295a5..eb3134ab648 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml @@ -20,7 +20,7 @@ retries: 10 delay: 6 -- name: Create secret for {{ ocp4_workload_nginxplus_base_url }} +- name: Create secret for {{ ocp4_workload_nginxplus_namespace }} kubernetes.core.k8s: state: present template: nginx-registry-secret.j2 @@ -29,6 +29,15 @@ retries: 10 delay: 6 +- name: Create license secret for {{ ocp4_workload_nginxplus_namespace }} + kubernetes.core.k8s: + state: present + template: nginx-license-secret.j2 + register: result + until: result is not failed + retries: 10 + delay: 6 + - name: Create imagestream kubernetes.core.k8s: state: present diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 new file mode 100644 index 00000000000..095953c54a0 --- /dev/null +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + name: license-token + namespace: {{ ocp4_workload_nginxplus_namespace }} +type: nginx.com/license +data: + license.jwt: {{ ocp4_workload_nginxplus_license }} From 0bd3928b992b044906f6cacdef7bdd8e59d1d40e Mon Sep 17 00:00:00 2001 From: George James Date: Wed, 15 Jan 2025 22:54:34 +0000 Subject: [PATCH 3/5] fixed trailing spaces --- .../ocp4_workload_nginxplus/tasks/workload.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml index eb3134ab648..7b9711c56b1 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/tasks/workload.yml @@ -20,7 +20,7 @@ retries: 10 delay: 6 -- name: Create secret for {{ ocp4_workload_nginxplus_namespace }} +- name: Create secret for {{ ocp4_workload_nginxplus_namespace }} kubernetes.core.k8s: state: present template: nginx-registry-secret.j2 @@ -29,7 +29,7 @@ retries: 10 delay: 6 -- name: Create license secret for {{ ocp4_workload_nginxplus_namespace }} +- name: Create license secret for {{ ocp4_workload_nginxplus_namespace }} kubernetes.core.k8s: state: present template: nginx-license-secret.j2 From 1bc3496d27922fab1eb3fc4fe0adabee209bb9b1 Mon Sep 17 00:00:00 2001 From: George James Date: Thu, 16 Jan 2025 22:05:10 +0000 Subject: [PATCH 4/5] add base64encode to license secret --- .../ocp4_workload_nginxplus/templates/nginx-license-secret.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 index 095953c54a0..4ab675a2bf5 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/templates/nginx-license-secret.j2 @@ -5,4 +5,4 @@ metadata: namespace: {{ ocp4_workload_nginxplus_namespace }} type: nginx.com/license data: - license.jwt: {{ ocp4_workload_nginxplus_license }} + license.jwt: {{ ocp4_workload_nginxplus_license | base64encode }} From 4891603776553f0624f699f6ff6be4b33a01b861 Mon Sep 17 00:00:00 2001 From: gejames <55845783+gejames@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:16:15 -0800 Subject: [PATCH 5/5] Update ingress controller pod wait time to 15 mins Pod is taking longer to start since the update to Ingress Controller 4.0 --- .../ocp4_workload_nginxplus/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/defaults/main.yml b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/defaults/main.yml index ad7809f5cc0..c3ab9e4df24 100644 --- a/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/defaults/main.yml +++ b/ansible/roles_ocp_workloads/ocp4_workload_nginxplus/defaults/main.yml @@ -6,7 +6,7 @@ silent: false ocp4_workload_nginxplus_rebuild_k8s_venv: false ocp4_workload_nginxplus_remove_secret: true ocp4_workload_nginxplus_install_controller: true -ocp4_workload_nginxplus_wait_time: 600 +ocp4_workload_nginxplus_wait_time: 900 ocp4_workload_nginxplus_base_url: "quay.io" ocp4_workload_nginxplus_private_registry_url: "quay.io/redhat-gpst"