Skip to content

Commit

Permalink
Merge pull request #9 from IBM/v1.3.x
Browse files Browse the repository at this point in the history
1.3.0 chart updates
  • Loading branch information
aharbis authored Mar 26, 2021
2 parents b73e77e + b4685e6 commit 5ba0f0f
Show file tree
Hide file tree
Showing 10 changed files with 1,441 additions and 185 deletions.
4 changes: 2 additions & 2 deletions charts/stable/datapower-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: datapower-operator
description: A chart to deploy the DataPowerService Operator
type: application
version: 1.2.2
appVersion: 1.2.2
version: 1.3.0
appVersion: 1.3.0
kubeVersion: '>=1.17.0'
keywords:
- amd64
Expand Down
11 changes: 6 additions & 5 deletions charts/stable/datapower-operator/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# DataPowerService Operator Chart
# IBM DataPower Operator Chart

## Introduction

The DataPowerService Operator manages StatefulSets of DataPower Pods following configuration defined in DataPowerService Custom Resources.
The IBM DataPower Operator manages StatefulSets of DataPower Pods following configuration defined in DataPowerService Custom Resources.

## Chart Details

This chart deploys a DataPowerService Operator Deployment into a namespace. The DataPowerService CRD will be deployed from this chart if and only if a version of it does not already exist in the cluster.
This chart deploys a DataPower Operator Deployment into a namespace. The DataPowerService CRD will be deployed from this chart if and only if a version of it does not already exist in the cluster.

## Prerequisites

Expand Down Expand Up @@ -136,13 +136,14 @@ To uninstall this chart, issue the following command:
helm uninstall <name>
```

Due to [limitations](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) in Helm, the `DataPowerService` Custom Resource Definition (CRD) is not deleted when the operator is uninstalled via Helm. To clean up the CRD, issue the following command:
Due to [limitations](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/) in Helm, the Custom Resource Definitions (CRDs) are not deleted when the operator is uninstalled via Helm. To clean up the CRDs, issue the following commands:

```
kubectl delete crd/datapowerservices.datapower.ibm.com
kubectl delete crd/datapowermonitors.datapower.ibm.com
```

**Warning:** Deleting the CRD will cause all Custom Resource (CR) instances to also be deleted.
**Warning:** Deleting the CRDs will cause all Custom Resource (CR) instances to also be deleted.

## Configuration
### Chart values
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
creationTimestamp: "2021-01-22T16:45:56Z"
creationTimestamp: "2021-03-16T19:53:07Z"
labels:
app.kubernetes.io/instance: datapower-operator
app.kubernetes.io/managed-by: datapower-operator
Expand Down

Large diffs are not rendered by default.

50 changes: 32 additions & 18 deletions charts/stable/datapower-operator/static/role_rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,35 +77,35 @@
resources:
- jobs
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- roles
- rolebindings
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- monitoringcontroller.cloud.ibm.com
resources:
- monitoringdashboards
verbs:
- create
- get
- list
- watch
- create
- get
- list
- watch
- apiGroups:
- cp4i.ibm.com
resources:
Expand All @@ -118,3 +118,17 @@
- patch
- update
- delete
- apiGroups:
- autoscaling
- autoscaling.k8s.io
resources:
- horizontalpodautoscalers
- verticalpodautoscalers
verbs:
- create
- get
- list
- watch
- patch
- update
- delete
8 changes: 0 additions & 8 deletions charts/stable/datapower-operator/templates/cluster_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ rules:
- update
- watch

# Needed for OCP platform checks
- apiGroups:
- config.openshift.io
resources:
- clusterversions
verbs:
- get

{{- if eq .Values.operator.installMode "AllNamespaces" }}
# If installMode is AllNamespaces, we should use the cluster role for everything.
{{ $.Files.Get "static/role_rules.yaml" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/stable/datapower-operator/templates/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
productName: "IBM DataPower Operator"
productMetric: "FREE"
productChargedContainers: ""
productVersion: 1.2.2
productVersion: 1.3.0
spec:
affinity:
nodeAffinity:
Expand Down
130 changes: 0 additions & 130 deletions charts/stable/datapower-operator/templates/role.yaml

This file was deleted.

17 changes: 0 additions & 17 deletions charts/stable/datapower-operator/templates/role_binding.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion charts/stable/datapower-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ operator:
installMode: OwnNamespace
watchNamespaces: []
logLevel: info
imagePullSecrets: []
imagePullSecrets: []

0 comments on commit 5ba0f0f

Please sign in to comment.