Skip to content

Commit 0d845b2

Browse files
authored
add deps for cluster api (#645)
1 parent 9bc9599 commit 0d845b2

File tree

7 files changed

+29
-11
lines changed

7 files changed

+29
-11
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
apiVersion: plural.sh/v1alpha1
2+
kind: Dependencies
3+
metadata:
4+
application: true
5+
description: installs the needed dependencies for cluster setup
6+
spec:
7+
dependencies:
8+
- type: terraform
9+
name: aws-bootstrap-cluster-api
10+
repo: bootstrap
11+
version: '>= 0.1.0'
12+
optional: true

bootstrap/helm/bootstrap-operator/templates/_helpers.tpl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ app.kubernetes.io/name: {{ include "bootstrap-operator.name" . }}-controller
5050
app.kubernetes.io/instance: {{ .Release.Name }}
5151
{{- end }}
5252

53-
{{/*
54-
Selector labels
55-
*/}}
56-
{{- define "bootstrap-operator.proxySelectorLabels" -}}
57-
app.kubernetes.io/name: {{ include "bootstrap-operator.name" . }}-proxy
58-
app.kubernetes.io/instance: {{ .Release.Name }}
59-
{{- end }}
6053

6154
{{/*
6255
Create the name of the service account to use

bootstrap/helm/bootstrap-operator/templates/bootstrap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ spec:
1616
managerImage: registry.k8s.io/capi-operator/cluster-api-operator:v0.1.0
1717
kubeRBACProxyImage: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0
1818
cloudSpec:
19-
{{ if .Values.operator.secret }}
19+
{{ if .Values.operator.cloud }}
2020
{{ toYaml .Values.operator.cloud | nindent 4 }}
2121
{{ end }}

bootstrap/helm/bootstrap-operator/templates/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: ServiceAccount
44
metadata:
55
name: {{ include "bootstrap-operator.serviceAccountName" . }}-controller
66
labels:
7-
{{- include "boostrap-operator.labels" . | nindent 4 }}
7+
{{- include "bootstrap-operator.labels" . | nindent 4 }}
88
{{- with .Values.serviceAccount.annotations }}
99
annotations:
1010
{{- toYaml . | nindent 4 }}

bootstrap/helm/bootstrap-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ affinity: {}
6464
operator:
6565
clusterName: ""
6666
secret: {}
67-
cloud: {}
67+
cloud: {}

bootstrap/helm/bootstrap-operator/values.yaml.tpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
operator:
22
clusterName: {{ .Cluster }}
3-
secret:
3+
secret: {}
4+
cloud: {}
45
{{ if eq .Provider "aws" }}
6+
secret:
57
AWS_ACCESS_KEY_ID: {{ .Context.AccessKey | b64enc | quote }}
68
AWS_SECRET_ACCESS_KEY: {{ .Context.SecretAccessKey | b64enc | quote }}
79
AWS_SESSION_TOKEN: {{ .Context.SessionToken | b64enc | quote }}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: plural.sh/v1alpha1
2+
kind: Dependencies
3+
metadata:
4+
description: Creates an EKS cluster and prepares it for bootstrapping
5+
version: 0.1.0
6+
spec:
7+
breaking: true
8+
dependencies: []
9+
providers:
10+
- aws
11+

0 commit comments

Comments
 (0)