Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Grant deployment manager server account permissions to read managed clusters and secrets #82

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
#
# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
# openshift.io/oran-o2ims-bundle:$VERSION and openshift.io/oran-o2ims-catalog:$VERSION.
IMAGE_TAG_BASE ?= quay.io/imihai/oran-o2ims-operator
IMAGE_TAG_BASE ?= quay.io/openshift-kni/oran-o2ims-operator

# BUNDLE_IMG defines the image:tag used for the bundle.
# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
Expand Down
44 changes: 42 additions & 2 deletions bundle/manifests/oran-o2ims.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ metadata:
}
]
capabilities: Basic Install
createdAt: "2024-02-12T21:18:41Z"
createdAt: "2024-04-09T18:40:03Z"
operators.operatorframework.io/builder: operator-sdk-v1.33.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
name: oran-o2ims.v4.16.0
Expand Down Expand Up @@ -62,6 +62,14 @@ spec:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -98,6 +106,14 @@ spec:
- patch
- update
- watch
- apiGroups:
- cluster.open-cluster-management.io
resources:
- managedclusters
verbs:
- get
- list
- watch
- apiGroups:
- networking.k8s.io
resources:
Expand Down Expand Up @@ -136,6 +152,30 @@ spec:
- get
- patch
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- authentication.k8s.io
resources:
Expand Down Expand Up @@ -202,7 +242,7 @@ spec:
- --leader-elect
command:
- /manager
image: quay.io/imihai/oran-o2ims-operator:4.16.0
image: quay.io/openshift-kni/oran-o2ims-operator:4.16.0
livenessProbe:
httpGet:
path: /healthz
Expand Down
16 changes: 16 additions & 0 deletions bundle/manifests/oran.openshift.io_orano2imses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ spec:
spec:
description: ORANO2IMSSpec defines the desired state of ORANO2IMS
properties:
alarmSubscriptionServer:
type: boolean
backendToken:
type: string
backendType:
Expand All @@ -49,15 +51,27 @@ spec:
deploymentManagerServer:
default: false
type: boolean
extensions:
description: This field allows the addition of extra O-Cloud information
items:
type: string
type: array
ingressHost:
type: string
metadataServer:
default: false
type: boolean
resourceServer:
default: false
type: boolean
searchAPIBackendURL:
type: string
required:
- alarmSubscriptionServer
- cloudId
- deploymentManagerServer
- metadataServer
- resourceServer
type: object
status:
description: ORANO2IMSStatus defines the observed state of ORANO2IMS
Expand Down Expand Up @@ -142,6 +156,8 @@ spec:
type: string
metadataServerStatus:
type: string
resourceServerStatus:
type: string
type: object
type: object
type: object
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ generatorOptions:

images:
- name: controller
newName: quay.io/jhernand/o2ims-operator
newTag: "2"
newName: quay.io/openshift-kni/oran-o2ims-operator
newTag: 4.16.0
17 changes: 16 additions & 1 deletion config/manifests/bases/oran-o2ims.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,22 @@ metadata:
namespace: placeholder
spec:
apiservicedefinitions: {}
customresourcedefinitions: {}
customresourcedefinitions:
owned:
- description: ORANO2IMS is the Schema for the orano2ims API
displayName: ORANO2 IMS
kind: ORANO2IMS
name: orano2ims.oran.openshift.io
statusDescriptors:
- displayName: Conditions
path: deploymentStatus.conditions
- displayName: Deployment Server Status
path: deploymentStatus.deploymentServerStatus
- displayName: Metadata Server Status
path: deploymentStatus.metadataServerStatus
- displayName: Resource Server Status
path: deploymentStatus.resourceServerStatus
version: v1alpha1
description: Deploys the ORAN O2IMS services
displayName: ORAN O2IMS Operator
icon:
Expand Down
40 changes: 40 additions & 0 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,14 @@ rules:
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -52,6 +60,14 @@ rules:
- patch
- update
- watch
- apiGroups:
- cluster.open-cluster-management.io
resources:
- managedclusters
verbs:
- get
- list
- watch
- apiGroups:
- networking.k8s.io
resources:
Expand Down Expand Up @@ -90,3 +106,27 @@ rules:
- get
- patch
- update
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterrolebindings
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- rbac.authorization.k8s.io
resources:
- clusterroles
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
Loading
Loading