Skip to content

Commit 8b968ec

Browse files
authored
Merge pull request #1535 from lec-bit/bugfix
fix kernel-native enhanced mode build failed
2 parents f9c7ddf + ec655e7 commit 8b968ec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

hack/gen_bpf_specs.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ func main() {
167167
importPath := filepath.ToSlash(filepath.Join(modulePrefix, "bpf", "kmesh", "bpf2go", real))
168168
pi := pkgInfo{Alias: alias, ImportPath: importPath, OutputDir: real, Entries: list}
169169
pkgsDefault = append(pkgsDefault, pi)
170-
pkgsEnhanced = append(pkgsEnhanced, pi)
170+
if !strings.HasPrefix(real, "dualengine") {
171+
pkgsEnhanced = append(pkgsEnhanced, pi)
172+
}
171173
}
172174
}
173175
}

pkg/bpf/restart/new_version_mapspec_loader_enhanced.go

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

pkg/controller/controller.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,13 @@ func (c *Controller) Start(stopCh <-chan struct{}) error {
168168
if err := c.client.WorkloadController.Run(ctx, stopCh); err != nil {
169169
return fmt.Errorf("failed to start workload controller: %+v", err)
170170
}
171+
if err := c.setupDNSProxy(); err != nil {
172+
return fmt.Errorf("failed to start dns proxy: %+v", err)
173+
}
171174
} else {
172175
c.client.AdsController.StartDnsController(stopCh)
173176
}
174177

175-
if err := c.setupDNSProxy(); err != nil {
176-
return fmt.Errorf("failed to start dns proxy: %+v", err)
177-
}
178-
179178
return c.client.Run(stopCh)
180179
}
181180

0 commit comments

Comments
 (0)