Skip to content

Commit

Permalink
Fetch debug script from EKS AMI repo
Browse files Browse the repository at this point in the history
The aws-cni-support.sh has not been kept up to date. Replacing with
eks-log-collector.sh from awslabs/amazon-eks-ami

Issue: #803
  • Loading branch information
Claes Mogren committed Mar 23, 2020
1 parent 6977d72 commit aeeb94c
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 88 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,16 @@ portmap:
@echo
curl -L $(FETCH_URL) | tar -z -x ./portmap

debug-script: FETCH_URL=https://raw.githubusercontent.com/awslabs/amazon-eks-ami/master/log-collector-script/linux/eks-log-collector.sh
debug-script: VISIT_URL=https://github.com/awslabs/amazon-eks-ami/tree/master/log-collector-script/linux
debug-script:
@echo "Fetching debug script from awslabs/amazon-eks-ami"
@echo
@echo "Visit upstream project for debug script details:"
@echo "$(VISIT_URL)"
@echo
curl -L $(FETCH_URL) -o ./aws-cni-support.sh

# Run all source code checks.
check: check-format lint vet

Expand Down
5 changes: 2 additions & 3 deletions docs/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@ ipamd.log.2018-05-16-01 ipamd.log.2018-05-16-06 ipamd.log.2018-05-16-11 ipamd
### collecting node level tech-support bundle for offline troubleshooting

```
[root@ip-192-168-188-7 aws-routed-eni]# /opt/cni/bin/aws-cni-support.sh
[root@ip-192-168-188-7 aws-routed-eni]# /opt/cni/bin/aws-cni-support.sh
// download
/var/log/aws-routed-eni/aws-cni-support.tar.gz
/var/log/eks_i-01111ad54b6cfaa19_2020-03-11_0103-UTC_0.6.0.tar.gz
```

### ipamD debugging commands
Expand Down
83 changes: 0 additions & 83 deletions scripts/aws-cni-support.sh

This file was deleted.

4 changes: 2 additions & 2 deletions scripts/dockerfiles/Dockerfile.release
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ COPY go.mod go.sum ./
RUN go mod download

COPY Makefile ./
RUN make portmap
RUN make portmap && make debug-script

COPY . ./
RUN make build-linux
Expand All @@ -30,9 +30,9 @@ WORKDIR /app
COPY --from=builder /go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni \
/go/src/github.com/aws/amazon-vpc-cni-k8s/misc/10-aws.conflist \
/go/src/github.com/aws/amazon-vpc-cni-k8s/portmap \
/go/src/github.com/aws/amazon-vpc-cni-k8s/aws-cni-support.sh \
/go/src/github.com/aws/amazon-vpc-cni-k8s/aws-k8s-agent \
/go/src/github.com/aws/amazon-vpc-cni-k8s/grpc-health-probe \
/go/src/github.com/aws/amazon-vpc-cni-k8s/scripts/aws-cni-support.sh \
/go/src/github.com/aws/amazon-vpc-cni-k8s/scripts/entrypoint.sh /app/

ENTRYPOINT /app/entrypoint.sh

0 comments on commit aeeb94c

Please sign in to comment.