Fix issue with domain name,project name and change imagetag for .zuul…

….yaml (#3) Fix issue with domain name,project name and change imagetag for .zuul.yaml Reviewed-by: Artem Lifshits Reviewed-by: Anton Sidelnikov
opentelekomcloud-infra · May 29, 2024 · 4676b9d · 4676b9d
1 parent 31ebc4f
commit 4676b9d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -10,7 +10,8 @@
           registry: quay.io
           repository: opentelekomcloud/vault-raft-backup
           tags:
-            &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '').split('.')[0], '.'.join(zuul.get('tag', '').split('.')[:2]), zuul.get('tag', '')], ['latest']) }}"
+            &imagetag "{{ zuul.tag is defined | ternary([zuul.get('tag', '')], ['latest']) }}"
+
 
 - job:
     name: vault-raft-backup-upload-image

diff --git a/README.md b/README.md
@@ -47,8 +47,8 @@ You can use flags, environment variables or config file to set the same values.
 | OS_ACCESS_KEY   | --os-access-key   | OTC Access Key for authentication | true     |                                        |
 | OS_SECRET_KEY   | --os-secret-key   | OTC Secret Key for authentication | true     |                                        |
 | OS_AUTH_URL     | --os-auth-url     | OTC Authentication URL            | false    | https://iam.eu-de.otc.t-systems.com/v3 |
-| OS_DOMAIN_NAME  | --os-domain-name  | OTC Domain name                   | false    | eu-de                                  |
-| OS_PROJECT_NAME | --os-project-name | OTC Project name                  | true     |                                        |
+| OS_DOMAIN_NAME  | --os-domain-name  | OTC Domain name                   | true     |                                        |
+| OS_PROJECT_NAME | --os-project-name | OTC Project name                  | false    | eu-de                                  |
 | VAULT_ADDRESS   | --vault-address   | Vault address                     | false    | https://127.0.0.1:8200                 |
 | VAULT_ROLE_ID   | --vault-role-id   | Vault AppRole role ID             | true     |                                        |
 | VAULT_SECRET_ID | --vault-secret-id | Vault AppRole secret ID           | true     |                                        |

diff --git a/cmd/root.go b/cmd/root.go
@@ -56,8 +56,8 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&accessKey, "os-access-key", "", "", "OTC Access Key for authentication (required)")
 	rootCmd.PersistentFlags().StringVarP(&secretKey, "os-secret-key", "", "", "OTC Secret Key for authentication (required)")
 	rootCmd.PersistentFlags().StringVarP(&authURL, "os-auth-url", "", "https://iam.eu-de.otc.t-systems.com/v3", "OTC Authentication URL")
-	rootCmd.PersistentFlags().StringVarP(&domainName, "os-domain-name", "", "eu-de", "OTC Domain name")
-	rootCmd.PersistentFlags().StringVarP(&projectName, "os-project-name", "", "", "OTC Project name (required)")
+	rootCmd.PersistentFlags().StringVarP(&domainName, "os-domain-name", "", "", "OTC Domain name (required)")
+	rootCmd.PersistentFlags().StringVarP(&projectName, "os-project-name", "", "eu-de", "OTC Project name")
 	rootCmd.PersistentFlags().StringVarP(&vaultAddr, "vault-address", "", "https://127.0.0.1:8200", "Vault address")
 	rootCmd.PersistentFlags().StringVarP(&vaultRoleID, "vault-role-id", "", "", "Vault AppRole role ID (required)")
 	rootCmd.PersistentFlags().StringVarP(&vaultSecretID, "vault-secret-id", "", "", "Vault AppRole secret ID (required)")