Merge pull request #3478 from dtaylor113/report-model-api-v1

Bug 1772694: default template for metering report for editor should use v1
openshift · Nov 23, 2019 · 42ba816 · 42ba816
2 parents 9d2692f + a5778ad
commit 42ba816
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/frontend/public/components/chargeback.tsx b/frontend/public/components/chargeback.tsx
@@ -8,7 +8,7 @@ import { FLAGS } from '../const';
 import { Conditions } from './conditions';
 import { DetailsPage, ListPage, Table, TableRow, TableData } from './factory';
 import { coFetchJSON } from '../co-fetch';
-import { ChargebackReportModel } from '../models';
+import { ChargebackReportModel, ReportQueryModel } from '../models';
 import { LoadError, LoadingInline, MsgBox } from './utils/status-box';
 import { GroupVersionKind, K8sResourceKind, modelFor, referenceForModel } from '../module/k8s';
 import {
@@ -27,8 +27,7 @@ import {
 
 export const ReportReference: GroupVersionKind = referenceForModel(ChargebackReportModel);
 export const ScheduledReportReference: GroupVersionKind = 'metering.openshift.io~ScheduledReport';
-export const ReportGenerationQueryReference: GroupVersionKind =
-  'metering.openshift.io~v1alpha1~ReportQuery';
+export const ReportGenerationQueryReference: GroupVersionKind = referenceForModel(ReportQueryModel);
 
 const reportPages = [
   { name: 'All Reports', href: ReportReference },

diff --git a/frontend/public/models/index.ts b/frontend/public/models/index.ts
@@ -44,7 +44,7 @@ export const ChargebackReportModel: K8sKind = {
   label: 'Report',
   labelPlural: 'Reports',
   apiGroup: 'metering.openshift.io',
-  apiVersion: 'v1alpha1',
+  apiVersion: 'v1',
   crd: true,
   plural: 'reports',
   abbr: 'R',
@@ -58,7 +58,7 @@ export const ReportQueryModel: K8sKind = {
   apiGroup: 'metering.openshift.io',
   apiVersion: 'v1',
   crd: true,
-  plural: 'report queries',
+  plural: 'reportqueries',
   abbr: 'RQ',
   namespaced: true,
 };

diff --git a/frontend/public/models/yaml-templates.ts b/frontend/public/models/yaml-templates.ts
@@ -194,7 +194,7 @@ spec:
   .setIn(
     [referenceForModel(k8sModels.ChargebackReportModel), 'default'],
     `
-apiVersion: metering.openshift.io/v1alpha1
+apiVersion: metering.openshift.io/v1
 kind: Report
 metadata:
   name: namespace-memory-request