Skip to content

Commit acd3869

Browse files
authored
lmadsen scorecard cleanup (#135)
* Post-refactor clean up Initial round of post-refactor clean up based on operator-sdk 0.19.4 and the new generate commands. Updates the manifests and metadata per the new release of operator-sdk and also validates that the scorecard can be run. Adjustments made based on the scorecard recommendations were made. More to come. * Set default channel to 'latest' * Align metadata to new default channel of latest for HEAD * Address most of the operator-sdk scorecard findings
1 parent 644e40a commit acd3869

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

.osdk-scorecard.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
scorecard:
22
version: v1alpha2
33
output: text
4-
bundle: deploy/olm-catalog/service-telemetry-operator/bundle/metadata
4+
bundle: deploy/olm-catalog/service-telemetry-operator
55
plugins:
66
- basic:
77
cr-manifest:
88
- "deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml"
9-
csv-path: "deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml"
109
- olm:
1110
cr-manifest:
1211
- "deploy/crds/infra.watch_v1beta1_servicetelemetry_cr.yaml"

bundle.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
66
LABEL operators.operatorframework.io.bundle.package.v1=service-telemetry-operator
77
LABEL operators.operatorframework.io.bundle.channels.v1=latest
88
LABEL operators.operatorframework.io.bundle.channel.default.v1=latest
9+
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
910
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v0.19.4
1011
LABEL operators.operatorframework.io.metrics.project_layout=ansible
11-
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
1212

1313
COPY deploy/olm-catalog/service-telemetry-operator/manifests /manifests/
1414
COPY deploy/olm-catalog/service-telemetry-operator/metadata /metadata/

deploy/olm-catalog/service-telemetry-operator/manifests/service-telemetry-operator.clusterserviceversion.yaml

+27-2
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,31 @@ spec:
106106
name: servicemonitors.monitoring.coreos.com
107107
version: v1
108108
specDescriptors:
109+
- description: Alerting configuration
110+
displayName: Alerting Configuration
111+
path: alerting
112+
x-descriptors:
113+
- urn:alm:descriptor:com.tectonic.ui:hidden
114+
- description: Backends configuration
115+
displayName: Backends Configuration
116+
path: backends
117+
x-descriptors:
118+
- urn:alm:descriptor:com.tectonic.ui:hidden
119+
- description: Graphing configuration
120+
displayName: Graphing Configuration
121+
path: graphing
122+
x-descriptors:
123+
- urn:alm:descriptor:com.tectonic.ui:hidden
124+
- description: highAvailability configuration
125+
displayName: High Availability Configuration
126+
path: highAvailability
127+
x-descriptors:
128+
- urn:alm:descriptor:com.tectonic.ui:hidden
129+
- description: Transports configuration
130+
displayName: Transports Configuration
131+
path: transports
132+
x-descriptors:
133+
- urn:alm:descriptor:com.tectonic.ui:hidden
109134
- description: Enable Prometheus for metrics backend.
110135
displayName: Prometheus enabled
111136
path: backends.metrics.prometheus.enabled
@@ -203,7 +228,7 @@ spec:
203228
displayName: Conditions
204229
path: conditions
205230
x-descriptors:
206-
- urn:alm:descriptor:io.kubernetes.conditions
231+
- urn:alm:descriptor:io.kubernetes:conditions
207232
- description: Ephemeral storage used?
208233
displayName: Ephemeral storage used?
209234
path: ephemeralStorageEnabled.status
@@ -267,7 +292,7 @@ spec:
267292
displayName: Conditions
268293
path: conditions
269294
x-descriptors:
270-
- urn:alm:descriptor:io.kubernetes.conditions
295+
- urn:alm:descriptor:io.kubernetes:conditions
271296
version: v1alpha1
272297
required:
273298
- description: A declaration of a required Certificate

0 commit comments

Comments
 (0)