Merge pull request #139 from kubernetes/master

Merge master into release-1.19
kubernetes · Oct 1, 2020 · 3c748e0 · 3c748e0
2 parents 9e4879b + 9a026c6
commit 3c748e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -41,6 +41,7 @@ ARG GOPROXY
 WORKDIR /build
 COPY go.mod go.sum ./
 COPY cmd/ cmd/
+COPY pkg/ pkg/
 COPY Makefile ./Makefile
 ENV CGO_ENABLED=0
 ENV GOPROXY ${GOPROXY:-https://proxy.golang.org}

diff --git a/manifests/aws-cloud-controller-manager-daemonset.yaml b/manifests/aws-cloud-controller-manager-daemonset.yaml
@@ -28,7 +28,7 @@ spec:
  serviceAccountName: cloud-controller-manager
  containers:
  - name: aws-cloud-controller-manager
- image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.18.0-alpha.1
+ image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.19.1-alpha.1
  args:
  - --v=2
  - --cloud-provider=aws