Skip to content

Commit 3c748e0

Browse files
authored
Merge pull request #139 from kubernetes/master
Merge master into release-1.19
2 parents 9e4879b + 9a026c6 commit 3c748e0

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ ARG GOPROXY
4141
WORKDIR /build
4242
COPY go.mod go.sum ./
4343
COPY cmd/ cmd/
44+
COPY pkg/ pkg/
4445
COPY Makefile ./Makefile
4546
ENV CGO_ENABLED=0
4647
ENV GOPROXY ${GOPROXY:-https://proxy.golang.org}

manifests/aws-cloud-controller-manager-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
serviceAccountName: cloud-controller-manager
2929
containers:
3030
- name: aws-cloud-controller-manager
31-
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.18.0-alpha.1
31+
image: gcr.io/k8s-staging-provider-aws/cloud-controller-manager:v1.19.1-alpha.1
3232
args:
3333
- --v=2
3434
- --cloud-provider=aws

0 commit comments

Comments
 (0)