fix olm bundle release

Signed-off-by: cedric lamoriniere <cedric.lamoriniere@datadoghq.com>
DataDog · May 20, 2020 · da445fa · da445fa
1 parent 8b1b1fe
commit da445fa
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 3 deletions.
diff --git a/deploy/olm-catalog/csv-config.yaml b/deploy/olm-catalog/csv-config.yaml
@@ -0,0 +1,3 @@
+role-paths:
+- deploy/role.yaml
+- deploy/clusterrole.yaml
diff --git a/deploy/olm-catalog/datadog-operator/0.2.0/datadog-operator.v0.2.0.clusterserviceversion.yaml b/deploy/olm-catalog/datadog-operator/0.2.0/datadog-operator.v0.2.0.clusterserviceversion.yaml
@@ -71,6 +71,27 @@ spec:
   displayName: Datadog Operator
   install:
     spec:
+      clusterPermissions:
+      - rules:
+        - apiGroups:
+          - rbac.authorization.k8s.io
+          - roles.rbac.authorization.k8s.io
+          - authorization.k8s.io
+          resources:
+          - clusterroles
+          - clusterrolebindings
+          verbs:
+          - '*'
+        - apiGroups:
+          - datadoghq.com
+          resources:
+          - datadogagents
+          - datadogagents/status
+          - datadogagents/finalizers
+          - extendeddaemonsets
+          verbs:
+          - '*'
+        serviceAccountName: datadog-operator
       deployments:
       - name: datadog-operator
         spec:

diff --git a/deploy/olm-catalog/datadog-operator/0.2.1/datadog-operator.v0.2.1.clusterserviceversion.yaml b/deploy/olm-catalog/datadog-operator/0.2.1/datadog-operator.v0.2.1.clusterserviceversion.yaml
@@ -71,6 +71,27 @@ spec:
   displayName: Datadog Operator
   install:
     spec:
+      clusterPermissions:
+      - rules:
+        - apiGroups:
+          - rbac.authorization.k8s.io
+          - roles.rbac.authorization.k8s.io
+          - authorization.k8s.io
+          resources:
+          - clusterroles
+          - clusterrolebindings
+          verbs:
+          - '*'
+        - apiGroups:
+          - datadoghq.com
+          resources:
+          - datadogagents
+          - datadogagents/status
+          - datadogagents/finalizers
+          - extendeddaemonsets
+          verbs:
+          - '*'
+        serviceAccountName: datadog-operator
       deployments:
       - name: datadog-operator
         spec:

diff --git a/hack/generate-olm-bundle.sh b/hack/generate-olm-bundle.sh
@@ -33,15 +33,15 @@ trap cleanup EXIT
 # move all zip file if exit
 mv $ZIP_FILE_NAME $ZIP_FILE_NAME.old
 
-for i in $OLM_FOLDER/$VERSION/*.yaml $OLM_FOLDER/*.yaml
+for i in $OLM_FOLDER/*/*.yaml $OLM_FOLDER/*.yaml
 do  
     cp $i $WORK_DIR/${i##*/}
-    sed ${SED_OPTIONS} -e "s|${IMAGE_NAME}|${REDHAT_IMAGE_NAME}|g" $WORK_DIR/${i##*/}
+    $SED -e "s|${IMAGE_NAME}|${REDHAT_IMAGE_NAME}|g" $WORK_DIR/${i##*/}
     echo "$i $filename" 
 done
 
 pushd $WORK_DIR
-sed ${SED_OPTIONS} -e 's/packageName\: datadog-operator/packageName\: datadog-operator-certified/g' datadog-operator.package.yaml
+$SED -e 's/packageName\: datadog-operator/packageName\: datadog-operator-certified/g' datadog-operator.package.yaml
 rm *.bak
 zip $ZIP_FILE_NAME ./*.yaml
 popd