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.

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

Cherry pick of #6427 onto release-1.11 #6545

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -773,8 +773,14 @@ bazel-version-dist: bazel-crossbuild-nodeup bazel-crossbuild-kops bazel-protokub
bazel-upload: bazel-version-dist # Upload kops to S3
aws s3 sync --acl public-read ${BAZELUPLOAD}/ ${S3_BUCKET}

#-----------------------------------------------------------
# static html documentation
# prow-postsubmit is run by the prow postsubmit job
# It uploads a build to a staging directory, which in theory we can publish as a release
.PHONY: prow-postsubmit
prow-postsubmit: bazel-version-dist
${UPLOAD} ${BAZELUPLOAD}/kops/${VERSION}/ ${UPLOAD_DEST}/${KOPS_RELEASE_VERSION}-${GITSHA}/

#-----------------------------------------------------------
# static html documentation

.PHONY: live-docs
live-docs:
Expand All @@ -784,8 +790,9 @@ live-docs:
build-docs:
@docker run --rm -it -v ${PWD}:/docs aledbf/mkdocs:0.1 build

# Update machine_types.go
.PHONY: update-machine-types
update-machine-types: #Update machine_types.go
go build -o hack/machine_types/machine_types ${KOPS_ROOT}/hack/machine_types/machine_types.go ${KOPS_ROOT}/hack/machine_types/vpc_ip_resource_limit.go
update-machine-types:
go build -o hack/machine_types/machine_types ${KOPS_ROOT}/hack/machine_types/
hack/machine_types/machine_types --out upup/pkg/fi/cloudup/awsup/machine_types.go
go fmt upup/pkg/fi/cloudup/awsup/machine_types.go
2 changes: 2 additions & 0 deletions hack/machine_types/vpc_ip_resource_limit.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ var InstanceENIsAvailable = map[string]int{
"p3.2xlarge": 4,
"p3.8xlarge": 8,
"p3.16xlarge": 8,
"p3dn.24xlarge": 15,
"r3.large": 3,
"r3.xlarge": 4,
"r3.2xlarge": 4,
Expand Down Expand Up @@ -312,6 +313,7 @@ var InstanceIPsAvailable = map[string]int64{
"p3.2xlarge": 15,
"p3.8xlarge": 30,
"p3.16xlarge": 30,
"p3dn.24xlarge": 50,
"r3.large": 10,
"r3.xlarge": 15,
"r3.2xlarge": 15,
Expand Down