[patch] rearrange and fix network issues

Author: caroazad

cluster-applications/300-mas-provisioner/templates/00-ca_Issuer.yaml

@@ -0,0 +1,100 @@
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: "mas-provisioner-ca-issuer"
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "300"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  selfSigned: {}
+
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: "mas-provisioner-ca-certificate"
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "301"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  secretName: "mas-provisioner-ca"
+  duration: "175200h0m0s"
+  renewBefore: "2160h0m0s"
+  issuerRef:
+    name: "mas-provisioner-ca-issuer"
+    kind: Issuer
+  isCA: true
+  usages:
+    - cert sign
+    - digital signature
+    - key encipherment
+    - server auth
+  commonName: "ca.mas-provisioner-tls"
+  subject:
+    countries:
+      - US
+    streetAddresses:
+      - New York
+    localities:
+      - New York
+    organizationalUnits:
+      - IBM Maximo Application Suite
+
+---
+apiVersion: cert-manager.io/v1
+kind: Issuer
+metadata:
+  name: "mas-provisioner-issuer"
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "302"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+spec:
+  ca:
+    secretName: "mas-provisioner-ca"
+
+---
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: "mas-provisioner-certificate"
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "303"
+spec:
+  secretName: "mas-provisioner-certificate"
+  duration: "175200h0m0s"
+  renewBefore: "2160h0m0s"
+  issuerRef:
+    name: "mas-provisioner-issuer"
+    kind: Issuer
+  usages:
+    - cert sign
+    - digital signature
+    - key encipherment
+    - server auth
+  commonName: "*.{{ .Values.provisioner_domain }}"
+  dnsNames:
+    - "*.{{ .Values.provisioner_domain }}"
+    - "mas-provisioner-service-{{ .Values.provisioner_namespace }}.{{ .Values.provisioner_domain }}"
+  subject:
+    countries:
+      - US
+    streetAddresses:
+      - New York
+    localities:
+      - New York
+    organizationalUnits:
+      - IBM Maximo Application Suite

cluster-applications/300-mas-provisioner/templates/01-ca_Certificate.yaml

@@ -0,0 +1,93 @@
+{{- if not (empty .Values.csb_client_ca) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: csb-ca
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "304"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+type: Opaque
+data:
+  ca.crt: {{ .Values.csb_client_ca | b64enc }}
+{{- end }}
+
+
+{{- if not (empty .Values.github_token) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: git-secret
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "304"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+type: Opaque
+stringData:
+  token: {{ .Values.github_token }}
+{{- end }}
+
+
+{{- if not (empty .Values.instana_api_token) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: instana-api-secret
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "304"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+type: Opaque
+stringData:
+  token: {{ .Values.instana_api_token }}
+{{- end }}
+
+
+{{- if and .Values.enable_ocm_alert (not (empty .Values.ocm_api_key)) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: ocm-api-secret
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "304"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+type: Opaque
+stringData:
+  key: {{ .Values.ocm_api_key }}
+{{- end }}
+
+
+{{- if and .Values.enable_pd_alert (.Values.pd_key) }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: pd-routing-key-secret
+  namespace: "{{ .Values.provisioner_namespace }}"
+  annotations:
+    argocd.argoproj.io/sync-wave: "304"
+{{- if .Values.custom_labels }}
+  labels:
+{{ .Values.custom_labels | toYaml | indent 4 }}
+{{- end }}
+type: Opaque
+stringData:
+  key: {{ .Values.pd_key }}
+{{- end }}

cluster-applications/300-mas-provisioner/templates/01-setup_Certificate.yaml

@@ -12,8 +12,11 @@ metadata:
     argocd.argoproj.io/sync-wave: "305"
 spec:
   type: ClusterIP
-  clusterIP: None
   ports:
-    - name: https
-      port: {{ .Values.service_port }}
-      targetPort: https
+    - name: provisioner-port
+      port: 443
+      protocol: TCP
+      targetPort: {{ .Values.service_port }}
+  selector:
+    app: mas-provisioner
+    component: product-service-broker

cluster-applications/300-mas-provisioner/templates/02-Issuer.yaml

@@ -31,7 +31,7 @@ spec:
           image: "docker-na-public.artifactory.swg-devops.com/wiotp-docker-local/maximoappsuite/ibm-mas-mcsp-provisioner:{{ .Values.provisioner_version }}"
           imagePullPolicy: Always
           ports:
-            - name: https
+            - name: provisioner-port
               containerPort: {{ .Values.service_port }}
           env:
             {{- if not (empty .Values.pd_key) }}