copy CNI plugin and config in entrypoint not agent #735
Conversation
jaypipes
force-pushed
the
rework-entrypoint
branch
from
3c060ec
to
60aefaf
Compare
| @@ -98,6 +98,10 @@ spec: | |||
| env: | |||
| - name: AWS_VPC_K8S_CNI_LOGLEVEL | |||
| value: DEBUG | |||
| - name: AWS_VPC_K8S_CNI_VETHPREFIX | |||
There was a problem hiding this comment.
IMO, I would like to move these variables into a configMap so that they persisted upon upgrades. May be a separate PR and add //To do here ?
|
LGTM! Thanks @jaypipes Between, what are your thoughts on adding |
For my thoughts on that, see https://github.com/aws/amazon-vpc-cni-k8s/pull/738/files :) Basically, I believe we should get rid of the async loading and just make the |
|
@jaypipes Yes, starting up synchronously sounds a lot cleaner to me. |
scripts/entrypoint.sh
Outdated
|
|
||
| # bring the aws-k8s-agent process back into the foreground | ||
| echo -n "foregrounding IPAM daemon ... " | ||
| fg %1 |
There was a problem hiding this comment.
Nit: Normally I would store the job ID when planning to move a background to to foreground again, but not really needed in this script.
Replaces the hard-coded copying of the CNI plugin binary and configuration file from the main.go of the aws-k8s-agent (the IPAMd daemon) into a new entrypoint.sh script that backgrounds the IPAM daemon, waits for it to listen on port 50051 and then proceeds to copy the CNI plugin binaries and configuration files into the well-known directory for Kubelet to see them as ready.
jaypipes
force-pushed
the
rework-entrypoint
branch
from
60aefaf
to
f14798c
Compare
Replaces the hard-coded copying of the CNI plugin binary and
configuration file from the main.go of the aws-k8s-agent (the IPAMd
daemon) into a new entrypoint.sh script that backgrounds the IPAM
daemon, waits for it to listen on port 50051 and then proceeds to copy
the CNI plugin binaries and configuration files into the well-known
directory for Kubelet to see them as ready.
Issue #706
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.