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.

Sign up for GitHub

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

CSV changes to remove ocs metrics exporter deployment #2313

Merged
merged 4 commits into from
Dec 11, 2023
Merged

CSV changes to remove ocs metrics exporter deployment #2313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51f5c0f
remove ocs-metrics-exporter from CSV
umangachapagain Dec 8, 2023
47ce079
generated CSV without ocs-metrics-exporter deploy
umangachapagain Dec 8, 2023
aa38091
remove ocs-metrics-exporter serviceaccount & RBACs
umangachapagain Dec 11, 2023
bd260f5
update bundle with generated changes
umangachapagain Dec 11, 2023
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
68 changes: 0 additions & 68 deletions config/rbac/exporter-role.yaml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions config/rbac/exporter-role_binding.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions config/rbac/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ resources:
- role_binding.yaml
- leader_election_role.yaml
- leader_election_role_binding.yaml
- exporter-role.yaml
- exporter-role_binding.yaml
# Comment the following 4 lines if you want to disable
# the auth proxy (https://github.com/brancz/kube-rbac-proxy)
# which protects your /metrics endpoint.
Expand Down
65 changes: 0 additions & 65 deletions deploy/csv-templates/ocs-operator.csv.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,71 +156,6 @@ spec:
install:
spec:
clusterPermissions:
- rules:
- apiGroups:
- ceph.rook.io
resources:
- cephobjectstores
- cephblockpools
- cephclusters
- cephrbdmirrors
verbs:
- get
- list
- watch
- apiGroups:
- quota.openshift.io
resources:
- clusterresourcequotas
verbs:
- get
- list
- watch
- apiGroups:
- objectbucket.io
resources:
- objectbuckets
- objectbucketclaims
verbs:
- get
- list
- apiGroups:
- ""
resources:
- configmaps
- secrets
verbs:
- get
- list
- apiGroups:
- ""
resources:
- persistentvolumes
- persistentvolumeclaims
- pods
- nodes
verbs:
- get
- list
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- get
- list
- watch
- apiGroups:
- ocs.openshift.io
resources:
- storageconsumers
- storageclusters
verbs:
- get
- list
- watch
serviceAccountName: ocs-metrics-exporter
- rules:
- apiGroups:
- apiextensions.k8s.io
Expand Down
122 changes: 2 additions & 120 deletions deploy/ocs-operator/manifests/ocs-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,71 +1876,6 @@ spec:
install:
spec:
clusterPermissions:
- rules:
- apiGroups:
- ceph.rook.io
resources:
- cephobjectstores
- cephblockpools
- cephclusters
- cephrbdmirrors
verbs:
- get
- list
- watch
- apiGroups:
- quota.openshift.io
resources:
- clusterresourcequotas
verbs:
- get
- list
- watch
- apiGroups:
- objectbucket.io
resources:
- objectbuckets
- objectbucketclaims
verbs:
- get
- list
- apiGroups:
- ""
resources:
- configmaps
- secrets
verbs:
- get
- list
- apiGroups:
- ""
resources:
- persistentvolumes
- persistentvolumeclaims
- pods
- nodes
verbs:
- get
- list
- watch
- apiGroups:
- storage.k8s.io
resources:
- storageclasses
verbs:
- get
- list
- watch
- apiGroups:
- ocs.openshift.io
resources:
- storageconsumers
- storageclusters
verbs:
- get
- list
- watch
serviceAccountName: ocs-metrics-exporter
- rules:
- apiGroups:
- apiextensions.k8s.io
Expand Down Expand Up @@ -3043,14 +2978,6 @@ spec:
verbs:
- use
serviceAccountName: rook-ceph-system
- rules:
- apiGroups:
- monitoring.coreos.com
resources:
- '*'
verbs:
- '*'
serviceAccountName: ocs-metrics-exporter
deployments:
- name: ocs-operator
spec:
Expand All @@ -3076,6 +3003,8 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
- name: OCS_METRICS_EXPORTER_IMAGE
value: quay.io/ocs-dev/ocs-metrics-exporter:latest
- name: ROOK_CEPH_IMAGE
value: docker.io/rook/ceph:v1.12.0.545.geacc7e744
- name: CEPH_IMAGE
Expand Down Expand Up @@ -3267,53 +3196,6 @@ spec:
name: default-config-dir
- emptyDir: {}
name: webhook-cert
- name: ocs-metrics-exporter
spec:
replicas: 1
selector:
matchLabels:
app.kubernetes.io/component: ocs-metrics-exporter
app.kubernetes.io/name: ocs-metrics-exporter
strategy: {}
template:
metadata:
labels:
app.kubernetes.io/component: ocs-metrics-exporter
app.kubernetes.io/name: ocs-metrics-exporter
app.kubernetes.io/version: 0.0.1
spec:
containers:
- args:
- --namespaces=$(WATCH_NAMESPACE)
command:
- /usr/local/bin/metrics-exporter
env:
- name: WATCH_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: quay.io/ocs-dev/ocs-metrics-exporter:latest
name: ocs-metrics-exporter
ports:
- containerPort: 8080
- containerPort: 8081
resources: {}
securityContext:
privileged: false
runAsNonRoot: true
volumeMounts:
- mountPath: /etc/ceph
name: ceph-config
serviceAccountName: ocs-metrics-exporter
tolerations:
- effect: NoSchedule
key: node.ocs.openshift.io/storage
operator: Equal
value: "true"
volumes:
- configMap:
name: ocs-metrics-exporter-ceph-conf
name: ceph-config
permissions:
- rules:
- apiGroups:
Expand Down
1 change: 0 additions & 1 deletion hack/install-ocs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ fi
"$OPERATOR_SDK" run bundle "$BUNDLE_FULL_IMAGE_NAME" --timeout=10m --security-context-config restricted -n "$INSTALL_NAMESPACE"

oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deployment ocs-operator
oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deployment ocs-metrics-exporter
oc wait --timeout=5m --for condition=Available -n "$INSTALL_NAMESPACE" deployment rook-ceph-operator
2 changes: 1 addition & 1 deletion hack/source-manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function gen_ocs_csv() {
pushd config/manager
$KUSTOMIZE edit set image ocs-dev/ocs-operator="$OCS_IMAGE"
popd
$KUSTOMIZE build config/manifests/ocs-operator | $OPERATOR_SDK generate bundle -q --overwrite=false --output-dir deploy/ocs-operator --kustomize-dir config/manifests/ocs-operator --package ocs-operator --version "$CSV_VERSION" --extra-service-accounts=ocs-metrics-exporter
$KUSTOMIZE build config/manifests/ocs-operator | $OPERATOR_SDK generate bundle -q --overwrite=false --output-dir deploy/ocs-operator --kustomize-dir config/manifests/ocs-operator --package ocs-operator --version "$CSV_VERSION"
mv deploy/ocs-operator/manifests/*clusterserviceversion.yaml $OCS_CSV
cp config/crd/bases/* $ocs_crds_outdir
}
Expand Down
Loading