Version 1.4.0 chart

IBM · Jun 24, 2021 · af6bfa7 · af6bfa7
1 parent 5ba0f0f
commit af6bfa7
Show file tree

Hide file tree

Showing 7 changed files with 301 additions and 33 deletions.
diff --git a/charts/stable/datapower-operator/Chart.yaml b/charts/stable/datapower-operator/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
 name: datapower-operator
-description: A chart to deploy the DataPowerService Operator
+description: A chart to deploy the IBM DataPower Operator
 type: application
-version: 1.3.0
-appVersion: 1.3.0
-kubeVersion: '>=1.17.0'
+version: 1.4.0
+appVersion: 1.4.0
+kubeVersion: '>=1.19.0'
 keywords:
 - amd64
 - Security

diff --git a/charts/stable/datapower-operator/README.md b/charts/stable/datapower-operator/README.md
@@ -64,8 +64,8 @@ spec:
 Custom SecurityContextConstraints definition:
 
 ```yaml
+apiVersion: security.openshift.io/v1
 kind: SecurityContextConstraints
-apiVersion: v1
 metadata:
   name: ibm-datapower-operator-scc
 allowHostDirVolumePlugin: false
@@ -76,7 +76,6 @@ allowHostPorts: false
 allowPrivilegeEscalation: false
 allowPrivilegedContainer: false
 allowedCapabilities: null
-apiVersion: security.openshift.io/v1
 defaultAddCapabilities: null
 groups:
 - system:authenticated
@@ -151,7 +150,7 @@ kubectl delete crd/datapowermonitors.datapower.ibm.com
 |Value|Description|Default|
 |-|-|-|
 |`operator.replicas`|Number of Operator pods to deploy|`1`|
-|`operator.image.repository`|Repository containing Operator image|`docker.io/ibmcom/datapower-operator`|
+|`operator.image.repository`|Repository containing Operator image|`icr.io/cpopen/datapower-operator`|
 |`operator.image.tag`|Name of Operator image|`latest`|
 |`operator.image.pullPolicy`|Image pull policy for Operator|`Always`|
 |`operator.imagePullSecrets`|List of pull secret names|`[]`|

diff --git a/charts/stable/datapower-operator/crds/datapower.ibm.com_datapowermonitors_crd.yaml b/charts/stable/datapower-operator/crds/datapower.ibm.com_datapowermonitors_crd.yaml
@@ -1,7 +1,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  creationTimestamp: "2021-03-16T19:53:07Z"
+  creationTimestamp: "2021-06-11T17:15:55Z"
   labels:
     app.kubernetes.io/instance: datapower-operator
     app.kubernetes.io/managed-by: datapower-operator

diff --git a/charts/stable/datapower-operator/crds/datapower.ibm.com_datapowerservices_crd.yaml b/charts/stable/datapower-operator/crds/datapower.ibm.com_datapowerservices_crd.yaml
diff --git a/charts/stable/datapower-operator/templates/cluster_role.yaml b/charts/stable/datapower-operator/templates/cluster_role.yaml
@@ -99,6 +99,25 @@ rules:
   - update
   - watch
 
+# Needed for OpenShift SCC management
+- apiGroups:
+  - security.openshift.io
+  resources:
+  - securitycontextconstraints
+  verbs:
+  - use
+  resourceNames:
+  - datapower-root
+
+# Needed for Cp4iServicesBinding CP4I watched namespaces
+- apiGroups:
+    - operators.coreos.com
+  resources:
+    - clusterserviceversions
+  verbs:
+    - list
+    - watch
+
 {{- if eq .Values.operator.installMode "AllNamespaces" }}
 # If installMode is AllNamespaces, we should use the cluster role for everything.
 {{ $.Files.Get "static/role_rules.yaml" }}

diff --git a/charts/stable/datapower-operator/templates/operator.yaml b/charts/stable/datapower-operator/templates/operator.yaml
@@ -26,7 +26,7 @@ spec:
         productName: "IBM DataPower Operator"
         productMetric: "FREE"
         productChargedContainers: ""
-        productVersion: 1.3.0
+        productVersion: 1.4.0
     spec:
       affinity:
         nodeAffinity:
@@ -79,6 +79,8 @@ spec:
               value: {{ .Values.operator.entitledPullRegistry | default "cp.icr.io/cp/datapower" | quote }}
             - name: IBM_DOCKER_HUB
               value: {{ .Values.operator.imagePullRegistry | default "docker.io/ibmcom" | quote }}
+            - name: IBM_PUBLIC_REGISTRY
+              value: {{ .Values.operator.imagePullRegistry | default "icr.io/cpopen" | quote }}
           resources:
             requests:
               cpu: "500m"

diff --git a/charts/stable/datapower-operator/values.yaml b/charts/stable/datapower-operator/values.yaml
@@ -5,7 +5,7 @@
 operator:
   replicas: 1
   image:
-    repository: docker.io/ibmcom/datapower-operator
+    repository: icr.io/cpopen/datapower-operator
     tag: latest
     pullPolicy: Always
   installMode: OwnNamespace