Merge branch 'release/0.1.1'

redhat-marketplace · Apr 27, 2020 · eb872ed · eb872ed
2 parents 577de94 + 8b7c680
commit eb872ed
Show file tree

Hide file tree

Showing 24 changed files with 2,039 additions and 182 deletions.
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ IMAGE_REGISTRY ?= public-image-registry.apps-crc.testing/symposium
 OPERATOR_IMAGE_NAME ?= redhat-marketplace-operator
 VERSION ?= $(shell go run scripts/version/main.go)
 OPERATOR_IMAGE_TAG ?= $(VERSION)
-FROM_VERSION ?= "0.0.2"
+FROM_VERSION ?= "0.1.0"
 CREATED_TIME ?= $(shell date +"%FT%H:%M:%SZ")
 
 

diff --git a/deploy/chart/templates/role.yaml b/deploy/chart/templates/role.yaml
@@ -1,9 +1,13 @@
+{{- $namespace := .Values.namespace }}
 {{- range .Values.roles }}
 {{- $role := . }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: {{ $role.type }}
 metadata:
   name: {{ $role.name }}
+  {{- if eq $role.type "Role" }}
+  namespace: {{ $namespace }}
+  {{- end }}
 rules:
 {{- toYaml $role.rules | nindent 0 }}
 ---

diff --git a/deploy/chart/templates/role_binding.yaml b/deploy/chart/templates/role_binding.yaml
@@ -1,7 +1,11 @@
 {{- $namespace := .Values.namespace }}
 {{- range .Values.roles }}
 {{- $role := . }}
-kind: ClusterRoleBinding
+{{- $roleKind := "ClusterRoleBinding"}}
+{{- if eq $role.type "Role" }}
+{{- $roleKind = "RoleBinding" }}
+{{- end }}
+kind: {{ $roleKind }}
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ $role.name }}

diff --git a/deploy/chart/templates/service_account.yaml b/deploy/chart/templates/service_account.yaml
@@ -1,9 +1,15 @@
+
+{{- $myDict := dict }}
 {{- range .Values.roles }}
 {{- $role := . }}
+{{- $_ := set $myDict $role.serviceAccountName "t" }}
+{{- end }}
+{{- range keys $myDict }}
+{{- $serviceAccountName := . }}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ $role.serviceAccountName }}
+  name: {{ $serviceAccountName }}
   labels:
     {{- include "chart.labels" $ | nindent 4 }}
 ---

diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
 namespace: redhat-marketplace-operator
 image: quay.io/rh-marketplace/redhat-marketplace-operator:dev
 pullPolicy: Always
-watchNamespace: "" # watch all namespaces
+watchNamespace: '' # watch all namespaces
 serviceAccountName: redhat-marketplace-operator
 env:
   - name: RELATED_IMAGE_RAZEE_JOB
@@ -17,63 +17,275 @@ roles:
     serviceAccountName: redhat-marketplace-operator
     type: ClusterRole
     rules:
-    - apiGroups:
-      - '*'
-      resources:
-      - '*'
-      verbs:
-      - '*'
-    - nonResourceURLs:
-      - '*'
-      verbs:
-      - '*'
+      - apiGroups:
+          - ''
+        resources:
+          - pods
+          - services
+          - services/finalizers
+          - endpoints
+          - persistentvolumeclaims
+          - events
+          - configmaps
+          - secrets
+          - namespaces
+        verbs:
+          - get
+          - list
+          - watch
+      - apiGroups: ['batch', 'extensions']
+        resources: ['jobs']
+        verbs: ['get', 'list', 'watch']
+      - apiGroups:
+          - apps
+        resources:
+          - deployments
+        verbs:
+          - get
+          - list
+          - watch
+      - apiGroups:
+          - apps
+        resourceNames:
+          - redhat-marketplace-operator
+        resources:
+          - deployments/finalizers
+        verbs:
+          - update
+      - apiGroups:
+          - storage.k8s.io
+        resources:
+          - storageclasses
+        verbs:
+          - get
+          - list
+          - watch
+      - apiGroups:
+          - monitoring.coreos.com
+        resources:
+          - servicemonitors
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+      - apiGroups:
+          - monitoring.coreos.com
+        resources:
+          - prometheuses
+        verbs:
+          - get
+          - list
+          - watch
+      - apiGroups:
+          - operators.coreos.com
+        resources:
+          - operatorsources
+          - subscriptions
+        verbs:
+          - get
+          - list
+          - watch
+      - apiGroups:
+          - operators.coreos.com
+        resourceNames:
+          - redhat-marketplace
+        resources:
+          - operatorsources
+        verbs:
+          - create
+          - delete
+          - patch
+          - update
+      - apiGroups:
+          - operators.coreos.com
+        resources:
+          - operatorgroups
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+      - apiGroups:
+          - deploy.razee.io
+        resources:
+          - remoteresourcess3
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+      - apiGroups:
+          - config.openshift.io
+        resources:
+          - consoles
+          - infrastructures
+        verbs:
+          - get
+          - list
+          - patch
+          - update
+      - apiGroups:
+          - marketplace.redhat.com
+        resources:
+          - '*'
+          - meterdefinitions
+          - razeedeployments
+          - meterbases
+          - marketplaceconfigs
+        verbs:
+          - '*'
+      - apiGroups:
+          - ''
+        resources:
+          - secrets
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        resourceNames:
+          - rhm-cos-reader-key
+          - watch-keeper-secret
+      - apiGroups:
+          - ''
+        resources:
+          - configmaps
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        resourceNames:
+          - watch-keeper-config
+          - watch-keeper-limit-poll
+          - watch-keeper-non-namespaced
+          - razee-cluster-metadata
   - name: redhat-marketplace-razeedeploy
     serviceAccountName: redhat-marketplace-razeedeploy
     type: ClusterRole
     rules:
-    - apiGroups:
-      - '*'
-      resources:
-      - '*'
-      verbs:
-      - '*'
-    - nonResourceURLs:
-      - '*'
-      verbs:
-      - '*'
-  - name: redhat-marketplace-metering
-    serviceAccountName: redhat-marketplace-metering
-    type: ClusterRole
-    rules:
-    - apiGroups:
-      - '*'
-      resources:
-      - '*'
-      verbs:
-      - '*'
-    - nonResourceURLs:
-      - '*'
-      verbs:
-      - '*'
-  - name: redhat-marketplace-reporting
-    serviceAccountName: redhat-marketplace-reporting
-    type: ClusterRole
+      - apiGroups:
+          - '*'
+        resources:
+          - '*'
+        verbs:
+          - '*'
+      - nonResourceURLs:
+          - '*'
+        verbs:
+          - '*'
+  - name: redhat-marketplace-operator
+    serviceAccountName: redhat-marketplace-operator
+    type: Role
     rules:
-    - apiGroups:
-      - '*'
-      resources:
-      - '*'
-      verbs:
-      - '*'
-    - nonResourceURLs:
-      - '*'
-      verbs:
-      - '*'
-
-podSecurityContext:
-  runAsUser: 1001
+      - apiGroups:
+          - ''
+        resources:
+          - pods
+          - services
+          - services/finalizers
+          - endpoints
+          - persistentvolumeclaims
+          - events
+          - configmaps
+          - secrets
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+      - apiGroups:
+          - batch
+          - extensions
+        resources:
+          - jobs
+        verbs: ['get', 'list', 'watch', 'create', 'update', 'patch', 'delete']
+      - apiGroups:
+          - apps
+        resources:
+          - deployments
+          - daemonsets
+          - replicasets
+          - statefulsets
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+      - apiGroups:
+          - apps
+        resourceNames:
+          - redhat-marketplace-operator
+        resources:
+          - deployments/finalizers
+        verbs:
+          - update
+      - apiGroups:
+          - monitoring.coreos.com
+        resources:
+          - prometheuses
+          - servicemonitors
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - patch
+          - update
+          - watch
+      - apiGroups:
+          - deploy.razee.io
+        resources:
+          - '*'
+          - remoteresourcess3
+          - remoteresources
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - update
+          - patch
+          - watch
+      - apiGroups:
+          - ''
+        resources:
+          - serviceaccounts
+        verbs:
+          - create
+          - delete
+          - get
+          - list
+          - update
+          - patch
+          - watch
+        resourceNames:
+          - razeedeploy-sa
+          - watch-keeper-sa
 
-securityContext: {}
+securityContext:
+  {}
   # capabilities:
   #   drop:
   #   - ALL

diff --git a/deploy/crds/marketplace.redhat.com_v1alpha1_marketplaceconfig_cr.yaml b/deploy/crds/marketplace.redhat.com_v1alpha1_marketplaceconfig_cr.yaml
@@ -6,4 +6,3 @@ spec:
   # Add fields here 
   rhmAccountID: example-userid
   clusterUUID: example-clusterUUID
-  deploySecretName: example-deploySecretName