Remove unnecessary nodeport templating in API and Content services

* Remove nodeport templating as pulp-web nodeport access already allows interaction with API and Content fixes #8810 https://pulp.plan.io/issues/8810
pulp · May 26, 2021 · 2227fd4 · 2227fd4
1 parent 221c765
commit 2227fd4
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 3 deletions.
diff --git a/CHANGES/8810.bugfix b/CHANGES/8810.bugfix
@@ -0,0 +1 @@
+Update nodeport templating in API and Content services
diff --git a/deploy/crds/pulpproject_v1beta1_pulp_cr.ci.yaml b/deploy/crds/pulpproject_v1beta1_pulp_cr.ci.yaml
@@ -7,6 +7,7 @@ spec:
   tag: "latest"
   admin_password_secret: "example-pulp-admin-password"
   storage_type: File
+  ingress_type: nodeport
   file_storage:
     # k3s local-path requires this
     access_mode: "ReadWriteOnce"

diff --git a/deploy/crds/pulpproject_v1beta1_pulp_cr.galaxy.ci.yaml b/deploy/crds/pulpproject_v1beta1_pulp_cr.galaxy.ci.yaml
@@ -8,6 +8,7 @@ spec:
   tag: "latest"
   admin_password_secret: "example-pulp-admin-password"
   storage_type: File
+  ingress_type: nodeport
   file_storage:
     # k3s local-path requires this
     access_mode: "ReadWriteOnce"

diff --git a/roles/pulp-api/defaults/main.yml b/roles/pulp-api/defaults/main.yml
@@ -26,6 +26,7 @@ hostname: '{{ deployment_type }}.example.com'
 
 web_protocol: 'http'
 
+ingress_type: none
 # TLS secret for the ingress. The secret either has to exist before hand with
 # the corresponding cert and key or just be an indicator for where an automated
 # process like cert-manager (enabled via annotations) will store the TLS

diff --git a/roles/pulp-api/templates/pulp-api.service.yaml.j2 b/roles/pulp-api/templates/pulp-api.service.yaml.j2
@@ -22,7 +22,7 @@ spec:
       targetPort: 24817
       name: api-24817
       port: 24817
-{% if ingress_type|lower == "none" %}
+{% if ingress_type|lower == "nodeport" %}
       nodePort: 24817
   type: NodePort
 {% endif %}
diff --git a/roles/pulp-content/defaults/main.yml b/roles/pulp-content/defaults/main.yml
@@ -6,3 +6,5 @@ content:
     requests:
       cpu: 200m
       memory: 512Mi
+
+ingress_type: none
diff --git a/roles/pulp-content/templates/pulp-content.service.yaml.j2 b/roles/pulp-content/templates/pulp-content.service.yaml.j2
@@ -20,9 +20,9 @@ spec:
   ports:
     - protocol: TCP
       targetPort: 24816
-      name: pulp-content-24816
+      name: content-24816
       port: 24816
-{% if ingress_type|lower == "none" %}
+{% if ingress_type|lower == "nodeport" %}
       nodePort: 24816
   type: NodePort
 {% endif %}