Skip to content

Commit 30f8fc2

Browse files
anovikov-elanovikov-el
authored
Merge pull request #34 from edenlabllc/release/v0.4.0
Release/v0.4.0
2 parents f8460c9 + 0d32dac commit 30f8fc2

14 files changed

+130
-39
lines changed

‎docs/release-notes.md

+22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
# Cluster Deps Release Notes
22

3+
## Release v0.4.0
4+
5+
## What's new
6+
- Added support for installing config extensions in `CAPI` management clusters.
7+
- Added custom identity name support for multiple cloud providers.
8+
- Added conditional `k3d-cluster` installation based on `RMK_COMMAND_CATEGORY` and `K3D_CLUSTER` environment variables.
9+
- Separated releases for different cloud providers using custom namespaces.
10+
- Introduced `Helmfile` hooks to clean up namespaces during provider release deletion.
11+
- Updated `GCP GKE` control plane version to `v1.30.10`.
12+
13+
## Bug fixes
14+
15+
## Additional information
16+
17+
### Mandatory updates for `project.yaml`
18+
19+
### List of updated releases
20+
21+
### List of added releases
22+
23+
---
24+
325
## Release v0.3.3
426

527
## What's new

‎etc/deps/develop/globals.yaml.gotmpl

+18-6
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ hooks:
4141
- '{{`{{ env "NAME" }}`}}'
4242
- "{{`{{ .Release.Namespace }}`}}"
4343
- "true"
44-
aws-iam-config:
45-
aws-iam-config-postsync-hook:
44+
aws-common-postuninstall-hook:
4645
events:
47-
- postsync
46+
- postuninstall
4847
showlogs: true
49-
command: "{{`{{ .Release.Labels.bin }}`}}/aws-iam-config-postsync-hook.sh"
48+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
5049
args:
51-
- '{{`{{ .Release.Name }}`}}'
5250
- "{{`{{ .Release.Namespace }}`}}"
5351
aws-iam-provision:
5452
aws-iam-provision-postsync-hook:
@@ -85,6 +83,13 @@ hooks:
8583
- '{{`{{ env "NAME" }}`}}'
8684
- "{{`{{ .Release.Namespace }}`}}"
8785
- "true"
86+
azure-common-postuninstall-hook:
87+
events:
88+
- postuninstall
89+
showlogs: true
90+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
91+
args:
92+
- "{{`{{ .Release.Namespace }}`}}"
8893
gcp-cluster:
8994
# TODO: The hook is needed for resolving the issue with empty kubernetesTaints values for GKE machines pools.
9095
# This temporary solution may be deprecated in the subsequent releases.
@@ -95,7 +100,7 @@ hooks:
95100
showlogs: true
96101
command: "{{`{{ .Release.Labels.bin }}`}}/gcp-cluster-presync-hook.sh"
97102
args:
98-
- "{{`{{ .Release.Namespace }}`}}"
103+
- capg-system
99104
- public.ecr.aws/edenlabllc/core.cluster-api-gcp-controller
100105
- v1.8.1
101106
gcp-cluster-postsync-hook:
@@ -123,3 +128,10 @@ hooks:
123128
- '{{`{{ env "NAME" }}`}}'
124129
- "{{`{{ .Release.Namespace }}`}}"
125130
- "true"
131+
gcp-common-postuninstall-hook:
132+
events:
133+
- postuninstall
134+
showlogs: true
135+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
136+
args:
137+
- "{{`{{ .Release.Namespace }}`}}"

‎etc/deps/develop/values/aws-cluster.yaml.gotmpl

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ controlPlane:
5959
sshKeyName: {{ env "NAME" }}
6060
version: v1.30.9 # ^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.?(\.0|[1-9][0-9]*)?$
6161

62+
## The cluster identity configurations
63+
identity:
64+
# ClusterIdentityName, name of "AWSClusterStaticIdentity" custom resource, required
65+
clusterIdentityName: {{ env "NAME" }}-identity
66+
6267
## The machine pools configurations
6368
machinePools:
6469
app:

‎etc/deps/develop/values/azure-cluster.yaml.gotmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## AKS cluster configuration
22
cluster:
33
## The resource group for the AKS cluster object
4-
resourceGroupName: {{ env "TENANT" }}
4+
resourceGroupName: {{ env "NAME" }}
55

66
## The resource group name for the nodes
7-
nodeResourceGroupName: "{{ env "TENANT" }}-machine-pools"
7+
nodeResourceGroupName: "{{ env "NAME" }}-machine-pools"
88

99
## The location of the cluster
1010
location: {{ env "AZURE_LOCATION" }}
@@ -37,7 +37,7 @@ controlPlane:
3737
## The cluster identity configurations
3838
identity:
3939
# ClusterIdentityName, name of "AzureClusterIdentity" custom resource, required
40-
clusterIdentityName: azure-cluster-identity
40+
clusterIdentityName: {{ env "NAME" }}-identity
4141

4242
machinePools:
4343
system:

‎etc/deps/develop/values/gcp-cluster.yaml.gotmpl

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ cluster:
1515
region: {{ $gcpRegion }}
1616
managed:
1717
spec:
18+
credentialsRef:
19+
# Name of the referent.
20+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
21+
name: {{ env "NAME" }}-identity-secret
22+
# Namespace of the referent.
23+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
24+
namespace: {{ .Release.Namespace }}
1825
# NetworkSpec encapsulates all things related to the GCP network.
1926
network:
2027
# Name is the name of the network to be used.
@@ -36,7 +43,7 @@ controlPlane:
3643
clusterNetwork:
3744
privateCluster:
3845
enablePrivateNodes: true
39-
version: v1.30.8
46+
version: v1.30.10
4047

4148
machinePools:
4249
app:

‎etc/deps/production/globals.yaml.gotmpl

+18-6
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ hooks:
4141
- '{{`{{ env "NAME" }}`}}'
4242
- "{{`{{ .Release.Namespace }}`}}"
4343
- "true"
44-
aws-iam-config:
45-
aws-iam-config-postsync-hook:
44+
aws-common-postuninstall-hook:
4645
events:
47-
- postsync
46+
- postuninstall
4847
showlogs: true
49-
command: "{{`{{ .Release.Labels.bin }}`}}/aws-iam-config-postsync-hook.sh"
48+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
5049
args:
51-
- '{{`{{ .Release.Name }}`}}'
5250
- "{{`{{ .Release.Namespace }}`}}"
5351
aws-iam-provision:
5452
aws-iam-provision-postsync-hook:
@@ -85,6 +83,13 @@ hooks:
8583
- '{{`{{ env "NAME" }}`}}'
8684
- "{{`{{ .Release.Namespace }}`}}"
8785
- "true"
86+
azure-common-postuninstall-hook:
87+
events:
88+
- postuninstall
89+
showlogs: true
90+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
91+
args:
92+
- "{{`{{ .Release.Namespace }}`}}"
8893
gcp-cluster:
8994
# TODO: The hook is needed for resolving the issue with empty kubernetesTaints values for GKE machines pools.
9095
# This temporary solution may be deprecated in the subsequent releases.
@@ -95,7 +100,7 @@ hooks:
95100
showlogs: true
96101
command: "{{`{{ .Release.Labels.bin }}`}}/gcp-cluster-presync-hook.sh"
97102
args:
98-
- "{{`{{ .Release.Namespace }}`}}"
103+
- capg-system
99104
- public.ecr.aws/edenlabllc/core.cluster-api-gcp-controller
100105
- v1.8.1
101106
gcp-cluster-postsync-hook:
@@ -123,3 +128,10 @@ hooks:
123128
- '{{`{{ env "NAME" }}`}}'
124129
- "{{`{{ .Release.Namespace }}`}}"
125130
- "true"
131+
gcp-common-postuninstall-hook:
132+
events:
133+
- postuninstall
134+
showlogs: true
135+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
136+
args:
137+
- "{{`{{ .Release.Namespace }}`}}"

‎etc/deps/production/values/aws-cluster.yaml.gotmpl

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ controlPlane:
5959
sshKeyName: {{ env "NAME" }}
6060
version: v1.30.9 # ^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.?(\.0|[1-9][0-9]*)?$
6161

62+
## The cluster identity configurations
63+
identity:
64+
# ClusterIdentityName, name of "AWSClusterStaticIdentity" custom resource, required
65+
clusterIdentityName: {{ env "NAME" }}-identity
66+
6267
## The machine pools configurations
6368
machinePools:
6469
app:

‎etc/deps/production/values/azure-cluster.yaml.gotmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## AKS cluster configuration
22
cluster:
33
## The resource group for the AKS cluster object
4-
resourceGroupName: {{ env "TENANT" }}
4+
resourceGroupName: {{ env "NAME" }}
55

66
## The resource group name for the nodes
7-
nodeResourceGroupName: "{{ env "TENANT" }}-machine-pools"
7+
nodeResourceGroupName: "{{ env "NAME" }}-machine-pools"
88

99
## The location of the cluster
1010
location: {{ env "AZURE_LOCATION" }}
@@ -37,7 +37,7 @@ controlPlane:
3737
## The cluster identity configurations
3838
identity:
3939
# ClusterIdentityName, name of "AzureClusterIdentity" custom resource, required
40-
clusterIdentityName: azure-cluster-identity
40+
clusterIdentityName: {{ env "NAME" }}-identity
4141

4242
machinePools:
4343
system:

‎etc/deps/production/values/gcp-cluster.yaml.gotmpl

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ cluster:
1515
region: {{ $gcpRegion }}
1616
managed:
1717
spec:
18+
credentialsRef:
19+
# Name of the referent.
20+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
21+
name: {{ env "NAME" }}-identity-secret
22+
# Namespace of the referent.
23+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
24+
namespace: {{ .Release.Namespace }}
1825
# NetworkSpec encapsulates all things related to the GCP network.
1926
network:
2027
# Name is the name of the network to be used.
@@ -36,7 +43,7 @@ controlPlane:
3643
clusterNetwork:
3744
privateCluster:
3845
enablePrivateNodes: true
39-
version: v1.30.8
46+
version: v1.30.10
4047

4148
machinePools:
4249
app:

‎etc/deps/staging/globals.yaml.gotmpl

+18-6
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,12 @@ hooks:
4141
- '{{`{{ env "NAME" }}`}}'
4242
- "{{`{{ .Release.Namespace }}`}}"
4343
- "true"
44-
aws-iam-config:
45-
aws-iam-config-postsync-hook:
44+
aws-common-postuninstall-hook:
4645
events:
47-
- postsync
46+
- postuninstall
4847
showlogs: true
49-
command: "{{`{{ .Release.Labels.bin }}`}}/aws-iam-config-postsync-hook.sh"
48+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
5049
args:
51-
- '{{`{{ .Release.Name }}`}}'
5250
- "{{`{{ .Release.Namespace }}`}}"
5351
aws-iam-provision:
5452
aws-iam-provision-postsync-hook:
@@ -85,6 +83,13 @@ hooks:
8583
- '{{`{{ env "NAME" }}`}}'
8684
- "{{`{{ .Release.Namespace }}`}}"
8785
- "true"
86+
azure-common-postuninstall-hook:
87+
events:
88+
- postuninstall
89+
showlogs: true
90+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
91+
args:
92+
- "{{`{{ .Release.Namespace }}`}}"
8893
gcp-cluster:
8994
# TODO: The hook is needed for resolving the issue with empty kubernetesTaints values for GKE machines pools.
9095
# This temporary solution may be deprecated in the subsequent releases.
@@ -95,7 +100,7 @@ hooks:
95100
showlogs: true
96101
command: "{{`{{ .Release.Labels.bin }}`}}/gcp-cluster-presync-hook.sh"
97102
args:
98-
- "{{`{{ .Release.Namespace }}`}}"
103+
- capg-system
99104
- public.ecr.aws/edenlabllc/core.cluster-api-gcp-controller
100105
- v1.8.1
101106
gcp-cluster-postsync-hook:
@@ -123,3 +128,10 @@ hooks:
123128
- '{{`{{ env "NAME" }}`}}'
124129
- "{{`{{ .Release.Namespace }}`}}"
125130
- "true"
131+
gcp-common-postuninstall-hook:
132+
events:
133+
- postuninstall
134+
showlogs: true
135+
command: "{{`{{ .Release.Labels.bin }}`}}/common-postuninstall-hook.sh"
136+
args:
137+
- "{{`{{ .Release.Namespace }}`}}"

‎etc/deps/staging/values/aws-cluster.yaml.gotmpl

+5
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,11 @@ controlPlane:
5959
sshKeyName: {{ env "NAME" }}
6060
version: v1.30.9 # ^v?(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.?(\.0|[1-9][0-9]*)?$
6161

62+
## The cluster identity configurations
63+
identity:
64+
# ClusterIdentityName, name of "AWSClusterStaticIdentity" custom resource, required
65+
clusterIdentityName: {{ env "NAME" }}-identity
66+
6267
## The machine pools configurations
6368
machinePools:
6469
app:

‎etc/deps/staging/values/azure-cluster.yaml.gotmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
## AKS cluster configuration
22
cluster:
33
## The resource group for the AKS cluster object
4-
resourceGroupName: {{ env "TENANT" }}
4+
resourceGroupName: {{ env "NAME" }}
55

66
## The resource group name for the nodes
7-
nodeResourceGroupName: "{{ env "TENANT" }}-machine-pools"
7+
nodeResourceGroupName: "{{ env "NAME" }}-machine-pools"
88

99
## The location of the cluster
1010
location: {{ env "AZURE_LOCATION" }}
@@ -37,7 +37,7 @@ controlPlane:
3737
## The cluster identity configurations
3838
identity:
3939
# ClusterIdentityName, name of "AzureClusterIdentity" custom resource, required
40-
clusterIdentityName: azure-cluster-identity
40+
clusterIdentityName: {{ env "NAME" }}-identity
4141

4242
machinePools:
4343
system:

‎etc/deps/staging/values/gcp-cluster.yaml.gotmpl

+8-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ cluster:
1515
region: {{ $gcpRegion }}
1616
managed:
1717
spec:
18+
credentialsRef:
19+
# Name of the referent.
20+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
21+
name: {{ env "NAME" }}-identity-secret
22+
# Namespace of the referent.
23+
# More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
24+
namespace: {{ .Release.Namespace }}
1825
# NetworkSpec encapsulates all things related to the GCP network.
1926
network:
2027
# Name is the name of the network to be used.
@@ -36,7 +43,7 @@ controlPlane:
3643
clusterNetwork:
3744
privateCluster:
3845
enablePrivateNodes: true
39-
version: v1.30.8
46+
version: v1.30.10
4047

4148
machinePools:
4249
app:

0 commit comments

Comments
 (0)