From cc9f16e5a46dd079ca48d1c0f2a45a9ca65d09d7 Mon Sep 17 00:00:00 2001 From: nicholasSSUSE Date: Wed, 24 Jul 2024 17:11:27 -0300 Subject: [PATCH 1/2] adding configurations for charts --- cmd/release/config/config.go | 42 ++++++++++++++++++++++-------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/cmd/release/config/config.go b/cmd/release/config/config.go index a87aec6e..53f54ded 100644 --- a/cmd/release/config/config.go +++ b/cmd/release/config/config.go @@ -52,6 +52,15 @@ type RKE2 struct { Versions []string `json:"versions"` } +// ChartsRelease +type ChartsRelease struct { + Workspace string `json:"workspace"` + ChartsRepoURL string `json:"charts_repo_url"` + ChartsForkURL string `json:"charts_fork_url"` + DevBranch string `json:"dev_branch"` + ReleaseBranch string `json:"release_branch"` +} + // User type User struct { Email string `json:"email"` @@ -85,11 +94,12 @@ type Auth struct { // Config type Config struct { - User *User `json:"user"` - K3s *K3s `json:"k3s"` - Rancher *Rancher `json:"rancher"` - RKE2 *RKE2 `json:"rke2"` - Auth *Auth `json:"auth"` + User *User `json:"user"` + K3s *K3s `json:"k3s"` + Rancher *Rancher `json:"rancher"` + RKE2 *RKE2 `json:"rke2"` + Charts *ChartsRelease `json:"charts"` + Auth *Auth `json:"auth"` } func DefaultConfigPath() (string, error) { @@ -242,17 +252,17 @@ User K3s {{ range $k3sVersion, $k3sValue := .K3s.Versions }} {{ $k3sVersion }}: - Old K8s Version: {{ $k3sValue.OldK8sVersion}} - New K8s Version: {{ $k3sValue.NewK8sVersion}} - Old K8s Client: {{ $k3sValue.OldK8sClient}} - New K8s Client: {{ $k3sValue.NewK8sClient}} - Old Suffix: {{ $k3sValue.OldSuffix}} - New Suffix: {{ $k3sValue.NewSuffix}} - Release Branch: {{ $k3sValue.ReleaseBranch}} - Dry Run: {{ $k3sValue.DryRun}} - K3s Repo Owner: {{ $k3sValue.K3sRepoOwner}} - K8s Rancher URL: {{ $k3sValue.K8sRancherURL}} - Workspace: {{ $k3sValue.Workspace}} + Old K8s Version: {{ $k3sValue.OldK8sVersion}} + New K8s Version: {{ $k3sValue.NewK8sVersion}} + Old K8s Client: {{ $k3sValue.OldK8sClient}} + New K8s Client: {{ $k3sValue.NewK8sClient}} + Old Suffix: {{ $k3sValue.OldSuffix}} + New Suffix: {{ $k3sValue.NewSuffix}} + Release Branch: {{ $k3sValue.ReleaseBranch}} + Dry Run: {{ $k3sValue.DryRun}} + K3s Repo Owner: {{ $k3sValue.K3sRepoOwner}} + K8s Rancher URL: {{ $k3sValue.K8sRancherURL}} + Workspace: {{ $k3sValue.Workspace}} K3s Upstream URL: {{ $k3sValue.K3sUpstreamURL}}{{ end }} Rancher {{ range $rancherVersion, $rancherValue := .Rancher.Versions }} From d57a46e48db2008326d62dd0fa89c49eb0228c23 Mon Sep 17 00:00:00 2001 From: nicholasSSUSE Date: Wed, 24 Jul 2024 17:12:40 -0300 Subject: [PATCH 2/2] adding example for release config charts --- cmd/release/config/config.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cmd/release/config/config.go b/cmd/release/config/config.go index 53f54ded..6f6c2cae 100644 --- a/cmd/release/config/config.go +++ b/cmd/release/config/config.go @@ -222,6 +222,13 @@ func exampleConfig() Config { }, }, }, + Charts: &ChartsRelease{ + Workspace: filepath.Join(gopath, "src", "github.com", "rancher", "charts"), + ChartsRepoURL: "https://github.com/rancher/charts", + ChartsForkURL: "", + DevBranch: "dev-v2.9", + ReleaseBranch: "release-v2.9", + }, Auth: &Auth{ Drone: &Drone{ K3sPR: "YOUR_TOKEN", @@ -275,4 +282,11 @@ Rancher {{ range $rancherVersion, $rancherValue := .Rancher.Versions }} RKE2{{ range .RKE2.Versions }} {{ . }}{{ end}} + +Charts + Workspace: {{.Charts.Workspace}} + ChartsRepoURL: {{.Charts.ChartsRepoURL}} + ChartsForkURL: {{.Charts.ChartsForkURL}} + DevBranch: {{.Charts.DevBranch}} + ReleaseBranch: {{.Charts.ReleaseBranch}} `