diff --git a/manifests/deploy/generic/alm/metering.0.7.0.clusterserviceversion.yaml b/manifests/deploy/generic/alm/metering.0.7.0.clusterserviceversion.yaml new file mode 100644 index 000000000..0f5da991e --- /dev/null +++ b/manifests/deploy/generic/alm/metering.0.7.0.clusterserviceversion.yaml @@ -0,0 +1,322 @@ +#! validate-crd: ../../deploy/chart/templates/03-clusterserviceversion.crd.yaml +#! parse-kind: ClusterServiceVersion +apiVersion: app.coreos.com/v1alpha1 +kind: ClusterServiceVersion-v1 +metadata: + name: metering-operator.v0.7.0 + annotations: + tectonic-visibility: tectonic-feature + labels: + alm-catalog: tectonic-feature + operator-metering: "true" +spec: + displayName: Metering + description: Metering can generate reports based on historical usage data from a cluster, providing accountability for how resources have been used. + keywords: [metering metrics reporting coreos] + version: 0.7.0 + maturity: alpha + maintainers: + - email: support@coreos.com + name: CoreOS, Inc + provider: + name: CoreOS, Inc + labels: + alm-owner-metering: metering-operator + alm-status-descriptors: metering-operator.v0.7.0 + selector: + matchLabels: + alm-owner-metering: metering-operator + install: + strategy: deployment + spec: + permissions: + - rules: + - apiGroups: + - metering.openshift.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - "" + resources: + - pods + - pods/attach + - pods/exec + - pods/portforward + - pods/proxy + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - configmaps + - endpoints + - persistentvolumeclaims + - replicationcontrollers + - replicationcontrollers/scale + - secrets + - serviceaccounts + - services + - services/proxy + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - bindings + - events + - limitranges + - namespaces/status + - pods/log + - pods/status + - replicationcontrollers/status + - resourcequotas + - resourcequotas/status + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - update + - patch + - apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - apps + resources: + - deployments + - deployments/rollback + - deployments/scale + - statefulsets + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - extensions + resources: + - daemonsets + - deployments + - deployments/rollback + - deployments/scale + - replicasets + - replicasets/scale + - replicationcontrollers/scale + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - rbac.authorization.k8s.io + resources: + - rolebindings + - roles + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - route.openshift.io + resources: + - routes + verbs: + - create + - get + - list + - watch + - update + - delete + serviceAccountName: metering-operator + deployments: + - name: metering-operator + spec: + replicas: 1 + selector: + matchLabels: + app: metering-operator + strategy: + type: Recreate + template: + metadata: + labels: + app: metering-operator + spec: + containers: + - args: + - run-operator.sh + env: + - name: HELM_RELEASE_CRD_NAME + value: Metering + - name: HELM_RELEASE_CRD_API_GROUP + value: metering.openshift.io + - name: HELM_CHART_PATH + value: /operator-metering-0.1.0.tgz + - name: MY_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: MY_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: HELM_HOST + value: 127.0.0.1:44134 + - name: HELM_WAIT + value: "false" + - name: HELM_RECONCILE_INTERVAL_SECONDS + value: "30" + - name: RELEASE_HISTORY_LIMIT + value: "3" + image: quay.io/coreos/metering-helm-operator:0.7.0 + imagePullPolicy: Always + name: metering-operator + resources: + limits: + cpu: 50m + memory: 25Mi + requests: + cpu: 50m + memory: 25Mi + - args: + - /tiller + env: + - name: TILLER_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TILLER_HISTORY_MAX + value: "3" + image: quay.io/coreos/metering-helm-operator:0.7.0 + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /liveness + port: 44135 + scheme: HTTP + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + name: tiller + readinessProbe: + failureThreshold: 3 + httpGet: + path: /readiness + port: 44135 + scheme: HTTP + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: + limits: + cpu: 50m + memory: 100Mi + requests: + cpu: 50m + memory: 50Mi + restartPolicy: Always + securityContext: + runAsNonRoot: true + serviceAccount: metering-operator + terminationGracePeriodSeconds: 30 + customresourcedefinitions: + owned: + - description: An instance of Metering + displayName: Metering + kind: Metering + name: meterings.metering.openshift.io + version: v1alpha1 + - description: A table within PrestoDB + displayName: Metering Presto Table + kind: PrestoTable + name: prestotables.metering.openshift.io + version: v1alpha1 + - description: A resource describing a source of data for usage by Report Generation + Queries + displayName: Metering data source + kind: ReportDataSource + name: reportdatasources.metering.openshift.io + version: v1alpha1 + - description: A SQL query used by Metering to generate reports + displayName: Metering generation query + kind: ReportGenerationQuery + name: reportgenerationqueries.metering.openshift.io + version: v1alpha1 + - description: A Prometheus query by Metering to do metering + displayName: Metering prometheus query + kind: ReportPrometheusQuery + name: reportprometheusqueries.metering.openshift.io + version: v1alpha1 + - description: A metering report for a specific time interval + displayName: Metering Report + kind: Report + name: reports.metering.openshift.io + version: v1alpha1 + - description: A metering report that runs on a scheduled interval + displayName: Metering Scheduled Report + kind: ScheduledReport + name: scheduledreports.metering.openshift.io + version: v1alpha1 + - description: Represents a configurable storage location for Metering to store metering + and report data + displayName: Metering storage location + kind: StorageLocation + name: storagelocations.metering.openshift.io + version: v1alpha1 diff --git a/manifests/deploy/generic/alm/metering.package.yaml b/manifests/deploy/generic/alm/metering.package.yaml index 55dfc549b..8873a22d3 100644 --- a/manifests/deploy/generic/alm/metering.package.yaml +++ b/manifests/deploy/generic/alm/metering.package.yaml @@ -1,5 +1,5 @@ -#! package-manifest: ../../catalog_resources/components/metering.0.7.0-latest.clusterserviceversion.yaml +#! package-manifest: ../../catalog_resources/components/metering.0.7.0.clusterserviceversion.yaml packageName: metering channels: -- currentCSV: metering-operator.v0.7.0-latest +- currentCSV: metering-operator.v0.7.0 name: alpha diff --git a/manifests/deploy/generic/alm/metering.subscription.yaml b/manifests/deploy/generic/alm/metering.subscription.yaml index 76e9fb2ae..18efd1166 100644 --- a/manifests/deploy/generic/alm/metering.subscription.yaml +++ b/manifests/deploy/generic/alm/metering.subscription.yaml @@ -1,7 +1,7 @@ apiVersion: app.coreos.com/v1alpha1 kind: Subscription-v1 metadata: - name: metering-operator.v0.7.0-latest + name: metering-operator.v0.7.0 spec: channel: alpha name: metering diff --git a/manifests/deploy/generic/helm-operator/metering-operator-deployment.yaml b/manifests/deploy/generic/helm-operator/metering-operator-deployment.yaml index a2ca6b953..dd897d9c0 100644 --- a/manifests/deploy/generic/helm-operator/metering-operator-deployment.yaml +++ b/manifests/deploy/generic/helm-operator/metering-operator-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsNonRoot: true containers: - name: metering-operator - image: "quay.io/coreos/metering-helm-operator:0.7.0-latest" + image: "quay.io/coreos/metering-helm-operator:0.7.0" args: ["run-operator.sh"] imagePullPolicy: Always env: @@ -54,7 +54,7 @@ spec: memory: "25Mi" cpu: "50m" - name: tiller - image: "quay.io/coreos/metering-helm-operator:0.7.0-latest" + image: "quay.io/coreos/metering-helm-operator:0.7.0" args: ["/tiller"] imagePullPolicy: Always env: diff --git a/manifests/deploy/openshift/alm/metering.0.7.0.clusterserviceversion.yaml b/manifests/deploy/openshift/alm/metering.0.7.0.clusterserviceversion.yaml new file mode 100644 index 000000000..e9de1e0e1 --- /dev/null +++ b/manifests/deploy/openshift/alm/metering.0.7.0.clusterserviceversion.yaml @@ -0,0 +1,322 @@ +#! validate-crd: ../../deploy/chart/templates/03-clusterserviceversion.crd.yaml +#! parse-kind: ClusterServiceVersion +apiVersion: app.coreos.com/v1alpha1 +kind: ClusterServiceVersion-v1 +metadata: + name: metering-operator.v0.7.0 + annotations: + tectonic-visibility: openshift-feature + labels: + alm-catalog: openshift-feature + operator-metering: "true" +spec: + displayName: Metering + description: Metering can generate reports based on historical usage data from a cluster, providing accountability for how resources have been used. + keywords: [metering metrics reporting coreos] + version: 0.7.0 + maturity: alpha + maintainers: + - email: support@coreos.com + name: CoreOS, Inc + provider: + name: CoreOS, Inc + labels: + alm-owner-metering: metering-operator + alm-status-descriptors: metering-operator.v0.7.0 + selector: + matchLabels: + alm-owner-metering: metering-operator + install: + strategy: deployment + spec: + permissions: + - rules: + - apiGroups: + - metering.openshift.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - "" + resources: + - pods + - pods/attach + - pods/exec + - pods/portforward + - pods/proxy + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - configmaps + - endpoints + - persistentvolumeclaims + - replicationcontrollers + - replicationcontrollers/scale + - secrets + - serviceaccounts + - services + - services/proxy + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - bindings + - events + - limitranges + - namespaces/status + - pods/log + - pods/status + - replicationcontrollers/status + - resourcequotas + - resourcequotas/status + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - update + - patch + - apiGroups: + - "" + resources: + - namespaces + verbs: + - get + - list + - watch + - apiGroups: + - apps + resources: + - deployments + - deployments/rollback + - deployments/scale + - statefulsets + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - batch + resources: + - cronjobs + - jobs + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - extensions + resources: + - daemonsets + - deployments + - deployments/rollback + - deployments/scale + - replicasets + - replicasets/scale + - replicationcontrollers/scale + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - rbac.authorization.k8s.io + resources: + - rolebindings + - roles + verbs: + - create + - delete + - deletecollection + - get + - list + - patch + - update + - watch + - apiGroups: + - route.openshift.io + resources: + - routes + verbs: + - create + - get + - list + - watch + - update + - delete + serviceAccountName: metering-operator + deployments: + - name: metering-operator + spec: + replicas: 1 + selector: + matchLabels: + app: metering-operator + strategy: + type: Recreate + template: + metadata: + labels: + app: metering-operator + spec: + containers: + - args: + - run-operator.sh + env: + - name: HELM_RELEASE_CRD_NAME + value: Metering + - name: HELM_RELEASE_CRD_API_GROUP + value: metering.openshift.io + - name: HELM_CHART_PATH + value: /openshift-metering-0.1.0.tgz + - name: MY_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: MY_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: HELM_HOST + value: 127.0.0.1:44134 + - name: HELM_WAIT + value: "false" + - name: HELM_RECONCILE_INTERVAL_SECONDS + value: "30" + - name: RELEASE_HISTORY_LIMIT + value: "3" + image: quay.io/coreos/metering-helm-operator:0.7.0 + imagePullPolicy: Always + name: metering-operator + resources: + limits: + cpu: 50m + memory: 25Mi + requests: + cpu: 50m + memory: 25Mi + - args: + - /tiller + env: + - name: TILLER_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: TILLER_HISTORY_MAX + value: "3" + image: quay.io/coreos/metering-helm-operator:0.7.0 + imagePullPolicy: Always + livenessProbe: + failureThreshold: 3 + httpGet: + path: /liveness + port: 44135 + scheme: HTTP + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + name: tiller + readinessProbe: + failureThreshold: 3 + httpGet: + path: /readiness + port: 44135 + scheme: HTTP + initialDelaySeconds: 1 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 1 + resources: + limits: + cpu: 50m + memory: 100Mi + requests: + cpu: 50m + memory: 50Mi + restartPolicy: Always + securityContext: + runAsNonRoot: true + serviceAccount: metering-operator + terminationGracePeriodSeconds: 30 + customresourcedefinitions: + owned: + - description: An instance of Metering + displayName: Metering + kind: Metering + name: meterings.metering.openshift.io + version: v1alpha1 + - description: A table within PrestoDB + displayName: Metering Presto Table + kind: PrestoTable + name: prestotables.metering.openshift.io + version: v1alpha1 + - description: A resource describing a source of data for usage by Report Generation + Queries + displayName: Metering data source + kind: ReportDataSource + name: reportdatasources.metering.openshift.io + version: v1alpha1 + - description: A SQL query used by Metering to generate reports + displayName: Metering generation query + kind: ReportGenerationQuery + name: reportgenerationqueries.metering.openshift.io + version: v1alpha1 + - description: A Prometheus query by Metering to do metering + displayName: Metering prometheus query + kind: ReportPrometheusQuery + name: reportprometheusqueries.metering.openshift.io + version: v1alpha1 + - description: A metering report for a specific time interval + displayName: Metering Report + kind: Report + name: reports.metering.openshift.io + version: v1alpha1 + - description: A metering report that runs on a scheduled interval + displayName: Metering Scheduled Report + kind: ScheduledReport + name: scheduledreports.metering.openshift.io + version: v1alpha1 + - description: Represents a configurable storage location for Metering to store metering + and report data + displayName: Metering storage location + kind: StorageLocation + name: storagelocations.metering.openshift.io + version: v1alpha1 diff --git a/manifests/deploy/openshift/alm/metering.package.yaml b/manifests/deploy/openshift/alm/metering.package.yaml index 55dfc549b..8873a22d3 100644 --- a/manifests/deploy/openshift/alm/metering.package.yaml +++ b/manifests/deploy/openshift/alm/metering.package.yaml @@ -1,5 +1,5 @@ -#! package-manifest: ../../catalog_resources/components/metering.0.7.0-latest.clusterserviceversion.yaml +#! package-manifest: ../../catalog_resources/components/metering.0.7.0.clusterserviceversion.yaml packageName: metering channels: -- currentCSV: metering-operator.v0.7.0-latest +- currentCSV: metering-operator.v0.7.0 name: alpha diff --git a/manifests/deploy/openshift/alm/metering.subscription.yaml b/manifests/deploy/openshift/alm/metering.subscription.yaml index 76e9fb2ae..18efd1166 100644 --- a/manifests/deploy/openshift/alm/metering.subscription.yaml +++ b/manifests/deploy/openshift/alm/metering.subscription.yaml @@ -1,7 +1,7 @@ apiVersion: app.coreos.com/v1alpha1 kind: Subscription-v1 metadata: - name: metering-operator.v0.7.0-latest + name: metering-operator.v0.7.0 spec: channel: alpha name: metering diff --git a/manifests/deploy/openshift/helm-operator/metering-operator-deployment.yaml b/manifests/deploy/openshift/helm-operator/metering-operator-deployment.yaml index e5e44bff0..479bf8105 100644 --- a/manifests/deploy/openshift/helm-operator/metering-operator-deployment.yaml +++ b/manifests/deploy/openshift/helm-operator/metering-operator-deployment.yaml @@ -20,7 +20,7 @@ spec: runAsNonRoot: true containers: - name: metering-operator - image: "quay.io/coreos/metering-helm-operator:0.7.0-latest" + image: "quay.io/coreos/metering-helm-operator:0.7.0" args: ["run-operator.sh"] imagePullPolicy: Always env: @@ -54,7 +54,7 @@ spec: memory: "25Mi" cpu: "50m" - name: tiller - image: "quay.io/coreos/metering-helm-operator:0.7.0-latest" + image: "quay.io/coreos/metering-helm-operator:0.7.0" args: ["/tiller"] imagePullPolicy: Always env: