Changes for connectivity-pack-kafka-connectors (#15)

Signed-off-by: Event Automation IBM <noreply@ibm.com>
Co-authored-by: Event Automation IBM <noreply@ibm.com>

Author: event-automation-ibm

ibm-connectivity-pack/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.6.1
+appVersion: 1.7.5
 description: Helm chart for IBM Connectivity Pack. The helm application is a Connectors as a Container offering that offers connectors as independently deployable application and provides a consistent interface for interaction. The application offers both action and event connectors.
 keywords:
   - ibm-connectivity-pack
@@ -19,4 +19,4 @@ keywords:
 kubeVersion: '>=1.25.0'
 name: ibm-connectivity-pack
 type: application
-version: 3.1.0
+version: 3.1.1-beta

ibm-connectivity-pack/connector-config.json

@@ -1,15 +1,15 @@
 {
   "action-connectors": {
-    "tag": "3.1.0",
-    "digest": "sha256:74c16dcb6fc04f09f924584979600de15d6ec47dd9206509a0de72375bd19120"
+    "tag": "3.1.1-beta",
+    "digest": "sha256:28f9c6420cd9b2565715b85a9c04401d244e684a9b3a47e6b58b3b114c3b9a96"
   },
   "event-connectors": {
-    "tag": "3.1.0",
-    "digest": "sha256:71139de912870c6d072dc42ce6690ce47b6dc809f62275a467c317ae53c4fab7"
+    "tag": "3.1.1-beta",
+    "digest": "sha256:40a5c0451f5a052ee8945a64c112646cf487aa5a5ee544b0fdd5cc6c4ad2e192"
   },
   "java-tech-connectors": {},
   "connectivity-pack-prehook": {
-    "tag": "3.1.0",
-    "digest": "sha256:6d38a8f6d32750dd832e61dcb484d555fe8d5f66d212d2505200d1c3342103e9"
+    "tag": "3.1.1-beta",
+    "digest": "sha256:5cd94eff588f81b0ca361dcf926abdd64a6ef8ca88a4b36b0d3293b4fac33f12"
   }
 }

ibm-connectivity-pack/templates/InstallPreHook.yaml

@@ -15,10 +15,11 @@ spec:
   activeDeadlineSeconds: 300
   template:
     spec:
-      serviceAccountName: {{ include "ibm-connectivity-pack.preHookJob" . }}-sa
+      serviceAccountName: {{ include "ibm-connectivity-pack.preHookJobSa" . }}
       restartPolicy: Never
       imagePullSecrets: 
         - name: {{ include "ibm-connectivity-pack.imagePullSecretname" . }}
+        - name : ibm-entitlement-key 
       containers:
         - name: mtls-cert-generator
           securityContext:
@@ -32,6 +33,13 @@ spec:
             seccompProfile:
               type: RuntimeDefault
           image: {{ .Values.image.registry }}/{{ .Values.image.path }}/{{ .Values.preHook.image }}@{{ .Values.preHook.digest }}
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 128Mi
           command:
             - /bin/sh
             - "-c"

ibm-connectivity-pack/templates/_helpers.tpl

@@ -478,4 +478,27 @@ httpGet:
   port: 3004
   scheme: HTTP
 {{- end }}
+{{- end }}
+
+{{/*
+Javaservice probe
+*/}}
+{{- define "ibm-connectivity-pack.javaserviceprobe" -}}
+{{- if .Values.certificate.enable }}
+exec:
+  command:
+    - /bin/sh
+    - -c
+    - |
+{{- if .Values.certificate.MTLSenable }}
+      curl --cert /opt/ibm/app/ssl/stunnel.cert.pem --key /opt/ibm/app/ssl/stunnel.key.pem --cacert /opt/ibm/app/ssl/stunnel.ca.pem --silent --fail -k https://localhost:9080/ || exit 1
+{{ else }}
+      curl --silent --fail -k https://localhost:9080/ || exit 1
+{{- end }}
+{{ else }}
+httpGet:
+  path: /
+  port: 9080
+  scheme: HTTP
+{{- end }}
 {{- end }}

ibm-connectivity-pack/templates/_helpersEA.tpl

@@ -49,7 +49,7 @@ Create the name of the service
 # Function for fetching the license
 {{- define "ibm-connectivity-pack.fetchLicense" -}}
 
-{{- $licenseListCP4I := list "L-QYVA-B365MB" "L-JVML-UFQVM4" "L-JVUW-LSTB9R" "L-MQQP-KBWMYE" "L-CYPF-CRPF3H" -}}
+{{- $licenseListCP4I := list "L-QYVA-B365MB" "L-JVML-UFQVM4" "L-MQQP-KBWMYE" "L-CYPF-CRPF3H" "L-JNME-56SJTB" "L-SJZL-NMUUCT" -}}
 {{- $licenseListEA := list "L-AUKS-FKVXVL" "L-CYBH-K48BZQ" -}}
 {{- $licenseListIWHI := list "L-SBZZ-CNR329" -}}
 
@@ -89,7 +89,7 @@ Create the name of the service
 # Function for validating the license
 {{- define "ibm-connectivity-pack.validateLicense" -}}
 
-{{- $licenseListCP4I := list "L-QYVA-B365MB" "L-JVML-UFQVM4" "L-JVUW-LSTB9R" "L-MQQP-KBWMYE" "L-CYPF-CRPF3H" -}}
+{{- $licenseListCP4I := list "L-QYVA-B365MB" "L-JVML-UFQVM4" "L-MQQP-KBWMYE" "L-CYPF-CRPF3H" "L-JNME-56SJTB" "L-SJZL-NMUUCT" -}}
 {{- $licenseListEA := list "L-AUKS-FKVXVL" "L-CYBH-K48BZQ" -}}
 {{- $licenseListIWHI := list "L-SBZZ-CNR329" -}}
 
@@ -121,4 +121,4 @@ Create the name of the service
   {{- fail (printf "\nYou have provided an invalid license: %s.\nTo continue the installation, set 'license.licenseId' and provide a valid value from https://ibm.biz/ea-license.\nValid Event Automation licenses are:\n  %s\nValid Cloud Pak for Integration licenses are:\n  %s\nValid webMethods Hybrid Integration  licenses are:\n  %s" $licenseId $licenseListEA $licenseListCP4I $licenseListIWHI) }}
 {{- end }}
 
-{{- end }}
+{{- end }}

ibm-connectivity-pack/templates/deployment.yaml

@@ -26,7 +26,8 @@ spec:
       serviceAccountName: {{ include "ibm-connectivity-pack.serviceAccountName" .}}
       terminationGracePeriodSeconds: 60
       imagePullSecrets: 
-        - name: {{ include "ibm-connectivity-pack.imagePullSecretname" . }}   
+        - name: {{ include "ibm-connectivity-pack.imagePullSecretname" . }}  
+        - name : ibm-entitlement-key 
       containers:
         - name: {{ .Values.action.name }}
           resources: 
@@ -75,6 +76,12 @@ spec:
               value: {{ ternary true false (.Values.enableRefreshTokenMode) | quote }}
             - name: CONNECTOR_SERVICE_PORT
               value: "3020"
+            - name: ENABLE_LEGACY_API_VERSIONS
+              value: {{ ternary true false (.Values.enableLegacyApiVersions) | quote }}
+            - name: STRICT_DISCOVERY_ACCOUNT
+              value: {{ ternary true false (.Values.strictdiscoveryaccount) | quote }}
+            - name: OPENAPI_SCHEMA_NO_ANONYMOUS_TYPES
+              value: {{ ternary true false (.Values.openapiSchemaNoAnonymousTypes) | quote }}
             - name: FEATURE_TOGGLES_OVERRIDE
               value: "{\"epic3633-stateless-account\": 1, \"epic3627-ea-connector-service\": 1, \"epic3660-enable-refresh-token-api\": 1, \"epic19598-mssharepoint-claimcheck-src\": 1, \"epic20879-google-bigquery-enable-newschema\": 1, \"epic20879-google-bigquery-enable-upsert\": 1 }"
             - name: LCP_HTTP_PORT
@@ -330,6 +337,25 @@ spec:
         - name: {{ .Values.javaservice.name }}
           resources: 
             {{- toYaml .Values.javaservice.resources | nindent 12 }}
+          readinessProbe:
+            {{- include "ibm-connectivity-pack.javaserviceprobe" . | nindent 12 }}
+            timeoutSeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3
+          startupProbe:
+            {{- include "ibm-connectivity-pack.javaserviceprobe" . | nindent 12 }}
+            timeoutSeconds: 5
+            periodSeconds: 5
+            successThreshold: 1
+            failureThreshold: 30
+            initialDelaySeconds: 15          
+          livenessProbe:
+            {{- include "ibm-connectivity-pack.javaserviceprobe" . | nindent 12 }}
+            timeoutSeconds: 30
+            periodSeconds: 10
+            successThreshold: 1
+            failureThreshold: 3   
           securityContext:
             capabilities:
               drop:
@@ -357,6 +383,9 @@ spec:
           volumeMounts:
             - name: stunnel-server
               mountPath: /etc/stunnel/secrets
+            - name: stunnel-client
+              readOnly: true
+              mountPath: /opt/ibm/app/ssl     
             - name: tls-override
               mountPath: /opt/ol/wlp/usr/servers/defaultServer/configDropins/overrides/
             - name: jvmlogs

ibm-connectivity-pack/templates/role.yaml

@@ -11,58 +11,22 @@ rules:
   - verbs:
       - get
       - list
-      - create
-      - patch
-      - delete
     apiGroups:
       - ''
     resources:
       - services
       - endpoints
-  - verbs:
-      - get
-    apiGroups:
-      - apps
-    resources:
-      - statefulsets
-  - verbs:
-      - get
-      - list
-    apiGroups:
-      - batch
-    resources:
-      - jobs
   - verbs:
       - get
       - list
-      - create
-      - patch
-      - delete
-    apiGroups:
-      - apps
-    resources:
-      - deployments
-  - verbs:
-      - get
       - update
-      - delete
-      - create
       - patch
     apiGroups:
       - ''
     resources:
       - secrets
-  - verbs:
-      - get
-      - update
-      - delete
-      - create
-      - list
-    apiGroups:
-      - appconnect.ibm.com
-    resources:
-      - configurations
-
+    resourceNames: 
+      - {{ include "ibm-connectivity-pack.tokenStore" . | quote }}
 ---
 {{- if eq .Values.skipHooks false }}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -80,5 +44,11 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["secrets"]
-    verbs: ["create", "get", "list", "update", "patch", "delete"]
+    verbs: ["create"]
+  - apiGroups: [""]
+    resources: ["secrets"]
+    verbs: ["get", "list", "update", "patch", "delete"]
+    resourceNames:
+      - {{ include "ibm-connectivity-pack.stunnelClient" . | quote }}
+      - {{ include "ibm-connectivity-pack.stunnelServer" .| quote  }}
 {{ end }}

ibm-connectivity-pack/templates/serviceaccount.yaml

@@ -10,7 +10,6 @@ metadata:
 secrets:
   - name: {{ include "ibm-connectivity-pack.imagePullSecretname" . }}
 imagePullSecrets:
-  - name: ibm-entitlement-key
   - name: {{ include "ibm-connectivity-pack.imagePullSecretname" . }}
 
 ---

ibm-connectivity-pack/templates/uninstallPostHook.yaml

@@ -32,6 +32,13 @@ spec:
             seccompProfile:
               type: RuntimeDefault
           image: {{ .Values.image.registry }}/{{ .Values.image.path }}/{{ .Values.preHook.image }}@{{ .Values.preHook.digest }}
+          resources:
+            requests:
+              cpu: 50m
+              memory: 64Mi
+            limits:
+              cpu: 100m
+              memory: 128Mi
           command:
             - /bin/sh
             - "-c"

ibm-connectivity-pack/values.yaml

@@ -13,7 +13,10 @@ license:
 replicaCount: 1 # Replica of the POD
 bunyan: "'{\"loglevel\" : \"info\", \"logsrc\" : true, \"logstdouttext\" : {}}'" # Override Log configuration
 environmentVariables: {} # Yaml object ENV to be added on action and event pods
-enableRefreshTokenMode: false
+enableRefreshTokenMode: true
+strictdiscoveryaccount: true
+openapiSchemaNoAnonymousTypes: false
+enableLegacyApiVersions: false
 annotations:
   productID: "0c44732a8b794b2d9e9b842b2dfc8361"
   productName: "IBM Connectivity Pack - Free"
@@ -49,15 +52,15 @@ basicAuth:
   username: 'csuser'
 preHook:
   image: connectivity-pack-prehook
-  digest: sha256:6d38a8f6d32750dd832e61dcb484d555fe8d5f66d212d2505200d1c3342103e9
-  tag: 3.1.0
+  digest: sha256:5cd94eff588f81b0ca361dcf926abdd64a6ef8ca88a4b36b0d3293b4fac33f12
+  tag: 3.1.1-beta
 action:
   name: action-connectors
   fileStreamingTimeout: '120000'
   udaPersistentVolumeClaimName: ''
   maxFileSize: '262144000'
   image: action-connectors
-  digest: sha256:74c16dcb6fc04f09f924584979600de15d6ec47dd9206509a0de72375bd19120
+  digest: sha256:28f9c6420cd9b2565715b85a9c04401d244e684a9b3a47e6b58b3b114c3b9a96
   resources: # Update below value for vertical scaling of container
     limits:
       cpu: '1'
@@ -67,12 +70,12 @@ action:
       cpu: 250m
       ephemeral-storage: 5Gi
       memory: 400Mi
-  tag: 3.1.0
+  tag: 3.1.1-beta
 event:
   enable: true # Set to true if Event container is needed
   name: event-connectors
   image: event-connectors # Update image
-  digest: sha256:71139de912870c6d072dc42ce6690ce47b6dc809f62275a467c317ae53c4fab7
+  digest: sha256:40a5c0451f5a052ee8945a64c112646cf487aa5a5ee544b0fdd5cc6c4ad2e192
   resources: # Update below value for vertical scaling of container
     limits:
       cpu: '1'
@@ -82,7 +85,7 @@ event:
       cpu: 250m
       ephemeral-storage: 5Gi
       memory: 400Mi
-  tag: 3.1.0
+  tag: 3.1.1-beta
 javaservice:
   enable: false
 autoScaling: