Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ helm install <RELEASE-NAME> <CONNECTIVITY-PACK-HELM-CHART-URL> --set license.lic
Where:

- `<RELEASE-NAME>` is the release name of your choice. For example, `ibm-connectivity-pack`
- `<CONNECTIVITY-PACK-HELM-CHART-URL>` is the URL of the latest version of the Connectivity Pack Helm chart. For example: `https://github.com/ibm-messaging/connectivity-pack-kafka-connectors/releases/download/3.0.0/ibm-connectivity-pack-3.0.0.tgz`
- `<CONNECTIVITY-PACK-HELM-CHART-URL>` is the URL of the latest version of the Connectivity Pack Helm chart. For example: `https://github.com/ibm-messaging/connectivity-pack-kafka-connectors/releases/download/3.1.0/ibm-connectivity-pack-3.1.0.tgz`
- `license.licenseId=<LICENSE-ID>` is the license identifier (ID) for the program that you purchased. For more information, see [licensing reference](https://ibm.github.io/event-automation/support/licensing/).
- `license.accept` determines whether the license is accepted (default is `false` if not specified).
- `<NAMESPACE>` is the namespace where you want to install the Connectivity Pack. This must be in the same namespace where an Event Streams instance is deployed.
Expand Down Expand Up @@ -136,7 +136,8 @@ Configure the Kafka Connect runtime and include the configuration, certificates,
template:
connectContainer:
env:
CONNECTIVITYPACK_PKCS12_PASSWORD: <your-pkcs12-password>
- name: CONNECTIVITYPACK_PKCS12_PASSWORD
value: <your-pkcs12-password>
```

1. Apply the configured `KafkaConnect` custom resource by using the `kubectl apply` command to start the Kafka Connect runtime.
Expand Down Expand Up @@ -206,7 +207,6 @@ Configure your connector with information about your external system by followin

# Subscription params applicable only for poller events
connectivitypack.source.<customObject>.CREATED_POLLER.subscription.pollingInterval: <pollingInterval>
connectivitypack.source.<customObject>.CREATED_POLLER.subscription.timezone: <timezone>
connectivitypack.source.<customObject>.CREATED_POLLER.subscription.updatedField: <the field name that contains the timestamp of when the object was updated>
connectivitypack.source.<customObject>.CREATED_POLLER.subscription.createdField: <the field name that contains the timestamp of when the object was created>

Expand Down
1 change: 0 additions & 1 deletion examples/kafka-connector-source.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ spec:

# Subscription parameters for polling. Required only for POLLER events
connectivitypack.source.Test_CustomObject__c.CREATED_POLLER.subscription.pollingInterval: 1
connectivitypack.source.Test_CustomObject__c.CREATED_POLLER.subscription.timezone: UTC
connectivitypack.source.Test_CustomObject__c.CREATED_POLLER.subscription.updatedField: LastModifiedDate
connectivitypack.source.Test_CustomObject__c.CREATED_POLLER.subscription.createdField: CreatedDate

Expand Down
4 changes: 2 additions & 2 deletions ibm-connectivity-pack/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.4.8
appVersion: 1.6.1
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
Expand All @@ -19,4 +19,4 @@ keywords:
kubeVersion: '>=1.25.0'
name: ibm-connectivity-pack
type: application
version: 3.0.0
version: 3.1.0
2 changes: 0 additions & 2 deletions ibm-connectivity-pack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ basicAuth.enable | Enable basic authentication for service | false
basicAuth.username | Basic auth username | csuser
preHook.image | Prehook job image name | connectivity-pack-prehook
preHook.digest | Prehook job image digest | ''
proxy.image | Proxy service container image name | connectivity-pack-proxy
proxy.digest | Proxy service container image digest | ''
action.image | Action service container image name | action-connectors
action.digest | Action service container image digest | ''
action.resources | Action service container resources Check Kubernetes deployment resources for more details | See [values.yaml](values.yaml)
Expand Down
16 changes: 6 additions & 10 deletions ibm-connectivity-pack/connector-config.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
{
"action-connectors": {
"tag": "3.0.0",
"digest": "sha256:cbe955a55b1652b408c7622699dbf657cf6137dcd1eca97e9bb70ffb424c6695"
"tag": "3.1.0",
"digest": "sha256:74c16dcb6fc04f09f924584979600de15d6ec47dd9206509a0de72375bd19120"
},
"event-connectors": {
"tag": "3.0.0",
"digest": "sha256:2b116da33ce5202035374d1443e4af66e04223f174e033fbaf555df6aa6224aa"
"tag": "3.1.0",
"digest": "sha256:71139de912870c6d072dc42ce6690ce47b6dc809f62275a467c317ae53c4fab7"
},
"java-tech-connectors": {},
"connectivity-pack-proxy": {
"tag": "3.0.0",
"digest": "sha256:708c72ca56391e6d336bc549546788aee66985a25c39880dd11ebd136b1c9ccd"
},
"connectivity-pack-prehook": {
"tag": "3.0.0",
"digest": "sha256:8d4c21d45c8030cff35cc2e65c36567b20805691946ebde5442a8b0d5bb35929"
"tag": "3.1.0",
"digest": "sha256:6d38a8f6d32750dd832e61dcb484d555fe8d5f66d212d2505200d1c3342103e9"
}
}
14 changes: 10 additions & 4 deletions ibm-connectivity-pack/templates/InstallPreHook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,25 +48,31 @@ spec:
{{- if and .Values.certificate.MTLSenable .Values.certificate.clientSecretName (not (lookup "v1" "Secret" (include "ibm-connectivity-pack.namespace" .) .Values.certificate.clientSecretName)) }}
{{- fail (printf "\nFailed to find certificate secret '%s' in namespace '%s'" .Values.certificate.clientSecretName (include "ibm-connectivity-pack.namespace" .)) }}
{{- end }}
{{- if and .Values.certificate.enable .Values.javaservice.enable .Values.certificate.generate (not .Values.certificate.pkcsPassword ) }}
{{- fail (printf "\n'pkcsPassword' is mandatory when 'javaservice.enable' and 'certificate.enable' is set to true") }}
{{- end }}
{{- if and (not .Values.certificate.serverSecretName) (not .Values.certificate.clientSecretName) }}
export CLIENT_SECRET_NAME={{ include "ibm-connectivity-pack.stunnelClient" .}}
export SERVER_SECRET_NAME={{ include "ibm-connectivity-pack.stunnelServer" .}}
export RELEASE_NAMESPACE={{ include "ibm-connectivity-pack.namespace" . }}
{{- if .Values.certificate.enable }}
export IS_CERT_GENERATE={{ .Values.certificate.generate }}
export COMMON_NAME={{ include "ibm-connectivity-pack.service" . }}
export DNS2={{ include "ibm-connectivity-pack.service" . }}.{{ include "ibm-connectivity-pack.namespace" . }}.svc.cluster.local
export ROUTE_ENABLED={{ .Values.route.enable }}
export DNS3={{ .Values.route.domain }}
export RELEASE_NAME={{ .Release.Name }}
export RELEASE_NAMESPACE={{ include "ibm-connectivity-pack.namespace" . }}
export CA_CERT_NAME={{ .Values.certificate.caCertPropertyName }}
export CLIENT_SECRET_NAME={{ include "ibm-connectivity-pack.stunnelClient" .}}
export CLIENT_CERT_NAME={{ .Values.certificate.clientCertPropertyName }}
export CLIENT_KEY_NAME={{ .Values.certificate.clientCertKeyPropertyName }}
export CLIENT_PKCS_P12={{ .Values.certificate.clientCertPKCSPropertyName }}
export SERVER_SECRET_NAME={{ include "ibm-connectivity-pack.stunnelServer" .}}
export SERVER_CERT_NAME={{ .Values.certificate.serverCertPropertyName }}
export SERVER_KEY_NAME={{ .Values.certificate.serverCertKeyPropertyName }}
export SERVER_PKCS_P12={{ .Values.certificate.serverKeyStrorePKCSPropertyName }}
export SERVER_TRUSTSTORE_PKCS_P12={{ .Values.certificate.serverTrustStorePKCSPropertyName }}
export PKCS_PASSWORD={{ .Values.certificate.pkcsPassword }}
export MTLS_ENABLED={{ .Values.certificate.MTLSenable }}
export JAVA_SERVICE_ENABLED={{ .Values.javaservice.enable }}
sh createCert.sh
{{- range $key, $value := .Values.annotations }}
kubectl annotate secret $CLIENT_SECRET_NAME {{ $key }}="{{ $value }}" -n $RELEASE_NAMESPACE --overwrite
Expand All @@ -77,4 +83,4 @@ spec:
kubectl delete secret $SERVER_SECRET_NAME --namespace $RELEASE_NAMESPACE --ignore-not-found=true
{{ end }}
{{ end }}
{{ end }}
{{ end }}
92 changes: 74 additions & 18 deletions ibm-connectivity-pack/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,11 @@ Create the name of the service
Create the event service route
*/}}
{{- define "ibm-connectivity-pack.eventServiceRoute" -}}
{{- if .Values.certificate.enable }}
{{- printf "https://%s:3004" (include "ibm-connectivity-pack.service" .) }}
{{- else }}
{{- printf "http://%s:3004" (include "ibm-connectivity-pack.service" .) }}
{{- end }}
{{- end }}

{{/*
Expand Down Expand Up @@ -158,19 +162,19 @@ Create the webhook service route
Create the mutal auth service route
*/}}
{{- define "ibm-connectivity-pack.mutualAuthServiceRoute" -}}
{{- if .Values.certificate.enable }}
{{- printf "https://%s" (include "ibm-connectivity-pack.service" .) }}
{{- else }}
{{- printf "http://%s" (include "ibm-connectivity-pack.service" .) }}
{{- end }}
{{- end }}

{{/*
Create the java service route
*/}}
{{- define "ibm-connectivity-pack.javaServiceRoute" -}}
{{- if .Values.certificate.enable }}
{{- printf "https://%s:9080/connector-java-services/_lcp_jdbc_connect" (include "ibm-connectivity-pack.service" .) }}
{{- else }}
{{- printf "http://%s:9080/connector-java-services/_lcp_jdbc_connect" (include "ibm-connectivity-pack.service" .) }}
{{- end }}
{{- end }}

{{/*
Create the role
Expand Down Expand Up @@ -210,15 +214,6 @@ Create the name for image pull secret name
{{- end }}
{{- end }}

{{/*
Create the name proxy config map name
*/}}
{{- define "ibm-connectivity-pack.proxy" -}}
{{- if .Release.Name }}
{{- default .Release.Name }}-proxy
{{- end }}
{{- end }}

{{/*
Create the name for image pull secret
*/}}
Expand Down Expand Up @@ -253,9 +248,6 @@ Create the name for stunnel client cert secret

{{- define "ibm-connectivity-pack.stunnelvolume" -}}
{{ if .Values.certificate.enable -}}
- name: proxy
configMap:
name: {{ include "ibm-connectivity-pack.proxy" . }}
- name: stunnel-server
secret:
secretName: {{ include "ibm-connectivity-pack.stunnelServer" . }}
Expand All @@ -266,6 +258,12 @@ Create the name for stunnel client cert secret
path: server.cert.pem
- key: {{ .Values.certificate.caCertPropertyName }}
path: server.ca.pem
{{ if .Values.javaservice.enable -}}
- key: {{ .Values.certificate.serverKeyStrorePKCSPropertyName }}
path: server.p12
- key: {{ .Values.certificate.serverTrustStorePKCSPropertyName }}
path: truststore.p12
{{ end }}
{{ if .Values.certificate.MTLSenable -}}
- name: stunnel-client
secret:
Expand Down Expand Up @@ -367,6 +365,16 @@ Create the name of the service
{{- end }}
{{- end }}

{{/*
Create the name of the java service TLS
*/}}
{{- define "ibm-connectivity-pack.java-server-conf" -}}
{{- if .Release.Name }}
{{- default .Release.Name }}-java-server-config
{{- end }}
{{- end }}


{{/*
Create UDA connector configmap volume
*/}}
Expand All @@ -376,11 +384,12 @@ Create UDA connector configmap volume
persistentVolumeClaim:
claimName: {{ .Values.action.udaPersistentVolumeClaimName }}
{{- else }}
{{- $files := .Files.Glob "connectors/*.{json,yaml,yml,car}" }}
{{- $root := . }}
{{- $files := $root.Files.Glob "connectors/*.{json,yaml,yml,car}" }}
{{- range $path, $file := $files }}
- name: {{ base $path | replace "." "-" | lower }}-vol
configMap:
name: {{ base $path | replace "." "-" | lower }}-config
name: {{ base $path | replace "." "-" | lower }}-{{- default $root.Release.Name }}-config
{{- end }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -422,4 +431,51 @@ name: METRICS_DIRECTORY
- name: METRICS_COLLECT_INTERVAL_MS
value: {{ .Values.action.metricsCollectIntervalMs | quote }}
{{- end }}
{{- end }}


{{/*
Action probe
*/}}
{{- define "ibm-connectivity-pack.actonProbe" -}}
{{- 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:3020/admin/ready || exit 1
{{ else }}
curl --silent --fail -k https://localhost:3020/admin/ready || exit 1
{{- end }}
{{ else }}
httpGet:
path: /admin/ready
port: 3020
scheme: HTTP
{{- end }}
{{- end }}

{{/*
Event probe
*/}}
{{- define "ibm-connectivity-pack.eventProbe" -}}
{{- 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:3004/admin/ready || exit 1
{{ else }}
curl --silent --fail -k https://localhost:3004/admin/ready || exit 1
{{- end }}
{{ else }}
httpGet:
path: /admin/ready
port: 3004
scheme: HTTP
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion ibm-connectivity-pack/templates/connectors.template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ base $path | replace "." "-" | lower }}-config
name: {{ base $path | replace "." "-" | lower }}-{{- default $root.Release.Name }}-config
namespace: {{ include "ibm-connectivity-pack.namespace" $root }}
labels:
{{- include "ibm-connectivity-pack.labels" $root | nindent 4 }}
Expand Down
Loading