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.

Sign up for GitHub

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

feat: add plugins using helmfile #124

Merged
merged 4 commits into from
Sep 21, 2023
Merged

feat: add plugins using helmfile #124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
183b24b
feat: Add plugins using helmfile
alessiodionisi Sep 12, 2023
85ebfbc
feat: add plugins to eks and format with 2 spaces
alessiodionisi Sep 12, 2023
0545a5a
feat: add kustomize namespace
alessiodionisi Sep 12, 2023
f98e1bf
feat: move plugins template to dedicated folder
alessiodionisi Sep 15, 2023
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
Prev Previous commit
Next Next commit
feat: add kustomize namespace
  • Loading branch information
@alessiodionisi
alessiodionisi committed Sep 21, 2023
commit 0545a5a888e51a5ce0027b2112ec653272796482
4,265 changes: 2,160 additions & 2,105 deletions pkg/apis/ekscluster/v1alpha2/private/schema.go
View file
Open in desktop

Large diffs are not rendered by default.

1,257 changes: 649 additions & 608 deletions pkg/apis/ekscluster/v1alpha2/public/schema.go
View file
Open in desktop

Large diffs are not rendered by default.

1,206 changes: 634 additions & 572 deletions pkg/apis/kfddistribution/v1alpha2/public/schema.go
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 33 additions & 4 deletions schemas/private/ekscluster-kfd-v1alpha2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,6 +2005,8 @@
"Spec.Plugins.Helm.Releases": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
Expand All @@ -2021,14 +2023,20 @@
"set": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
}
}
},
"required": [
"name",
"value"
]
}
},
"values": {
Expand All @@ -2037,33 +2045,54 @@
"type": "string"
}
}
}
},
"required": [
"name",
"namespace",
"chart"
]
}
},
"Spec.Plugins.Helm.Repositories": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"required": [
"name",
"url"
]
}
},
"Spec.Plugins.Kustomize": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"namespace": {
"type": "string"
},
"folder": {
"type": "string"
}
}
},
"required": [
"name",
"namespace",
"folder"
]
}
},
"Spec.ToolsConfiguration": {
Expand Down
23 changes: 19 additions & 4 deletions schemas/public/ekscluster-kfd-v1alpha2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,19 +1780,24 @@
"Spec.Plugins.Helm.Repositories": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"required": ["name", "url"]
}
},
"Spec.Plugins.Helm.Releases": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
Expand All @@ -1809,14 +1814,17 @@
"set": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
}
}
},
"required": ["name", "value"]
}
},
"values": {
Expand All @@ -1825,20 +1833,27 @@
"type": "string"
}
}
}
},
"required": ["name", "namespace", "chart"]
}
},
"Spec.Plugins.Kustomize": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"namespace": {
"type": "string"
},
"folder": {
"type": "string"
}
}
},
"required": ["name", "namespace", "folder"]
}
},

Expand Down
23 changes: 19 additions & 4 deletions schemas/public/kfddistribution-kfd-v1alpha2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,19 +244,24 @@
"Spec.Plugins.Helm.Repositories": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"url": {
"type": "string"
}
}
},
"required": ["name", "url"]
}
},
"Spec.Plugins.Helm.Releases": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
Expand All @@ -273,14 +278,17 @@
"set": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"value": {
"type": "string"
}
}
},
"required": ["name", "value"]
}
},
"values": {
Expand All @@ -289,20 +297,27 @@
"type": "string"
}
}
}
},
"required": ["name", "namespace", "chart"]
}
},
"Spec.Plugins.Kustomize": {
"type": "array",
"items": {
"type": "object",
"additionalProperties": false,
"properties": {
"name": {
"type": "string"
},
"namespace": {
"type": "string"
},
"folder": {
"type": "string"
}
}
},
"required": ["name", "namespace", "folder"]
}
},

Expand Down
1 change: 1 addition & 0 deletions templates/config/ekscluster-kfd-v1alpha2.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,4 +496,5 @@ spec:
# # Kustomize projects to be installed
# kustomize:
# - name: kustomize-project
# namespace: default
# folder: path/to/kustomize/project
1 change: 1 addition & 0 deletions templates/config/kfddistribution-kfd-v1alpha2.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,5 @@ spec:
# # Kustomize projects to be installed
# kustomize:
# - name: kustomize-project
# namespace: default
# folder: path/to/kustomize/project
1 change: 1 addition & 0 deletions templates/distribution/plugins/helmfile.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ releases:
{{- if .spec.plugins.kustomize -}}
{{ range .spec.plugins.kustomize }}
- name: {{ .name }}
namespace: {{ .namespace }}
chart: {{ .folder }}
{{- end -}}
{{- end -}}
Expand Down