Skip to content

Commit 26fff11

Browse files
authored
Merge pull request #144 from keithchong/7299-ThreeRolloutsTabs
Show a Rollout in Details page in Dev Console (#7299)
2 parents ec8f362 + 9686cc1 commit 26fff11

File tree

15 files changed

+626
-13
lines changed

15 files changed

+626
-13
lines changed

console-extensions.json

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,42 @@
265265
"required": ["APPLICATIONSET"]
266266
}
267267
},
268+
{
269+
"type": "console.model-metadata",
270+
"properties": {
271+
"model": {
272+
"group": "argoproj.io",
273+
"version": "v1alpha1",
274+
"kind": "AnalysisTemplate"
275+
},
276+
"badge": "dev",
277+
"color": "#E9654B",
278+
"label": "Analysis Template",
279+
"labelPlural": "Application Templates",
280+
"abbr": "AT"
281+
},
282+
"flags": {
283+
"required": ["ARGO_ROLLOUT"]
284+
}
285+
},
286+
{
287+
"type": "console.model-metadata",
288+
"properties": {
289+
"model": {
290+
"group": "argoproj.io",
291+
"version": "v1alpha1",
292+
"kind": "ClusterAnalysisTemplate"
293+
},
294+
"badge": "dev",
295+
"color": "#E9654B",
296+
"label": "Cluster Analysis Template",
297+
"labelPlural": "Cluster Application Templates",
298+
"abbr": "CAT"
299+
},
300+
"flags": {
301+
"required": ["ARGO_ROLLOUT"]
302+
}
303+
},
268304
{
269305
"type": "console.flag/model",
270306
"properties": {
@@ -383,6 +419,24 @@
383419
}
384420
}
385421
},
422+
{
423+
"type": "console.page/resource/details",
424+
"flags": {
425+
"required": [
426+
"ARGO_ROLLOUT"
427+
]
428+
},
429+
"properties": {
430+
"model": {
431+
"group": "argoproj.io",
432+
"kind": "Rollout",
433+
"version": "v1alpha1"
434+
},
435+
"component": {
436+
"$codeRef": "RolloutDetails"
437+
}
438+
}
439+
},
386440
{
387441
"type": "console.page/resource/list",
388442
"flags": {

locales/en/plugin__gitops-plugin.json

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Deploy Started At": "Deploy Started At",
115115
"Deployed At": "Deployed At",
116116
"Revision(s) and Source Repo URL(s)": "Revision(s) and Source Repo URL(s)",
117+
"ApplicationSet details": "ApplicationSet details",
117118
"Current health status of the ApplicationSet.": "Current health status of the ApplicationSet.",
118119
"Generated Apps": "Generated Apps",
119120
"Number of applications generated by this ApplicationSet.": "Number of applications generated by this ApplicationSet.",
@@ -136,21 +137,43 @@
136137
"Edit annotations": "Edit annotations",
137138
"Edit Rollout": "Edit Rollout",
138139
"Delete": "Delete",
140+
"Rollout details": "Rollout details",
141+
"Rollouts details": "Rollouts details",
142+
"Topology view": "Topology view",
143+
"Replicas": "Replicas",
144+
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
145+
"The current status of the rollout": "The current status of the rollout",
146+
"Strategy": "Strategy",
147+
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
148+
"Conditions": "Conditions",
139149
"No Argo Rollouts": "No Argo Rollouts",
140150
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
141151
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
142152
"Unable to load data": "Unable to load data",
143153
"There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
144-
"Rollouts": "Rollouts",
154+
"Argo Rollouts": "Argo Rollouts",
155+
"Rollouts": "Argo Rollouts",
145156
"Create Rollout": "Create Rollout",
146-
"Topology view": "Topology view",
147157
"Graph view": "Graph view",
148158
"Pods": "Pods",
149159
"Labels": "Labels",
150160
"Selector": "Selector",
151161
"Last Updated": "Last Updated",
152162
"No labels": "No labels",
153163
"Rollout Status": "Rollout Status",
164+
"Revisions": "Revisions",
165+
"Active Service": "Active Service",
166+
"The active blue-green service": "The active blue-green service",
167+
"Preview Service": "Preview Service",
168+
"The preview blue-green service": "The preview blue-green service",
169+
"ClusterAnalysis Template": "ClusterAnalysis Template",
170+
"Analysis Template": "Analysis Template",
171+
"Stable Service": "Stable Service",
172+
"The stable service": "The stable service",
173+
"Canary Service": "Canary Service",
174+
"The canary service": "The canary service",
175+
"Analysis Templates": "Analysis Templates",
176+
"The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
154177
"No matching Argo CD Applications": "No matching Argo CD Applications",
155178
"No Argo CD Applications": "No Argo CD Applications",
156179
"No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",

locales/ja/plugin__gitops-plugin.json

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Deploy Started At": "Deploy Started At",
115115
"Deployed At": "Deployed At",
116116
"Revision(s) and Source Repo URL(s)": "Revision(s) and Source Repo URL(s)",
117+
"ApplicationSet details": "ApplicationSet details",
117118
"Current health status of the ApplicationSet.": "Current health status of the ApplicationSet.",
118119
"Generated Apps": "Generated Apps",
119120
"Number of applications generated by this ApplicationSet.": "Number of applications generated by this ApplicationSet.",
@@ -136,21 +137,42 @@
136137
"Edit annotations": "Edit annotations",
137138
"Edit Rollout": "Edit Rollout",
138139
"Delete": "Delete",
140+
"Rollout details": "Rollout details",
141+
"Rollouts details": "Rollouts details",
142+
"Topology view": "Topology view",
143+
"Replicas": "Replicas",
144+
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
145+
"The current status of the rollout": "The current status of the rollout",
146+
"Strategy": "Strategy",
147+
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
148+
"Conditions": "Conditions",
139149
"No Argo Rollouts": "No Argo Rollouts",
140150
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
141151
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
142152
"Unable to load data": "Unable to load data",
143153
"There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
144-
"Rollouts": "Rollouts",
154+
"Argo Rollouts": "Argo Rollouts",
145155
"Create Rollout": "Create Rollout",
146-
"Topology view": "Topology view",
147156
"Graph view": "Graph view",
148157
"Pods": "Pods",
149158
"Labels": "Labels",
150159
"Selector": "Selector",
151160
"Last Updated": "Last Updated",
152161
"No labels": "No labels",
153162
"Rollout Status": "Rollout Status",
163+
"Revisions": "Revisions",
164+
"Active Service": "Active Service",
165+
"The active blue-green service": "The active blue-green service",
166+
"Preview Service": "Preview Service",
167+
"The preview blue-green service": "The preview blue-green service",
168+
"ClusterAnalysis Template": "ClusterAnalysis Template",
169+
"Analysis Template": "Analysis Template",
170+
"Stable Service": "Stable Service",
171+
"The stable service": "The stable service",
172+
"Canary Service": "Canary Service",
173+
"The canary service": "The canary service",
174+
"Analysis Templates": "Analysis Templates",
175+
"The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
154176
"No matching Argo CD Applications": "No matching Argo CD Applications",
155177
"No Argo CD Applications": "No Argo CD Applications",
156178
"No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",

locales/ko/plugin__gitops-plugin.json

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Deploy Started At": "Deploy Started At",
115115
"Deployed At": "Deployed At",
116116
"Revision(s) and Source Repo URL(s)": "Revision(s) and Source Repo URL(s)",
117+
"ApplicationSet details": "ApplicationSet details",
117118
"Current health status of the ApplicationSet.": "Current health status of the ApplicationSet.",
118119
"Generated Apps": "Generated Apps",
119120
"Number of applications generated by this ApplicationSet.": "Number of applications generated by this ApplicationSet.",
@@ -136,21 +137,42 @@
136137
"Edit annotations": "Edit annotations",
137138
"Edit Rollout": "Edit Rollout",
138139
"Delete": "Delete",
140+
"Rollout details": "Rollout details",
141+
"Rollouts details": "Rollouts details",
142+
"Topology view": "Topology view",
143+
"Replicas": "Replicas",
144+
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
145+
"The current status of the rollout": "The current status of the rollout",
146+
"Strategy": "Strategy",
147+
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
148+
"Conditions": "Conditions",
139149
"No Argo Rollouts": "No Argo Rollouts",
140150
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
141151
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
142152
"Unable to load data": "Unable to load data",
143153
"There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
144-
"Rollouts": "Rollouts",
154+
"Argo Rollouts": "Argo Rollouts",
145155
"Create Rollout": "Create Rollout",
146-
"Topology view": "Topology view",
147156
"Graph view": "Graph view",
148157
"Pods": "Pods",
149158
"Labels": "Labels",
150159
"Selector": "Selector",
151160
"Last Updated": "Last Updated",
152161
"No labels": "No labels",
153162
"Rollout Status": "Rollout Status",
163+
"Revisions": "Revisions",
164+
"Active Service": "Active Service",
165+
"The active blue-green service": "The active blue-green service",
166+
"Preview Service": "Preview Service",
167+
"The preview blue-green service": "The preview blue-green service",
168+
"ClusterAnalysis Template": "ClusterAnalysis Template",
169+
"Analysis Template": "Analysis Template",
170+
"Stable Service": "Stable Service",
171+
"The stable service": "The stable service",
172+
"Canary Service": "Canary Service",
173+
"The canary service": "The canary service",
174+
"Analysis Templates": "Analysis Templates",
175+
"The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
154176
"No matching Argo CD Applications": "No matching Argo CD Applications",
155177
"No Argo CD Applications": "No Argo CD Applications",
156178
"No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",

locales/zh/plugin__gitops-plugin.json

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
"Deploy Started At": "Deploy Started At",
115115
"Deployed At": "Deployed At",
116116
"Revision(s) and Source Repo URL(s)": "Revision(s) and Source Repo URL(s)",
117+
"ApplicationSet details": "ApplicationSet details",
117118
"Current health status of the ApplicationSet.": "Current health status of the ApplicationSet.",
118119
"Generated Apps": "Generated Apps",
119120
"Number of applications generated by this ApplicationSet.": "Number of applications generated by this ApplicationSet.",
@@ -136,21 +137,42 @@
136137
"Edit annotations": "Edit annotations",
137138
"Edit Rollout": "Edit Rollout",
138139
"Delete": "Delete",
140+
"Rollout details": "Rollout details",
141+
"Rollouts details": "Rollouts details",
142+
"Topology view": "Topology view",
143+
"Replicas": "Replicas",
144+
"The number of desired replicas for the rollout": "The number of desired replicas for the rollout",
145+
"The current status of the rollout": "The current status of the rollout",
146+
"Strategy": "Strategy",
147+
"Whether the rollout is using a blue-green or canary strategy": "Whether the rollout is using a blue-green or canary strategy",
148+
"Conditions": "Conditions",
139149
"No Argo Rollouts": "No Argo Rollouts",
140150
"There are no Argo Rollouts in this project.": "There are no Argo Rollouts in this project.",
141151
"There are no Argo Rollouts in all projects.": "There are no Argo Rollouts in all projects.",
142152
"Unable to load data": "Unable to load data",
143153
"There was an error retrieving applications. Check your connection and reload the page.": "There was an error retrieving applications. Check your connection and reload the page.",
144-
"Rollouts": "Rollouts",
154+
"Argo Rollouts": "Argo Rollouts",
145155
"Create Rollout": "Create Rollout",
146-
"Topology view": "Topology view",
147156
"Graph view": "Graph view",
148157
"Pods": "Pods",
149158
"Labels": "Labels",
150159
"Selector": "Selector",
151160
"Last Updated": "Last Updated",
152161
"No labels": "No labels",
153162
"Rollout Status": "Rollout Status",
163+
"Revisions": "Revisions",
164+
"Active Service": "Active Service",
165+
"The active blue-green service": "The active blue-green service",
166+
"Preview Service": "Preview Service",
167+
"The preview blue-green service": "The preview blue-green service",
168+
"ClusterAnalysis Template": "ClusterAnalysis Template",
169+
"Analysis Template": "Analysis Template",
170+
"Stable Service": "Stable Service",
171+
"The stable service": "The stable service",
172+
"Canary Service": "Canary Service",
173+
"The canary service": "The canary service",
174+
"Analysis Templates": "Analysis Templates",
175+
"The analysis and cluster-scoped analysis templates used for the canary strategy": "The analysis and cluster-scoped analysis templates used for the canary strategy",
154176
"No matching Argo CD Applications": "No matching Argo CD Applications",
155177
"No Argo CD Applications": "No Argo CD Applications",
156178
"No Argo CD Applications match the label filter": "No Argo CD Applications match the label filter",

plugin-metadata.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const metadata: ConsolePluginBuildMetadata = {
1616
ApplicationList: "./gitops/components/application/ApplicationListTab.tsx",
1717
ApplicationDetails: "./gitops/components/application/ApplicationNavPage.tsx",
1818
RolloutList: "./gitops/components/rollout/RolloutListTab.tsx",
19+
RolloutDetails: "./gitops/components/rollout/RolloutNavPage.tsx",
1920
ApplicationSetList: "./gitops/components/application/ApplicationSetListTab.tsx",
2021
ApplicationSetDetailsPage: "./gitops/components/appset/ApplicationSetDetailsPage.tsx",
2122
yamlTemplates: "./gitops/templates/index.ts"

src/components/topology/sidebar/DeploymentSideBarDetails.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ export const DeploymentSideBarDetails: React.FC<DeploymentSideBarDetailsProps> =
237237
expand={true}
238238
/>
239239
));
240-
const strategy = d.spec?.strategy?.blueGreen ? 'Blue Green' : 'Canary';
240+
const strategy = d.spec?.strategy?.blueGreen ? 'Blue-Green' : 'Canary';
241241
return (
242242
<>
243243
<div className="ocs-sidebar-tabsection">

src/gitops/components/appset/AppSetDetailsTab.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const AppSetDetailsTab: React.FC<AppSetDetailsTabProps> = ({ obj }) => {
5454
<>
5555
<PageSection>
5656
<Title headingLevel="h2" className="co-section-heading">
57-
Argo CD ApplicationSet details
57+
{t('ApplicationSet details')}
5858
</Title>
5959
<Flex
6060
justifyContent={{ default: 'justifyContentSpaceEvenly' }}

0 commit comments

Comments
 (0)