Even more work for B1

.github/workflows/ci.yaml

@@ -46,7 +46,7 @@ jobs:
       # Don't remove it! We shouldn't allow CI to pass if there are any changes not committed after running just
       - name: Just all autogeneration and fail on dirty
         run: |
-          just --timestamp gen docs
+          just --timestamp gen
           git status --short
           git diff --quiet
 

api/fabricator/v1beta1/fabricator_types.go

@@ -19,6 +19,7 @@ import (
 
 const (
 	ConditionApplied = "Applied"
+	ConditionReady   = "Ready"
 )
 
 type FabricatorSpec struct {
@@ -28,6 +29,7 @@ type FabricatorSpec struct {
 
 type FabricatorStatus struct {
 	IsBootstrap bool     `json:"isBootstrap,omitempty"`
+	IsInstall   bool     `json:"isInstall,omitempty"`
 	Versions    Versions `json:"versions,omitempty"`
 
 	// Time of the last attempt to apply configuration
@@ -44,9 +46,44 @@ type FabricatorStatus struct {
 	// Conditions of the fabricator, includes readiness marker for use with kubectl wait
 	Conditions []metav1.Condition `json:"conditions"`
 
+	Components ComponentsStatus `json:"components,omitempty"`
+
 	// TODO reserved VLANs, subnets, etc.
 }
 
+type ComponentStatus string
+
+const (
+	CompStatusUnknown  ComponentStatus = ""
+	CompStatusNotFound ComponentStatus = "NotFound"
+	CompStatusPending  ComponentStatus = "Pending"
+	CompStatusReady    ComponentStatus = "Ready"
+)
+
+type ComponentsStatus struct {
+	CertManagerCtrl    ComponentStatus `json:"certManagerCtrl,omitempty"`
+	CertManagerWebhook ComponentStatus `json:"certManagerWebhook,omitempty"`
+	Reloader           ComponentStatus `json:"reloader,omitempty"`
+	Zot                ComponentStatus `json:"zot,omitempty"`
+	NTP                ComponentStatus `json:"ntp,omitempty"`
+	FabricCtrl         ComponentStatus `json:"fabricCtrl,omitempty"`
+	FabricBoot         ComponentStatus `json:"fabricBoot,omitempty"`
+	FabricDHCP         ComponentStatus `json:"fabricDHCP,omitempty"`
+	FabricProxy        ComponentStatus `json:"fabricProxy,omitempty"`
+}
+
+func (c *ComponentsStatus) IsReady() bool {
+	return c.CertManagerCtrl == CompStatusReady &&
+		c.CertManagerWebhook == CompStatusReady &&
+		c.Reloader == CompStatusReady &&
+		c.Zot == CompStatusReady &&
+		c.NTP == CompStatusReady &&
+		c.FabricCtrl == CompStatusReady &&
+		c.FabricBoot == CompStatusReady &&
+		c.FabricDHCP == CompStatusReady &&
+		c.FabricProxy == CompStatusReady
+}
+
 type FabOverrides struct {
 	Versions Versions `json:"versions,omitempty"`
 }

cmd/hhfab/main.go

@@ -475,7 +475,7 @@ func Run(ctx context.Context) error {
 						Aliases: []string{"usb"},
 						Usage:   "use installer USB image for control node(s)",
 						EnvVars: []string{"HHFAB_CONTROL_USB"},
-						Value:   false,
+						Value:   true,
 					},
 				),
 				Before: before(false),
@@ -588,8 +588,8 @@ func Run(ctx context.Context) error {
 						Usage:  "ssh to a VLAB VM or HW if supported",
 						Flags:  append(defaultFlags, accessNameFlag),
 						Before: before(false),
-						Action: func(_ *cli.Context) error {
-							if err := hhfab.DoVLABSSH(ctx, workDir, cacheDir, accessName); err != nil {
+						Action: func(c *cli.Context) error {
+							if err := hhfab.DoVLABSSH(ctx, workDir, cacheDir, accessName, c.Args().Slice()); err != nil {
 								return fmt.Errorf("ssh: %w", err)
 							}
 
@@ -601,8 +601,8 @@ func Run(ctx context.Context) error {
 						Usage:  "get serial console of a VLAB VM or HW if supported",
 						Flags:  append(defaultFlags, accessNameFlag),
 						Before: before(false),
-						Action: func(_ *cli.Context) error {
-							if err := hhfab.DoVLABSerial(ctx, workDir, cacheDir, accessName); err != nil {
+						Action: func(c *cli.Context) error {
+							if err := hhfab.DoVLABSerial(ctx, workDir, cacheDir, accessName, c.Args().Slice()); err != nil {
 								return fmt.Errorf("serial: %w", err)
 							}
 
@@ -614,8 +614,8 @@ func Run(ctx context.Context) error {
 						Usage:  "get serial console log of a VLAB VM or HW if supported",
 						Flags:  append(defaultFlags, accessNameFlag),
 						Before: before(false),
-						Action: func(_ *cli.Context) error {
-							if err := hhfab.DoVLABSerialLog(ctx, workDir, cacheDir, accessName); err != nil {
+						Action: func(c *cli.Context) error {
+							if err := hhfab.DoVLABSerialLog(ctx, workDir, cacheDir, accessName, c.Args().Slice()); err != nil {
 								return fmt.Errorf("serial log: %w", err)
 							}
 
@@ -663,12 +663,17 @@ func Run(ctx context.Context) error {
 							&cli.StringSliceFlag{
 								Name:    "dns-servers",
 								Aliases: []string{"dns"},
-								Usage:   "DNS servers for VPCs",
+								Usage:   "DNS servers for VPCs advertised by DHCP",
 							},
 							&cli.StringSliceFlag{
 								Name:    "time-servers",
 								Aliases: []string{"ntp"},
-								Usage:   "Time servers for VPCs",
+								Usage:   "Time servers for VPCs advertised by DHCP",
+							},
+							&cli.UintFlag{
+								Name:    "interface-mtu",
+								Aliases: []string{"mtu"},
+								Usage:   "interface MTU for VPCs advertised by DHCP",
 							},
 						),
 						Before: before(false),
@@ -682,6 +687,7 @@ func Run(ctx context.Context) error {
 								SubnetsPerVPC:     c.Int("subnets-per-vpc"),
 								DNSServers:        c.StringSlice("dns-servers"),
 								TimeServers:       c.StringSlice("time-servers"),
+								InterfaceMTU:      uint16(c.Uint("interface-mtu")), //nolint:gosec
 							}); err != nil {
 								return fmt.Errorf("setup-vpcs: %w", err)
 							}

cmd/main.go

@@ -38,6 +38,8 @@ func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
 	utilruntime.Must(comp.HelmAPISchemeBuilder.AddToScheme(scheme))
+	utilruntime.Must(comp.CMApiSchemeBuilder.AddToScheme(scheme))
+	utilruntime.Must(comp.CMMetaSchemeBuilder.AddToScheme(scheme))
 
 	utilruntime.Must(fabapi.AddToScheme(scheme))
 	// +kubebuilder:scaffold:scheme

config/crd/bases/fabricator.githedgehog.com_fabricators.yaml

@@ -311,6 +311,27 @@ spec:
             type: object
           status:
             properties:
+              components:
+                properties:
+                  certManagerCtrl:
+                    type: string
+                  certManagerWebhook:
+                    type: string
+                  fabricBoot:
+                    type: string
+                  fabricCtrl:
+                    type: string
+                  fabricDHCP:
+                    type: string
+                  fabricProxy:
+                    type: string
+                  ntp:
+                    type: string
+                  reloader:
+                    type: string
+                  zot:
+                    type: string
+                type: object
               conditions:
                 description: Conditions of the fabricator, includes readiness marker
                   for use with kubectl wait
@@ -371,6 +392,8 @@ spec:
                 type: array
               isBootstrap:
                 type: boolean
+              isInstall:
+                type: boolean
               lastAppliedController:
                 description: Controller version that applied the last successful configuration
                 type: string

config/rbac/role.yaml

@@ -4,10 +4,42 @@ kind: ClusterRole
 metadata:
   name: manager-role
 rules:
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cert-manager.io
+  resources:
+  - certificates
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - cert-manager.io
+  resources:
+  - certificates/status
+  verbs:
+  - get
 - apiGroups:
   - ""
   resources:
   - configmaps
+  - secrets
+  - services
   verbs:
   - create
   - delete

docs/api.md

@@ -14,6 +14,49 @@ Package v1beta1 contains API Schema definitions for the fabricator v1beta1 API g
 
 
 
+#### ComponentStatus
+
+_Underlying type:_ _string_
+
+
+
+
+
+_Appears in:_
+- [ComponentsStatus](#componentsstatus)
+
+| Field | Description |
+| --- | --- |
+| `` |  |
+| `NotFound` |  |
+| `Pending` |  |
+| `Ready` |  |
+
+
+#### ComponentsStatus
+
+
+
+
+
+
+
+_Appears in:_
+- [FabricatorStatus](#fabricatorstatus)
+
+| Field | Description | Default | Validation |
+| --- | --- | --- | --- |
+| `certManagerCtrl` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `certManagerWebhook` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `reloader` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `zot` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `ntp` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `fabricCtrl` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `fabricBoot` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `fabricDHCP` _[ComponentStatus](#componentstatus)_ |  |  |  |
+| `fabricProxy` _[ComponentStatus](#componentstatus)_ |  |  |  |
+
+
 #### ControlConfig
 
 
@@ -338,13 +381,15 @@ _Appears in:_
 | Field | Description | Default | Validation |
 | --- | --- | --- | --- |
 | `isBootstrap` _boolean_ |  |  |  |
+| `isInstall` _boolean_ |  |  |  |
 | `versions` _[Versions](#versions)_ |  |  |  |
 | `lastAttemptTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#time-v1-meta)_ | Time of the last attempt to apply configuration |  |  |
 | `lastAttemptGen` _integer_ | Generation of the last attempt to apply configuration |  |  |
 | `lastAppliedTime` _[Time](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#time-v1-meta)_ | Time of the last successful configuration application |  |  |
 | `lastAppliedGen` _integer_ | Generation of the last successful configuration application |  |  |
 | `lastAppliedController` _string_ | Controller version that applied the last successful configuration |  |  |
 | `conditions` _[Condition](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.31/#condition-v1-meta) array_ | Conditions of the fabricator, includes readiness marker for use with kubectl wait |  |  |
+| `components` _[ComponentsStatus](#componentsstatus)_ |  |  |  |
 
 
 #### FabricatorVersions