Skip to content

Commit f917982

Browse files
dgrove-ossdgrove-oss
authored
remove nodejs:6, nodejs:8 and cloudant-provider from helm chart (#630)
1. Remove nodejs:6 and nodejs:8 from runtime.json. 2. Remove support for deploying the cloudant-provider since it is not being actively maintained and still utilizes nodejs:6 actions.
1 parent dfe34a0 commit f917982

File tree

15 files changed

+6
-238
lines changed

15 files changed

+6
-238
lines changed

‎docs/configurationChoices.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ components is not currently supported:
4343
- couchdb. For production deployments of OpenWhisk on Kubernetes, we strongly recomend running
4444
CouchDB externally to OpenWhisk as described below. An external CouchDB instance enables
4545
better management of the database and decouples its lifecycle from that of the OpenWhisk deployment.
46-
- The event providers: alarmprovider, cloudantprovider, and kafkaprovider.
46+
- The event providers: alarmprovider and kafkaprovider.
4747
4848
### Using an external database
4949
@@ -179,8 +179,8 @@ k8s:
179179

180180
### Selectively Deploying Event Providers
181181

182-
The default settings of the Helm chart will deploy OpenWhisk's alarm,
183-
cloudant, and kafka event providers. If you want to disable the
182+
The default settings of the Helm chart will deploy OpenWhisk's alarm
183+
and kafka event providers. If you want to disable the
184184
deployment of one or more event providers, you can add
185185
a stanza to your `mycluster.yaml` for example:
186186
```yaml

‎docs/private-docker-registry.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ By default, helm charts currently use docker hub to download images to deploy Op
3434
- busybox
3535
- openwhisk/alarmprovider
3636
- openwhisk/kafkaprovider
37-
- openwhisk/cloudantprovider
3837

3938
- Add details of your docker registry information in mycluster.yml.
4039

‎helm/openwhisk/configMapFiles/installPackages/myTask.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,6 @@ if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
106106
fi
107107

108108

109-
#####
110-
# Install the catalog for the Cloudant provider
111-
#####
112-
113-
if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
114-
cd /
115-
git clone https://github.com/apache/openwhisk-package-cloudant.git
116-
117-
pushd /openwhisk-package-cloudant
118-
git checkout $OW_GIT_TAG_OPENWHISK_PACKAGE_CLOUDANT
119-
./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST_URL $PROVIDER_DB_URL $CLOUDANT_DB_PREFIX $WHISK_API_HOST_URL || exit 1
120-
popd
121-
fi
122-
123-
124109
#####
125110
# Install the catalog for the Kafka provider
126111
#####

‎helm/openwhisk/configMapFiles/tests/packageChecker/myTask.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,6 @@ packageListingCheck "websocket"
6161
if [ "$OW_INSTALL_ALARM_PROVIDER" == "yes" ]; then
6262
packageListingCheck "alarms"
6363
fi
64-
if [ "$OW_INSTALL_CLOUDANT_PROVIDER" == "yes" ]; then
65-
packageListingCheck "cloudant"
66-
fi
6764
if [ "$OW_INSTALL_KAFKA_PROVIDER" == "yes" ]; then
6865
packageListingCheck "messaging"
6966
fi

‎helm/openwhisk/runtimes-minimal-travis.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
{
33
"runtimes": {
44
"nodejs": [
5-
{
6-
"kind": "nodejs:6",
7-
"default": false,
8-
"image": {
9-
"prefix": "openwhisk",
10-
"name": "nodejs6action",
11-
"tag": "1.14.0-incubating"
12-
},
13-
"deprecated": false
14-
},
155
{
166
"kind": "nodejs:10",
177
"default": true,

‎helm/openwhisk/runtimes.json‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,6 @@
11
{
22
"runtimes": {
33
"nodejs": [
4-
{
5-
"kind": "nodejs:6",
6-
"default": false,
7-
"image": {
8-
"prefix": "openwhisk",
9-
"name": "nodejs6action",
10-
"tag": "1.14.0-incubating"
11-
},
12-
"deprecated": false,
13-
"attached": {
14-
"attachmentName": "codefile",
15-
"attachmentType": "text/plain"
16-
}
17-
},
18-
{
19-
"kind": "nodejs:8",
20-
"default": false,
21-
"image": {
22-
"prefix": "openwhisk",
23-
"name": "action-nodejs-v8",
24-
"tag": "1.15.0"
25-
},
26-
"deprecated": false,
27-
"attached": {
28-
"attachmentName": "codefile",
29-
"attachmentType": "text/plain"
30-
}
31-
},
324
{
335
"kind": "nodejs:10",
346
"default": true,

‎helm/openwhisk/templates/install-packages-job.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -120,16 +120,12 @@ spec:
120120
# Provider database table prefixes
121121
- name: "ALARM_DB_PREFIX"
122122
value: {{ .Values.providers.alarm.dbPrefix | quote }}
123-
- name: "CLOUDANT_DB_PREFIX"
124-
value: {{ .Values.providers.cloudant.dbPrefix | quote }}
125123
- name: "KAFKA_DB_PREFIX"
126124
value: {{ .Values.providers.kafka.dbPrefix | quote }}
127125

128126
# Should each of the providers be installed?
129127
- name: "OW_INSTALL_ALARM_PROVIDER"
130128
value: {{ if .Values.providers.alarm.enabled }} "yes" {{ else }} "no" {{ end }}
131-
- name: "OW_INSTALL_CLOUDANT_PROVIDER"
132-
value: {{ if .Values.providers.cloudant.enabled }} "yes" {{ else }} "no" {{ end }}
133129
- name: "OW_INSTALL_KAFKA_PROVIDER"
134130
value: {{ if .Values.providers.kafka.enabled }} "yes" {{ else }} "no" {{ end }}
135131

@@ -140,7 +136,5 @@ spec:
140136
value: {{ .Values.whisk.versions.openwhiskCatalog.gitTag | quote }}
141137
- name: "OW_GIT_TAG_OPENWHISK_PACKAGE_ALARMS"
142138
value: {{ .Values.whisk.versions.openwhiskPackageAlarms.gitTag | quote }}
143-
- name: "OW_GIT_TAG_OPENWHISK_PACKAGE_CLOUDANT"
144-
value: {{ .Values.whisk.versions.openwhiskPackageCloudant.gitTag | quote }}
145139
- name: "OW_GIT_TAG_OPENWHISK_PACKAGE_KAFKA"
146140
value: {{ .Values.whisk.versions.openwhiskPackageKafka.gitTag | quote }}

‎helm/openwhisk/templates/provider-cloudant-pod.yaml‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

‎helm/openwhisk/templates/provider-cloudant-pvc.yaml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎helm/openwhisk/templates/provider-kafka-pod.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ spec:
5656
- name: "DB_PASS"
5757
value: {{ .Values.providers.db.password | quote }}
5858
{{- else }}
59-
# Config database using the same openwhisk cloudant instance
59+
# Config database using the same openwhisk couchdb instance
6060
- name: "DB_URL"
6161
valueFrom:
6262
configMapKeyRef:

0 commit comments

Comments
 (0)