From be1b1245b4ff55a8a872198f77f2cb37622f8a2b Mon Sep 17 00:00:00 2001 From: Acid Chicken Date: Wed, 22 May 2024 06:59:00 +0900 Subject: [PATCH] chore: namespace from arg --- charts/hariko/templates/Deployment.yaml | 7 +++++++ hariko/cmd/root.go | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/hariko/templates/Deployment.yaml b/charts/hariko/templates/Deployment.yaml index f1c999b..cbd9c11 100644 --- a/charts/hariko/templates/Deployment.yaml +++ b/charts/hariko/templates/Deployment.yaml @@ -27,6 +27,8 @@ spec: - "$(GITHUB_REPOSITORY)" - "-s" - "$(GITHUB_WEBHOOK_SECRET)" + - "-n" + - "$(NAMESPACE)" - "-p" - "$(PACKAGE_NAME)" - "-r" @@ -56,6 +58,11 @@ spec: secretKeyRef: name: hariko key: github-webhook-secret + - name: NAMESPACE + valueFrom: + secretKeyRef: + name: hariko + key: namespace - name: PACKAGE_NAME valueFrom: secretKeyRef: diff --git a/hariko/cmd/root.go b/hariko/cmd/root.go index 14f24ff..d788695 100644 --- a/hariko/cmd/root.go +++ b/hariko/cmd/root.go @@ -34,6 +34,7 @@ func newCmd() *cobra.Command { var githubJobName string var githubRepository string var githubWebhookSecret string + var namespace string var packageName string var repositoryName string var repositoryURL string @@ -43,6 +44,7 @@ func newCmd() *cobra.Command { Long: "Hariko watches the GitHub repository and automatically deploys the application to the server.", Args: cobra.NoArgs, RunE: func(cmd *cobra.Command, args []string) error { + settings.SetNamespace(namespace) hook, err := github.New(github.Options.Secret(githubWebhookSecret)) if err != nil { return err @@ -165,6 +167,7 @@ func newCmd() *cobra.Command { f.StringVarP(&githubJobName, "github-job-name", "j", "", "Job name") f.StringVarP(&githubRepository, "github-repository", "g", "", "Repository") f.StringVarP(&githubWebhookSecret, "github-webhook-secret", "s", "", "GitHub webhook secret") + f.StringVarP(&namespace, "namespace", "n", "", "Namespace") f.StringVarP(&packageName, "package-name", "p", "", "Package name") f.StringVarP(&repositoryName, "repository-name", "r", "", "Repository name") f.StringVarP(&repositoryURL, "repository-url", "u", "", "Repository URL") @@ -184,7 +187,6 @@ func Execute() { } func deploy(packageName string, repositoryName string, repositoryURL string, log io.Writer) (*release.Release, error) { - settings.SetNamespace("misskey") p := getter.All(settings) c := repo.Entry{ Name: repositoryName,