Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optimize yurttunnel server deployment and yurt app manager deployment… #435

Merged
merged 3 commits into from
Aug 27, 2021
Merged

optimize yurttunnel server deployment and yurt app manager deployment… #435

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c893cc
optimize yurttunnel server deployment and yurt app manager deployment…
JameKeal Aug 26, 2021
3eb39be
Add a new parameter for yurtctl to control the system architecture
JameKeal Aug 26, 2021
6f0eb44
help information describe more correct
JameKeal Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkg/yurtctl/cmd/convert/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,18 @@ package convert
import (
"context"
"fmt"
"runtime"
"strings"
"time"

"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/openyurtio/openyurt/pkg/projectinfo"
"github.com/openyurtio/openyurt/pkg/yurtctl/constants"
"github.com/openyurtio/openyurt/pkg/yurtctl/lock"
kubeutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/kubernetes"
strutil "github.com/openyurtio/openyurt/pkg/yurtctl/util/strings"
"github.com/spf13/cobra"
"github.com/spf13/pflag"

v1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down Expand Up @@ -483,6 +485,7 @@ func deployYurtAppManager(
constants.YurtAppManagerDeployment,
map[string]string{
"image": yurtappmanagerImage,
"arch": runtime.GOARCH,
rambohe-ch marked this conversation as resolved.
Show resolved Hide resolved
"edgeWorkerLabel": projectinfo.GetEdgeWorkerLabelKey()}); err != nil {
return err
}
Expand Down Expand Up @@ -549,6 +552,7 @@ func deployYurttunnelServer(
constants.YurttunnelServerDeployment,
map[string]string{
"image": yurttunnelServerImage,
"arch": runtime.GOARCH,
"edgeWorkerLabel": projectinfo.GetEdgeWorkerLabelKey()}); err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/yurtctl/constants/yurt-app-manager-tmpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ spec:
readOnly: true
nodeSelector:
openyurt.io/is-edge-worker: "false"
beta.kubernetes.io/arch: amd64
beta.kubernetes.io/arch: {{.arch}}
beta.kubernetes.io/os: linux
priorityClassName: system-node-critical
terminationGracePeriodSeconds: 10
Expand Down
2 changes: 1 addition & 1 deletion pkg/yurtctl/constants/yurt-tunnel-server-tmpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ spec:
tolerations:
- operator: "Exists"
nodeSelector:
beta.kubernetes.io/arch: amd64
beta.kubernetes.io/arch: {{.arch}}
beta.kubernetes.io/os: linux
{{.edgeWorkerLabel}}: "false"
containers:
Expand Down