Skip to content

Commit

Permalink
Merge pull request #78 from sighupio/develop
Browse files Browse the repository at this point in the history
v4.1.0 to main
  • Loading branch information
nutellinoit authored Nov 23, 2023
2 parents ed35a32 + 65a4eb0 commit 378251b
Show file tree
Hide file tree
Showing 13 changed files with 69 additions and 21 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ The following packages are included in Kubernetes Fury AWS:

| Package | Version | Description |
| ------------------------------------------------------------------------------------- | ------------------------------- | ----------------------------------------------------------------------------------------------------------- |
| [cluster-autoscaler](katalog/cluster-autoscaler) | `v1.23.1,v1.24.0,1.25.0,1.26.4` | A component that automatically adjusts the size of a Kubernetes Cluster |
| [cluster-autoscaler](katalog/cluster-autoscaler) | `v1.24.0,v1.25.0,v1.26.4,v1.27.2` | A component that automatically adjusts the size of a Kubernetes Cluster |
| [IAM role for cluster-autoscaler](modules/iam-for-cluster-autoscaler) | `-` | Terraform module to manage IAM role used by cluster-autoscaler |
| [aws-node-termination-handler](katalog/node-termination-handler) | `v1.19.0` | Automatically manage graceful termination of pods in the event that one node is retired by AWS |
| [aws-load-balancer-controller](katalog/load-balancer-controller) | `v2.6.0` | AWS Load Balancer Controller is a controller to help manage Elastic Load Balancers for a Kubernetes cluster |
| [IAM role for aws-load-balancer-controller](modules/iam-for-load-balancer-controller) | `-` | Terraform module to manage IAM role used by aws-load-balancer-controller |
| [snapshot-controller](katalog/snapshot-controller) | `v6.2.1` | Snapshot controller to enable snapshotting of the Amazon EBS driver. |
| [snapshot-controller](katalog/snapshot-controller) | `v6.3.0` | Snapshot controller to enable snapshotting of the Amazon EBS driver. |
| [IAM role for aws-ebs-csi-driver](modules/iam-for-ebs-csi-driver) | `-` | Terraform module to manage IAM role used by EBS CSI driver |

Click on each package to see its full documentation.
Expand All @@ -37,9 +37,9 @@ Click on each package to see its full documentation.

| Kubernetes Version | Compatibility | Notes |
| ------------------ | :----------------: | --------------- |
| `1.24.x` | :white_check_mark: | No known issues |
| `1.25.x` | :white_check_mark: | No known issues |
| `1.26.x` | :white_check_mark: | No known issues |
| `1.27.x` | :white_check_mark: | No known issues |

Check the [compatibility matrix][compatibility-matrix] for additional informations about previous releases of the modules.

Expand All @@ -60,13 +60,13 @@ Check the [compatibility matrix][compatibility-matrix] for additional informatio
```yaml
bases:
- name: aws/cluster-autoscaler
version: "v4.0.0"
version: "v4.1.0"
- name: aws/node-termination-handler
version: "v4.0.0"
version: "v4.1.0"
- name: aws/load-balancer-controller
version: "v4.0.0"
version: "v4.1.0"
- name: aws/snapshot-controller
version: "v4.0.0"
version: "v4.1.0"
```
> See `furyctl` [documentation][furyctl-repo] for additional details about `Furyfile.yml` format.
Expand All @@ -79,7 +79,7 @@ bases:

```yaml
resources:
- ./vendor/katalog/aws/cluster-autoscaler/{v1.21.x,v1.22.x,v1.23.x,v1.24.x,v1.25.x}
- ./vendor/katalog/aws/cluster-autoscaler/{v1.24.x,v1.25.x,v1.26.x,v1.27.x}
- ./vendor/katalog/aws/node-termination-handler
- ./vendor/katalog/aws/load-balancer-controller
- ./vendor/katalog/aws/snapshot-controller
Expand Down
19 changes: 19 additions & 0 deletions docs/releases/v4.1.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# AWS Add-on Module Release 4.1.0

Welcome to the latest release of the `aws` module for the [`Kubernetes Fury Distribution`](https://github.com/sighupio/fury-distribution) maintained by team SIGHUP.

This is a minor release that updates the packages `cluster-autoscaler` and `snapshot-controller`.
This release adds also support for Kubernetes 1.27.

## Component Images 🚢

| Component | Supported Version | Previous Version |
| -------------------------- | ----------------------------------------------------------------------------------------------- | ---------------- |
| `cluster-austoscaler` | [`v1.27.2`](https://github.com/kubernetes/autoscaler/releases/tag/cluster-autoscaler-1.27.2) | `1.26.4` |
| `snapshot-controller` | [`v6.3.0`](https://github.com/kubernetes-csi/external-snapshotter/releases/tag/v6.3.0) | `v6.2.1` |
| `load-balancer-controller` | [`v2.6.0`](https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/tag/v2.6.0) | `No Update` |
| `node-termination-handler` | [`v1.19.0`](https://github.com/aws/aws-node-termination-handler/releases/tag/v1.19.0) | `No Update` |

> Please refer to the individual release notes to get detailed information on each release.
<!-- Links -->
4 changes: 2 additions & 2 deletions katalog/cluster-autoscaler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ A component that automatically adjusts the size of a Kubernetes Cluster so that

## Image repository and tag

- Cluster autoscaler image: `registry.sighup.io/autoscaling/cluster-autoscaler:v1.23.1,v1.24.0,1.25.0,1.26.4`
- Cluster autoscaler image: `registry.sighup.io/autoscaling/cluster-autoscaler:v1.24.0,v1.25.0,v1.26.4,v1.27.2`
- Cluster autoscaler repo: [Cluster autoscaler at Github][ca-github]

## Deployment
Expand All @@ -24,7 +24,7 @@ You can deploy cluster autoscaler in your EKS cluster by including the package i
...

resources:
- katalog/cluster-autoscaler/{v1.23.x,v1.24.x,1.25.x,1.26.x}
- katalog/cluster-autoscaler/{v1.24.x,v1.25.x,v1.26.x,v1.27.x}

...
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ resources:

images:
- name: registry.sighup.io/fury/autoscaling/cluster-autoscaler
newTag: v1.23.1
newTag: v1.27.2
2 changes: 1 addition & 1 deletion katalog/load-balancer-controller/MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

To maintain the AWS load balancer controller package, you should follow these steps.

Go to <https://kubernetes-sigs.github.io/aws-load-balancer-controller/v2.4/deploy/installation/> and follow the steps for
Go to <https://kubernetes-sigs.github.io/aws-load-balancer-controller/latest/deploy/installation/> and follow the steps for
the non-helm installation.

Get the yaml file, for example <https://github.com/kubernetes-sigs/aws-load-balancer-controller/releases/download/v2.4.7/v2_4_7_full.yaml>
Expand Down
2 changes: 1 addition & 1 deletion katalog/load-balancer-controller/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AWS Load Balancer Controller is a controller to help manage Elastic Load Balance

## Requirements

- Kubernetes >= `1.19.0`
- Kubernetes >= `1.22.0`
- Kustomize >= `v3.5.3`
- [cert-manager][cert-manager]

Expand Down
2 changes: 1 addition & 1 deletion katalog/load-balancer-controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ resources:
images:
- name: public.ecr.aws/eks/aws-load-balancer-controller # public.ecr.aws/eks/aws-load-balancer-controller:v2.4.7
newName: registry.sighup.io/fury/amazon/aws-alb-ingress-controller
newTag: v2.4.7
newTag: v2.6.0
21 changes: 15 additions & 6 deletions katalog/snapshot-controller/crds/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/665
controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: volumesnapshotclasses.snapshot.storage.k8s.io
spec:
Expand Down Expand Up @@ -154,8 +154,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/665
controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: volumesnapshotcontents.snapshot.storage.k8s.io
spec:
Expand Down Expand Up @@ -326,6 +326,7 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
x-kubernetes-map-type: atomic
required:
- deletionPolicy
- driver
Expand Down Expand Up @@ -393,6 +394,10 @@ spec:
that dynamic snapshot creation has either failed or it is still
in progress.
type: string
volumeGroupSnapshotContentName:
description: VolumeGroupSnapshotContentName is the name of the VolumeGroupSnapshotContent
of which this VolumeSnapshotContent is a part of.
type: string
type: object
required:
- spec
Expand Down Expand Up @@ -635,8 +640,8 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/665
controller-gen.kubebuilder.io/version: v0.8.0
api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
controller-gen.kubebuilder.io/version: v0.11.3
creationTimestamp: null
name: volumesnapshots.snapshot.storage.k8s.io
spec:
Expand Down Expand Up @@ -822,6 +827,10 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
type: string
x-kubernetes-int-or-string: true
volumeGroupSnapshotName:
description: VolumeGroupSnapshotName is the name of the VolumeGroupSnapshot
of which this VolumeSnapshot is a part of.
type: string
type: object
required:
- spec
Expand Down
2 changes: 1 addition & 1 deletion katalog/snapshot-controller/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ resources:
images:
- name: registry.k8s.io/sig-storage/snapshot-controller
newName: registry.sighup.io/fury/sig-storage/snapshot-controller
newTag: v6.2.1
newTag: v6.3.0
5 changes: 5 additions & 0 deletions modules/eks-addons/coredns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ resource "aws_eks_addon" "coredns" {
]
}
EOF
timeouts {
create = "60m"
update = "60m"
delete = "60m"
}
}

data "aws_eks_addon_version" "latest_coredns" {
Expand Down
5 changes: 5 additions & 0 deletions modules/eks-addons/ebs_csi_driver.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ resource "aws_eks_addon" "ebs_csi_driver" {
}
}
EOF
timeouts {
create = "60m"
update = "60m"
delete = "60m"
}
}

data "aws_eks_addon_version" "latest_ebs_csi_driver" {
Expand Down
5 changes: 5 additions & 0 deletions modules/eks-addons/kube_proxy.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ resource "aws_eks_addon" "kube_proxy" {
tags = var.tags
count = var.kube_proxy.enabled ? 1 : 0
configuration_values = var.kube_proxy.configuration_values
timeouts {
create = "60m"
update = "60m"
delete = "60m"
}
}

data "aws_eks_addon_version" "latest_kube_proxy" {
Expand Down
5 changes: 5 additions & 0 deletions modules/eks-addons/vpc_cni.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ resource "aws_eks_addon" "vpc_cni" {
tags = var.tags
count = var.vpc_cni.enabled ? 1 : 0
configuration_values = var.vpc_cni.configuration_values
timeouts {
create = "60m"
update = "60m"
delete = "60m"
}
}

data "aws_eks_addon_version" "latest_vpc_cni" {
Expand Down

0 comments on commit 378251b

Please sign in to comment.