argoproj · zachaller · Mar 26, 2024 · Mar 26, 2024
diff --git a/pkg/apiclient/rollout/rollout.pb.go b/pkg/apiclient/rollout/rollout.pb.go
diff --git a/pkg/apiclient/rollout/rollout.proto b/pkg/apiclient/rollout/rollout.proto
@@ -96,6 +96,8 @@ message RolloutInfo {
   repeated ContainerInfo containers = 19;
 
   repeated gh.neting.cc.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.CanaryStep steps = 20;
+
+  repeated ContainerInfo initContainers = 21;
 }
 
 message ExperimentInfo {
@@ -125,6 +127,7 @@ message ReplicaSetInfo {
   repeated PodInfo pods = 14;
   bool ping = 15;
   bool pong = 16;
+  repeated string initContainerImages = 17;
 }
 
 message PodInfo {

diff --git a/pkg/apiclient/rollout/rollout.swagger.json b/pkg/apiclient/rollout/rollout.swagger.json
@@ -5990,6 +5990,12 @@
         },
         "pong": {
           "type": "boolean"
+        },
+        "initContainerImages": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         }
       }
     },
@@ -6097,6 +6103,12 @@
           "items": {
             "$ref": "#/definitions/gh.neting.cc.argoproj.argo_rollouts.pkg.apis.rollouts.v1alpha1.CanaryStep"
           }
+        },
+        "initContainers": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/rollout.ContainerInfo"
+          }
         }
       }
     },

diff --git a/pkg/kubectl-argo-rollouts/info/replicaset_info.go b/pkg/kubectl-argo-rollouts/info/replicaset_info.go
@@ -73,6 +73,11 @@ func GetReplicaSetInfo(ownerUID types.UID, ro *v1alpha1.Rollout, allReplicaSets
 		for _, ctr := range rs.Spec.Template.Spec.Containers {
 			rsInfo.Images = append(rsInfo.Images, ctr.Image)
 		}
+
+		for _, ctr := range rs.Spec.Template.Spec.InitContainers {
+			rsInfo.InitContainerImages = append(rsInfo.InitContainerImages, ctr.Image)
+		}
+
 		rsInfos = append(rsInfos, rsInfo)
 	}
 	sort.Slice(rsInfos[:], func(i, j int) bool {

diff --git a/pkg/kubectl-argo-rollouts/info/rollout_info.go b/pkg/kubectl-argo-rollouts/info/rollout_info.go
@@ -85,16 +85,23 @@ func NewRolloutInfo(
 	roInfo.Containers = []*rollout.ContainerInfo{}
 
 	var containerList []corev1.Container
+	var initContainerList []corev1.Container
 	if workloadRef != nil {
 		containerList = workloadRef.Spec.Template.Spec.Containers
+		initContainerList = workloadRef.Spec.Template.Spec.InitContainers
 	} else {
 		containerList = ro.Spec.Template.Spec.Containers
+		initContainerList = ro.Spec.Template.Spec.InitContainers
 	}
 
 	for _, c := range containerList {
 		roInfo.Containers = append(roInfo.Containers, &rollout.ContainerInfo{Name: c.Name, Image: c.Image})
 	}
 
+	for _, c := range initContainerList {
+		roInfo.InitContainers = append(roInfo.InitContainers, &rollout.ContainerInfo{Name: c.Name, Image: c.Image})
+	}
+
 	if ro.Status.RestartedAt != nil {
 		roInfo.RestartedAt = ro.Status.RestartedAt.String()
 	} else {

diff --git a/ui/src/app/components/rollout/containers.tsx b/ui/src/app/components/rollout/containers.tsx
@@ -9,14 +9,15 @@ import {faExclamationCircle, faPencilAlt, faSave, faTimes} from '@fortawesome/fr
 interface ContainersWidgetProps {
     containers: RolloutContainerInfo[];
     images: ImageInfo[];
+    name: string;
     interactive?: {
         editState: ReactStatePair;
         setImage: (container: string, image: string, tag: string) => void;
     };
 }
 
 export const ContainersWidget = (props: ContainersWidgetProps) => {
-    const {containers, images, interactive} = props;
+    const {containers, images, name, interactive} = props;
     const [editing, setEditing] = interactive?.editState || [null, null];
     const inputMap: {[key: string]: string} = {};
     for (const container of containers) {
@@ -29,7 +30,7 @@ export const ContainersWidget = (props: ContainersWidgetProps) => {
         <React.Fragment>
             <div style={{display: 'flex', alignItems: 'center', height: '2em'}}>
                 <div className='info__title' style={{marginBottom: '0'}}>
-                    Containers
+                    {name}
                 </div>
 
                 {interactive &&

diff --git a/ui/src/app/components/rollout/revision.tsx b/ui/src/app/components/rollout/revision.tsx
@@ -3,7 +3,7 @@ import * as moment from 'moment';
 import {RolloutAnalysisRunInfo, RolloutExperimentInfo, RolloutReplicaSetInfo} from '../../../models/rollout/generated';
 import {IconForTag} from '../../shared/utils/utils';
 import {ReplicaSets} from '../pods/pods';
-import {ImageInfo, parseImages} from './rollout';
+import {ImageInfo, parseImages, parseInitContainerImages} from './rollout';
 import './rollout.scss';
 import '../pods/pods.scss';
 import {ConfirmButton} from '../confirm-button/confirm-button';
@@ -61,6 +61,8 @@ export const RevisionWidget = ({current, initCollapsed, revision, rollback}: Rev
     const [collapsed, setCollapsed] = React.useState(initCollapsed);
     const icon = collapsed ? faChevronCircleDown : faChevronCircleUp;
     const images = parseImages(revision.replicaSets ?? []);
+    const initContainerImages = parseInitContainerImages(revision.replicaSets ?? []);
+    const combinedImages = images.concat(initContainerImages);
     const hasPods = (revision.replicaSets || []).some((rs) => rs.pods?.length > 0);
 
     return (
@@ -81,7 +83,7 @@ export const RevisionWidget = ({current, initCollapsed, revision, rollback}: Rev
                 </div>
             </div>
             <div className='revision__images'>
-                <ImageItems images={images} />
+                <ImageItems images={combinedImages} />
             </div>
 
             {!collapsed && (

diff --git a/ui/src/app/components/rollout/rollout.tsx b/ui/src/app/components/rollout/rollout.tsx
@@ -48,35 +48,23 @@ export const parseImages = (replicaSets: RolloutReplicaSetInfo[]): ImageInfo[] =
     const unknownImages: {[key: string]: boolean} = {};
     (replicaSets || []).forEach((rs) => {
         (rs.images || []).forEach((img) => {
-            const tags: ImageTag[] = [];
-
-            if (rs.canary) {
-                tags.push(ImageTag.Canary);
-            }
-            if (rs.stable) {
-                tags.push(ImageTag.Stable);
-            }
-            if (rs.active) {
-                tags.push(ImageTag.Active);
-            }
-            if (rs.preview) {
-                tags.push(ImageTag.Preview);
-            }
+            updateImageInfo(rs,img,images,unknownImages);
+        });
+    });
 
-            if (images[img]) {
-                images[img].tags = [...tags, ...images[img].tags];
-            } else {
-                images[img] = {
-                    image: img,
-                    tags: tags,
-                };
-            }
+    const imgArray = Object.values(images);
+    imgArray.sort((a, b) => {
+        return unknownImages[a.image] ? 1 : -1;
+    });
+    return imgArray;
+};
 
-            if (images[img].tags.length === 0) {
-                unknownImages[img] = true;
-            } else {
-                unknownImages[img] = false;
-            }
+export const parseInitContainerImages = (replicaSets: RolloutReplicaSetInfo[]): ImageInfo[] => {
+    const images: {[key: string]: ImageInfo} = {};
+    const unknownImages: {[key: string]: boolean} = {};
+    (replicaSets || []).forEach((rs) => {
+        (rs.initContainerImages || []).forEach((img) => {
+            updateImageInfo(rs,img,images,unknownImages);
         });
     });
 
@@ -87,15 +75,49 @@ export const parseImages = (replicaSets: RolloutReplicaSetInfo[]): ImageInfo[] =
     return imgArray;
 };
 
+const updateImageInfo = (rs: RolloutReplicaSetInfo,img: string ,images: {[key: string]: ImageInfo},unknownImages:{[key: string]: boolean}) => {
+    const tags: ImageTag[] = [];
+
+    if (rs.canary) {
+        tags.push(ImageTag.Canary);
+    }
+    if (rs.stable) {
+        tags.push(ImageTag.Stable);
+    }
+    if (rs.active) {
+        tags.push(ImageTag.Active);
+    }
+    if (rs.preview) {
+        tags.push(ImageTag.Preview);
+    }
+
+    if (images[img]) {
+        images[img].tags = [...tags, ...images[img].tags];
+    } else {
+        images[img] = {
+            image: img,
+            tags: tags,
+        };
+    }
+
+    if (images[img].tags.length === 0) {
+        unknownImages[img] = true;
+    } else {
+        unknownImages[img] = false;
+    }
+};
+
 export type ReactStatePair = [boolean, React.Dispatch<React.SetStateAction<boolean>>];
 
 export const RolloutWidget = (props: {rollout: RolloutRolloutInfo; interactive?: {editState: ReactStatePair; api: RolloutServiceApi; namespace: string}}) => {
     const {rollout, interactive} = props;
     const curStep = parseInt(rollout.step, 10) || (rollout.steps || []).length;
     const revisions = ProcessRevisions(rollout);
 
-    const images = parseImages(rollout?.replicaSets || []);
+    const initContainerEditState =  React.useState(false);
+    const initContainerImages = parseInitContainerImages(rollout?.replicaSets || []);
 
+    const images = parseImages(rollout?.replicaSets || []);
     for (const img of images) {
         for (const container of rollout.containers || []) {
             if (img.image === container.image) {
@@ -132,6 +154,7 @@ export const RolloutWidget = (props: {rollout: RolloutRolloutInfo; interactive?:
                     <div className='info rollout__info'>
                         <ContainersWidget
                             images={images}
+                            name='Containers'
                             containers={rollout.containers || []}
                             interactive={
                                 interactive
@@ -145,6 +168,23 @@ export const RolloutWidget = (props: {rollout: RolloutRolloutInfo; interactive?:
                             }
                         />
                     </div>
+                    {rollout.initContainers && <div className='info rollout__info'>
+                        <ContainersWidget
+                            images={initContainerImages}
+                            name='Init Containers'
+                            containers={rollout.initContainers || []}
+                            interactive={
+                                interactive
+                                    ? {
+                                          editState: initContainerEditState,
+                                          setImage: (container, image, tag) => {
+                                              interactive.api.rolloutServiceSetRolloutImage({}, interactive.namespace, rollout.objectMeta?.name, container, image, tag);
+                                          },
+                                      }
+                                    : null
+                            }
+                        />
+                    </div>}
                 </div>
 
                 <div className='rollout__row rollout__row--bottom'>

diff --git a/ui/src/models/rollout/generated/api.ts b/ui/src/models/rollout/generated/api.ts
@@ -7361,6 +7361,12 @@ export interface RolloutReplicaSetInfo {
      * @memberof RolloutReplicaSetInfo
      */
     pong?: boolean;
+    /**
+     * 
+     * @type {Array<string>}
+     * @memberof RolloutReplicaSetInfo
+     */
+    initContainerImages?: Array<string>;
 }
 /**
  * 
@@ -7526,6 +7532,12 @@ export interface RolloutRolloutInfo {
      * @memberof RolloutRolloutInfo
      */
     steps?: Array<GithubComArgoprojArgoRolloutsPkgApisRolloutsV1alpha1CanaryStep>;
+    /**
+     * 
+     * @type {Array<RolloutContainerInfo>}
+     * @memberof RolloutRolloutInfo
+     */
+    initContainers?: Array<RolloutContainerInfo>;
 }
 /**
  *