Skip to content

Commit a5cb2f0

Browse files
committed
remove implicit disk source
1 parent 5c2c319 commit a5cb2f0

File tree

4 files changed

+1
-22
lines changed

4 files changed

+1
-22
lines changed

neonvm-runner/cmd/main.go

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ func run(logger *zap.Logger) error {
248248
Secret: nil,
249249
Projected: nil,
250250
Tmpfs: nil,
251-
Implicit: nil,
252251
},
253252
})
254253
}
@@ -732,13 +731,7 @@ func monitorFiles(ctx context.Context, logger *zap.Logger, wg *sync.WaitGroup, v
732731
if disk.Watch != nil && *disk.Watch {
733732
// secrets/configmaps are mounted using the atomicwriter utility,
734733
// which loads the directory into `..data`.
735-
dataDir := fmt.Sprintf("%s/..data", disk.MountPath)
736-
737-
// when we mount the disk ourselves, it goes into /vm/mounts.
738-
// when the volumemount is implicit, it exists where it exists.
739-
if disk.DiskSource.Implicit == nil {
740-
dataDir = fmt.Sprintf("/vm/mounts%s", dataDir)
741-
}
734+
dataDir := fmt.Sprintf("/vm/mounts%s/..data", disk.MountPath)
742735

743736
secrets[dataDir] = disk.MountPath
744737
secretsOrd = append(secretsOrd, dataDir)

neonvm/apis/neonvm/v1/virtualmachine_types.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,10 +564,6 @@ type DiskSource struct {
564564
// TmpfsDisk represents a tmpfs.
565565
// +optional
566566
Tmpfs *TmpfsDiskSource `json:"tmpfs,omitempty"`
567-
// Implicit represents an implicit volume that will be automatically mounted.
568-
// Suitable for `aws-iam-token` or `azure-identity-token`, among other things.
569-
// +optional
570-
Implicit *ImplicitDiskSource `json:"implicit,omitempty"`
571567
}
572568

573569
type ImplicitDiskSource struct{}

neonvm/apis/neonvm/v1/zz_generated.deepcopy.go

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

neonvm/config/crd/bases/vm.neon.tech_virtualmachines.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,11 +1099,6 @@ spec:
10991099
required:
11001100
- size
11011101
type: object
1102-
implicit:
1103-
description: |-
1104-
Implicit represents an implicit volume that will be automatically mounted.
1105-
Suitable for `aws-iam-token` or `azure-identity-token`, among other things.
1106-
type: object
11071102
mountPath:
11081103
description: |-
11091104
Path within the virtual machine at which the disk should be mounted. Must

0 commit comments

Comments
 (0)