diff --git a/gcp/basic-auth-ingress/base/cloud-endpoint.yaml b/gcp/basic-auth-ingress/base/cloud-endpoint.yaml index 1dcc1efd46..139273b25a 100644 --- a/gcp/basic-auth-ingress/base/cloud-endpoint.yaml +++ b/gcp/basic-auth-ingress/base/cloud-endpoint.yaml @@ -1,7 +1,7 @@ apiVersion: ctl.isla.solutions/v1 kind: CloudEndpoint metadata: - name: cloud-endpoint + name: $(appName) spec: project: $(project) targetIngress: diff --git a/gcp/basic-auth-ingress/base/kustomization.yaml b/gcp/basic-auth-ingress/base/kustomization.yaml index 876aae1490..0175cc4b1f 100644 --- a/gcp/basic-auth-ingress/base/kustomization.yaml +++ b/gcp/basic-auth-ingress/base/kustomization.yaml @@ -35,6 +35,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.secretName +- name: appName + objref: + kind: ConfigMap + name: basic-auth-ingress-parameters + apiVersion: v1 + fieldref: + fieldpath: data.appName - name: namespace objref: kind: ConfigMap diff --git a/gcp/basic-auth-ingress/base/params.env b/gcp/basic-auth-ingress/base/params.env index 85e88ea0ca..c11d64af74 100644 --- a/gcp/basic-auth-ingress/base/params.env +++ b/gcp/basic-auth-ingress/base/params.env @@ -1,3 +1,4 @@ +appName=kubeflow namespace=kubeflow hostname= project= diff --git a/gcp/basic-auth-ingress/base/params.yaml b/gcp/basic-auth-ingress/base/params.yaml index 58223cfe62..afe440ee12 100644 --- a/gcp/basic-auth-ingress/base/params.yaml +++ b/gcp/basic-auth-ingress/base/params.yaml @@ -21,6 +21,8 @@ varReference: kind: Ingress - path: metadata/annotations/certmanager.k8s.io\/issuer kind: Ingress +- path: metadata/name + kind: CloudEndpoint - path: spec/project kind: CloudEndpoint - path: spec/targetIngress/name diff --git a/tests/basic-auth-ingress-base_test.go b/tests/basic-auth-ingress-base_test.go index 6de21a2951..54242fb597 100644 --- a/tests/basic-auth-ingress-base_test.go +++ b/tests/basic-auth-ingress-base_test.go @@ -36,7 +36,7 @@ spec: apiVersion: ctl.isla.solutions/v1 kind: CloudEndpoint metadata: - name: cloud-endpoint + name: $(appName) spec: project: $(project) targetIngress: @@ -377,6 +377,8 @@ varReference: kind: Ingress - path: metadata/annotations/certmanager.k8s.io\/issuer kind: Ingress +- path: metadata/name + kind: CloudEndpoint - path: spec/project kind: CloudEndpoint - path: spec/targetIngress/name @@ -385,6 +387,7 @@ varReference: kind: CloudEndpoint `) th.writeF("/manifests/gcp/basic-auth-ingress/base/params.env", ` +appName=kubeflow namespace=kubeflow hostname= project= @@ -433,6 +436,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.secretName +- name: appName + objref: + kind: ConfigMap + name: basic-auth-ingress-parameters + apiVersion: v1 + fieldref: + fieldpath: data.appName - name: namespace objref: kind: ConfigMap