Skip to content

Commit fa67ff1

Browse files
committed
Rename 'domain' to 'domainID'
Signed-off-by: Dr. Jan-Philip Gehrcke <[email protected]>
1 parent 95db0d2 commit fa67ff1

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

cmd/compute-domain-kubelet-plugin/computedomain.go

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ type ComputeDomainManager struct {
5959
}
6060

6161
type ComputeDomainDaemonSettings struct {
62-
manager *ComputeDomainManager
63-
// CD UUID
64-
domain string
62+
manager *ComputeDomainManager
63+
domainID string
6564
rootDir string
6665
configTmplPath string
6766
nodesConfigPath string
@@ -129,13 +128,13 @@ func (m *ComputeDomainManager) Stop() error {
129128
return nil
130129
}
131130

132-
func (m *ComputeDomainManager) NewSettings(domain string) *ComputeDomainDaemonSettings {
131+
func (m *ComputeDomainManager) NewSettings(domainID string) *ComputeDomainDaemonSettings {
133132
return &ComputeDomainDaemonSettings{
134133
manager: m,
135-
domain: domain,
136-
rootDir: fmt.Sprintf("%s/%s", m.configFilesRoot, domain),
137-
configTmplPath: fmt.Sprintf("%s/%s/%s", m.configFilesRoot, domain, "config.tmpl.cfg"),
138-
nodesConfigPath: fmt.Sprintf("%s/%s/%s", m.configFilesRoot, domain, "nodes_config.cfg"),
134+
domainID: domainID,
135+
rootDir: fmt.Sprintf("%s/%s", m.configFilesRoot, domainID),
136+
configTmplPath: fmt.Sprintf("%s/%s/%s", m.configFilesRoot, domainID, "config.tmpl.cfg"),
137+
nodesConfigPath: fmt.Sprintf("%s/%s/%s", m.configFilesRoot, domainID, "nodes_config.cfg"),
139138
}
140139
}
141140

@@ -155,11 +154,13 @@ func (m *ComputeDomainManager) GetComputeDomainChannelContainerEdits(devRoot str
155154
}
156155
}
157156

158-
func (s *ComputeDomainDaemonSettings) GetDomain() string {
159-
return s.domain
160157
}
161158

162159
func (s *ComputeDomainDaemonSettings) GetCDIContainerEdits(ctx context.Context, devRoot string, info *nvcapDeviceInfo) (*cdiapi.ContainerEdits, error) {
160+
func (s *ComputeDomainDaemonSettings) GetDomainID() string {
161+
return s.domainID
162+
}
163+
163164
edits := &cdiapi.ContainerEdits{
164165
ContainerEdits: &cdispec.ContainerEdits{
165166
Mounts: []*cdispec.Mount{

0 commit comments

Comments
 (0)