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

Add ccm to projects #1522

Merged
merged 2 commits into from
Dec 8, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ REBUILD_ALL?=false

ALL_PROJECTS=containernetworking_plugins coredns_coredns etcd-io_etcd kubernetes-csi_external-attacher kubernetes-csi_external-resizer \
kubernetes-csi_livenessprobe kubernetes-csi_node-driver-registrar kubernetes-sigs_aws-iam-authenticator kubernetes-sigs_metrics-server \
kubernetes-csi_external-snapshotter kubernetes-csi_external-provisioner kubernetes_release kubernetes_kubernetes
kubernetes-csi_external-snapshotter kubernetes-csi_external-provisioner kubernetes_release kubernetes_kubernetes \
kubernetes_cloud-provider-aws

ifdef MAKECMDGOALS
TARGET=$(MAKECMDGOALS)
Expand Down
1 change: 1 addition & 0 deletions cmd/main_postsubmit.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ func main() {
allChanged := false
buildOrder := [...]string{
"kubernetes/release",
"kubernetes/cloud-provider-aws",
"kubernetes/kubernetes",
"containernetworking/plugins",
"coredns/coredns",
Expand Down
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cloud-provider-aws
1,504 changes: 1,504 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-21/ATTRIBUTION.txt

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-21/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
8aeb7e2ac3dfbe2ffc61f4ffe81897659bf2ad14a0a164b02f0d0e1e97b449d5 _output/1-21/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager
34386b1863303b8f58c56bdf6da5eccd11f897c6e289e9064bbfad31d2489d34 _output/1-21/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-21/GIT_TAG
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.21.5
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-21/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.18
1,267 changes: 1,267 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-22/ATTRIBUTION.txt

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-22/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
6e4f25d4ddb3b1d90af1e636ad2cb6ffa645f3041a11e5f2ce0fafc813cf33d7 _output/1-22/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager
606824adf559336024c2d5e6e24c36987edd745b6bcdcc5f31aa5f12a3f8302a _output/1-22/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-22/GIT_TAG
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.22.6
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-22/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.18
1,307 changes: 1,307 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-23/ATTRIBUTION.txt

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-23/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
461a064040e58d00d50c7ea2eef98460aee14f66f086a37b7fc8aff4f9a1916f _output/1-23/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager
f0df36a862a2180f26371f4b2fb8742d1d2631c10bd3203c37ea2298f8f814c8 _output/1-23/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-23/GIT_TAG
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.23.5
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-23/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.17
1,307 changes: 1,307 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-24/ATTRIBUTION.txt

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions projects/kubernetes/cloud-provider-aws/1-24/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
e46e1c39e960c60c56504b38a20b4772f46fec1f03cb2c337f70a9f74f0806b6 _output/1-24/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager
0824c514dc2df0b3b723372d0a849ff194f844dcffbdd29273f0797b6ce80391 _output/1-24/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-24/GIT_TAG
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v1.24.2
1 change: 1 addition & 0 deletions projects/kubernetes/cloud-provider-aws/1-24/GOLANG_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.19
54 changes: 54 additions & 0 deletions projects/kubernetes/cloud-provider-aws/Help.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@



########### DO NOT EDIT #############################
# To update call: make add-generated-help-block
# This is added to help document dynamic targets and support shell autocompletion


##@ GIT/Repo Targets
clone-repo: ## Clone upstream `cloud-provider-aws`
checkout-repo: ## Checkout upstream tag based on value in GIT_TAG file

##@ Binary Targets
binaries: ## Build all binaries: `aws-cloud-controller-manager` for `linux/amd64 linux/arm64`
_output/1-24/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager: ## Build `_output/1-24/bin/cloud-provider-aws/linux-amd64/aws-cloud-controller-manager`
_output/1-24/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager: ## Build `_output/1-24/bin/cloud-provider-aws/linux-arm64/aws-cloud-controller-manager`

##@ Image Targets
local-images: ## Builds `cloud-controller-manager/images/amd64` as oci tars for presumbit validation
images: ## Pushes `cloud-controller-manager/images/push` to IMAGE_REPO
cloud-controller-manager/images/amd64: ## Builds/pushes `cloud-controller-manager/images/amd64`
cloud-controller-manager/images/push: ## Builds/pushes `cloud-controller-manager/images/push`

##@ Checksum Targets
checksums: ## Update checksums file based on currently built binaries.
validate-checksums: # Validate checksums of currently built binaries against checksums file.

##@ License Targets
gather-licenses: ## Helper to call $(GATHER_LICENSES_TARGETS) which gathers all licenses
attribution: ## Generates attribution from licenses gathered during `gather-licenses`.
attribution-pr: ## Generates PR to update attribution files for projects

##@ Clean Targets
clean: ## Removes source and _output directory
clean-repo: ## Removes source directory

##@ Helpers
help: ## Display this help
add-generated-help-block: ## Add or update generated help block to document project make file and support shell auto completion

##@Update Helpers
run-target-in-docker: ## Run `MAKE_TARGET` using builder base docker container
update-attribution-checksums-docker: ## Update attribution and checksums using the builder base docker container
stop-docker-builder: ## Clean up builder base docker container
generate: ## Update UPSTREAM_PROJECTS.yaml
update-go-mods: ## Update locally checked-in go sum to assist in vuln scanning
update-vendor-for-dep-patch: ## After bumping dep in go.mod file, uses generic vendor update script or one provided from upstream project
patch-for-dep-update: ## After bumping dep in go.mod file and updating vendor, generates patch
create-ecr-repos: ## Create repos in ECR for project images for local testing

##@ Build Targets
build: ## Called via prow presubmit, calls `validate-checksums attribution local-images attribution-pr`
release: ## Called via prow postsubmit + release jobs, calls `validate-checksums images `
########### END GENERATED ###########################
32 changes: 32 additions & 0 deletions projects/kubernetes/cloud-provider-aws/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
BASE_DIRECTORY:=$(shell git rev-parse --show-toplevel)
GIT_TAG?=$(shell cat $(RELEASE_BRANCH)/GIT_TAG)
GOLANG_VERSION?=$(shell cat ./$(RELEASE_BRANCH)/GOLANG_VERSION)

REPO=cloud-provider-aws
REPO_OWNER=kubernetes

BINARY_TARGET_FILES=aws-cloud-controller-manager
SOURCE_PATTERNS=./cmd/aws-cloud-controller-manager

KUBE_BASE_GIT_TAG?=$(shell cat $(BASE_DIRECTORY)/projects/kubernetes/release/$(RELEASE_BRANCH)/GIT_TAG)
KUBE_BASE_TAG?=${KUBE_BASE_GIT_TAG}-eks-${RELEASE_BRANCH}-${RELEASE}
GO_RUNNER_IMAGE?=$(IMAGE_REPO)/kubernetes/go-runner:$(KUBE_BASE_TAG)
BASE_IMAGE=$(GO_RUNNER_IMAGE)

HAS_RELEASE_BRANCHES=true

EXTRA_GO_LDFLAGS=-X k8s.io/component-base/version.gitVersion=$(GIT_TAG)

IMAGE_NAMES=cloud-controller-manager

CLOUD_CONTROLLER_MANAGER_IMAGE_COMPONENT?=kubernetes/cloud-provider-aws/cloud-controller-manager

include $(BASE_DIRECTORY)/Common.mk


########### DO NOT EDIT #############################
# To update call: make add-generated-help-block
# This is added to help document dynamic targets and support shell autocompletion
# Run make help for a formatted help block with all targets
include Help.mk
########### END GENERATED ###########################
17 changes: 17 additions & 0 deletions projects/kubernetes/cloud-provider-aws/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
## **cloud-provider-aws**
| Release | Version |
|---------|--------------------------------------------------------------|
| 1-21 | ![Version](https://img.shields.io/badge/version-v1.21.5-blue) |
| 1-22 | ![Version](https://img.shields.io/badge/version-v1.22.6-blue) |
| 1-23 | ![Version](https://img.shields.io/badge/version-v1.23.5-blue) |
| 1-24 | ![Version](https://img.shields.io/badge/version-v1.24.2-blue) |

The AWS cloud provider provides the interface between a Kubernetes cluster and AWS service APIs. This project allows a Kubernetes cluster to provision, monitor and remove AWS resources necessary for operation of the cluster.

### Updating
1. Work with EKS teams to decide on a new version. Review tags and changelogs in upstream [repo](https://github.com/kubernetes/cloud-provider-aws) since there isn't always a corresponding release for a tag.
2. Update GIT_TAG file based on the version agreed upon with EKS.
3. Update GOLANG_VERSION file to be consistent with the upstream Dockerfile GOLANG_IMAGE arg at the chosen tag. Example [here](https://github.com/kubernetes/cloud-provider-aws/blob/master/Dockerfile#L17)
4. Run `make update-attribution-checksums-docker` in this folder.
5. Update CHECKSUMS as necessary (updated by default).
6. Update the version at the top of this Readme.
25 changes: 25 additions & 0 deletions projects/kubernetes/cloud-provider-aws/docker/linux/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

ARG BASE_IMAGE
FROM $BASE_IMAGE

ARG TARGETARCH
ARG TARGETOS
ARG RELEASE_BRANCH

COPY _output/$RELEASE_BRANCH/LICENSES /LICENSES
COPY $RELEASE_BRANCH/ATTRIBUTION.txt /ATTRIBUTION.txt
COPY _output/$RELEASE_BRANCH/bin/cloud-provider-aws/$TARGETOS-$TARGETARCH/aws-cloud-controller-manager /bin/cloud-controller-manager
ENTRYPOINT ["/bin/cloud-controller-manager"]