diff --git a/.gitignore b/.gitignore index 91759212..492ca11e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ Chart.lock # Vim swap files *.swp +*.tgz + *tas-env-variables* keys-cert ./keys-cert/*.pem @@ -12,4 +14,4 @@ keys-cert .idea tas-install -pull-secret.json \ No newline at end of file +pull-secret.json diff --git a/charts/trusted-artifact-signer/Chart.yaml b/charts/trusted-artifact-signer/Chart.yaml index cf0a43e2..5222e6b3 100644 --- a/charts/trusted-artifact-signer/Chart.yaml +++ b/charts/trusted-artifact-signer/Chart.yaml @@ -33,4 +33,4 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.28 +version: 0.1.29 diff --git a/charts/trusted-artifact-signer/README.md b/charts/trusted-artifact-signer/README.md index 0e07f57a..8e6e7af8 100644 --- a/charts/trusted-artifact-signer/README.md +++ b/charts/trusted-artifact-signer/README.md @@ -3,7 +3,7 @@ A Helm chart for deploying Sigstore scaffold chart that is opinionated for OpenShift -![Version: 0.1.28](https://img.shields.io/badge/Version-0.1.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.1.29](https://img.shields.io/badge/Version-0.1.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ## Overview diff --git a/tas-installer/cmd/install.go b/tas-installer/cmd/install.go index 082a1b4b..a209ec41 100644 --- a/tas-installer/cmd/install.go +++ b/tas-installer/cmd/install.go @@ -17,6 +17,7 @@ const ( ) var ( + helmChartURL string helmChartVersion string helmValuesFile string ) @@ -68,7 +69,7 @@ func installTas(tasNamespace string) error { }, func() error { log.Print("installing helm chart") - if err := install.HandleHelmChartInstall(kc, tasNamespace, tasReleaseName, helmValuesFile, helmChartVersion); err != nil { + if err := install.HandleHelmChartInstall(kc, tasNamespace, tasReleaseName, helmValuesFile, helmChartURL, helmChartVersion); err != nil { return err } return nil @@ -83,7 +84,8 @@ func installTas(tasNamespace string) error { } func init() { - installCmd.PersistentFlags().StringVar(&helmChartVersion, "chartVersion", "0.1.26", "Version of the Helm chart") + installCmd.PersistentFlags().StringVar(&helmChartVersion, "chartVersion", "0.1.29", "Version of the Helm chart") + installCmd.PersistentFlags().StringVar(&helmChartURL, "chartURL", "oci://quay.io/redhat-user-workloads/arewm-tenant/sigstore-ocp/trusted-artifact-signer", "Version of the Helm chart") installCmd.PersistentFlags().StringVar(&helmValuesFile, "valuesFile", "", "Custom values file for chart configuration") } diff --git a/tas-installer/internal/install/install.go b/tas-installer/internal/install/install.go index 5ad0c41b..b6f4f687 100644 --- a/tas-installer/internal/install/install.go +++ b/tas-installer/internal/install/install.go @@ -12,8 +12,8 @@ import ( "time" ) -func HandleHelmChartInstall(kc *kubernetes.KubernetesClient, tasNamespace, tasReleaseName, helmValuesFile, helmChartVersion string) error { - if err := helm.InstallTrustedArtifactSigner(kc, tasNamespace, tasReleaseName, helmValuesFile, helmChartVersion); err != nil { +func HandleHelmChartInstall(kc *kubernetes.KubernetesClient, tasNamespace, tasReleaseName, helmValuesFile, helmChartURL, helmChartVersion string) error { + if err := helm.InstallTrustedArtifactSigner(kc, tasNamespace, tasReleaseName, helmValuesFile, helmChartURL, helmChartVersion); err != nil { return err } return nil diff --git a/tas-installer/pkg/helm/helm.go b/tas-installer/pkg/helm/helm.go index 8e348087..9dc85341 100644 --- a/tas-installer/pkg/helm/helm.go +++ b/tas-installer/pkg/helm/helm.go @@ -36,9 +36,7 @@ func UninstallTrustedArtifactSigner(tasNamespace, tasReleaseName string) (*relea return action.NewUninstall(actionConfig).Run(tasReleaseName) } -func InstallTrustedArtifactSigner(kc *kubernetes.KubernetesClient, tasNamespace, tasReleaseName, pathToValuesFile, chartVersion string) error { - chartUrl := "oci://quay.io/redhat-user-workloads/arewm-tenant/sigstore-ocp/trusted-artifact-signer" - +func InstallTrustedArtifactSigner(kc *kubernetes.KubernetesClient, tasNamespace, tasReleaseName, pathToValuesFile, chartUrl, chartVersion string) error { tv := templatedValues{ OpenShiftAppsSubdomain: kc.ClusterCommonName, }