Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2.2-dev
v0.3.0
13 changes: 7 additions & 6 deletions internal/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@ import (
)

type BootstrapperConfig struct {
Component Component `json:"component"`
DeploymentRepository DeploymentRepository `json:"repository"`
Providers Providers `json:"providers"`
ImagePullSecrets []string `json:"imagePullSecrets"`
OpenMCPOperator OpenMCPOperator `json:"openmcpOperator"`
Environment string `json:"environment"`
Component Component `json:"component"`
DeploymentRepository DeploymentRepository `json:"repository"`
Providers Providers `json:"providers"`
ImagePullSecrets []string `json:"imagePullSecrets"`
OpenMCPOperator OpenMCPOperator `json:"openmcpOperator"`
Environment string `json:"environment"`
TemplateInput map[string]interface{} `json:"templateInput"`
}

type Component struct {
Expand Down
1 change: 1 addition & 0 deletions internal/deployment-repo/deploymentRepoManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ func (m *DeploymentRepoManager) ApplyTemplates(ctx context.Context) error {
"config": m.Config.OpenMCPOperator.ConfigParsed,
}

templateInput["user"] = m.Config.TemplateInput
templateInput["fluxCDEnvPath"] = "./" + EnvsDirectoryName + "/" + m.Config.Environment + "/" + FluxCDDirectoryName
templateInput["gitRepoEnvBranch"] = m.Config.DeploymentRepository.RepoBranch
templateInput["fluxCDResourcesPath"] = "../../../" + ResourcesDirectoryName + "/" + FluxCDDirectoryName
Expand Down
8 changes: 8 additions & 0 deletions internal/deployment-repo/deploymentRepoManager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,14 @@ func TestDeploymentRepoManager(t *testing.T) {
},
},
ImagePullSecrets: []string{"imgpull-a", "imgpull-b"},
TemplateInput: map[string]interface{}{
"additionalKey1": "additionalValue1",
"additionalKey2": "additionalValue2",
"myMap": map[string]interface{}{
"key1": "value1",
"key2": "value2",
},
},
}

bootstrapConfig.SetDefaults()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,17 @@ metadata:
name: test-configmap
namespace: default
data:
key: "value"
repository: "{{OCM_REPO_URL}}"
crossplaneComponentName: "github.com/openmcp-project/openmcp/releasechannel/crossplane"
crossplaneComponentVersion: "v0.0.1"
crossplaneImage: "ghcr.io/openmcp-project/releasechannel/crossplane"
crossplaneVersions: |
- v0.0.1
- v0.0.2
userProvided: |
additionalKey1: additionalValue1
additionalKey2: additionalValue2
myMap:
key1: value1
key2: value2
key: "value"
repository: "{{OCM_REPO_URL}}"
crossplaneComponentName: "github.com/openmcp-project/openmcp/releasechannel/crossplane"
crossplaneComponentVersion: "v0.0.1"
crossplaneImage: "ghcr.io/openmcp-project/releasechannel/crossplane"
crossplaneVersions: |
- v0.0.1
- v0.0.2
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ metadata:
name: test-configmap
namespace: default
data:
key: "value"
repository: "{{ getOCMRepository }}"
{{- $releaseChannelCv := getComponentVersionByReference "releasechannel" }}
{{- $crossplaneCv := getComponentVersionByReference $releaseChannelCv "crossplane" }}
{{- $crossplaneImageResource := getResourceFromComponentVersion $crossplaneCv "image-crossplane" }}
{{- $imageReference := dig "access" "imageReference" "none" $crossplaneImageResource }}
{{- $parsedImage := parseImage $imageReference }}
{{- $crossplaneCvMap := componentVersionAsMap $crossplaneCv }}
crossplaneComponentName: "{{ dig "component" "name" "none" $crossplaneCvMap }}"
crossplaneComponentVersion: "{{ dig "component" "version" "none" $crossplaneCvMap }}"
crossplaneImage: "{{ dig "image" "none" $parsedImage }}"
crossplaneVersions: |
{{- $crossplaneVersions := listComponentVersions $crossplaneCv }}
{{ toYaml (sortAlpha $crossplaneVersions) | indent 6 }}
userProvided: |
{{ toYaml .Values.user | indent 4 }}
key: "value"
repository: "{{ getOCMRepository }}"
{{- $releaseChannelCv := getComponentVersionByReference "releasechannel" }}
{{- $crossplaneCv := getComponentVersionByReference $releaseChannelCv "crossplane" }}
{{- $crossplaneImageResource := getResourceFromComponentVersion $crossplaneCv "image-crossplane" }}
{{- $imageReference := dig "access" "imageReference" "none" $crossplaneImageResource }}
{{- $parsedImage := parseImage $imageReference }}
{{- $crossplaneCvMap := componentVersionAsMap $crossplaneCv }}
crossplaneComponentName: "{{ dig "component" "name" "none" $crossplaneCvMap }}"
crossplaneComponentVersion: "{{ dig "component" "version" "none" $crossplaneCvMap }}"
crossplaneImage: "{{ dig "image" "none" $parsedImage }}"
crossplaneVersions: |
{{- $crossplaneVersions := listComponentVersions $crossplaneCv }}
{{ toYaml (sortAlpha $crossplaneVersions) | indent 4 }}