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

Support center ram authentication and some optimize #92

Merged
merged 4 commits into from
Apr 13, 2020
Merged

Support center ram authentication and some optimize #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f18538f
support encrypted credential
BSWANG Mar 23, 2020
1339616
upgrade felix to 3.5.8
BSWANG Mar 27, 2020
49aa457
allocate ips on eni creating, make warming up effective
BSWANG Apr 1, 2020
05d0574
recycle completed|failed ips
BSWANG Apr 8, 2020
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
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ RUN cd plugin/terway && CGO_ENABLED=0 GOOS=linux go build -o terway .

FROM calico/go-build:v0.20 as felix-builder
RUN apk --no-cache add ip6tables tini ipset iputils iproute2 conntrack-tools file git
ENV GIT_BRANCH=v3.5.2
ENV GIT_COMMIT=1e59bb818c35b96e5de6e882fcb07510f81b50da
ENV GIT_BRANCH=v3.5.8
ENV GIT_COMMIT=7e12e362499ed281e5f5ca2747a0ba4e76e896b6
#ENV http_proxy=1.1.1.1:1080
#ENV https_proxy=1.1.1.1:1080
RUN mkdir -p /go/src/github.com/projectcalico/ && cd /go/src/github.com/projectcalico/ && \
Expand Down
4 changes: 2 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,9 @@ func (networkService *networkService) startGarbageCollectionLoop() {
podKeyMap := make(map[string]bool)

for _, pod := range pods {
podKeyMap[podInfoKey(pod.Namespace, pod.Name)] = true
if !pod.SandboxExited {
podKeyMap[podInfoKey(pod.Namespace, pod.Name)] = true
}
}

var (
Expand Down Expand Up @@ -582,7 +584,7 @@ func newNetworkService(configFilePath, kubeconfig, master, daemonMode string) (r
return nil, errors.Wrapf(err, "error get region-id")
}

ecs, err := aliyun.NewECS(config.AccessID, config.AccessSecret, regionID)
ecs, err := aliyun.NewECS(config.AccessID, config.AccessSecret, config.CredentialPath, regionID)
if err != nil {
return nil, errors.Wrapf(err, "error get aliyun client")
}
Expand Down
Loading