forked from zitadel/zitadel-charts
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from telia-oss/update-from-main
Update from main
- Loading branch information
Showing
8 changed files
with
138 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,32 @@ | ||
| package acceptance | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/zitadel/zitadel-go/v2/pkg/client/management" | ||
| "github.com/zitadel/zitadel-go/v2/pkg/client/middleware" | ||
| "github.com/zitadel/zitadel-go/v2/pkg/client/zitadel" | ||
| oidc_client "github.com/zitadel/oidc/v3/pkg/client" | ||
| "github.com/zitadel/zitadel-go/v3/pkg/client" | ||
| "github.com/zitadel/zitadel-go/v3/pkg/client/zitadel/management" | ||
| "github.com/zitadel/zitadel-go/v3/pkg/zitadel" | ||
| "strconv" | ||
| ) | ||
|
|
||
| func OpenGRPCConnection(cfg *ConfigurationTest, key []byte) (*management.Client, error) { | ||
| conn, err := management.NewClient( | ||
| cfg.APIBaseURL(), | ||
| fmt.Sprintf("%s:%d", cfg.Domain, cfg.Port), | ||
| []string{zitadel.ScopeZitadelAPI()}, | ||
| zitadel.WithJWTProfileTokenSource(middleware.JWTProfileFromFileData(key)), | ||
| zitadel.WithInsecure(), | ||
| ) | ||
| return conn, err | ||
| func OpenGRPCConnection(cfg *ConfigurationTest, key []byte) (management.ManagementServiceClient, error) { | ||
| var clientOptions []client.Option | ||
| if key != nil { | ||
| keyFile, err := oidc_client.ConfigFromKeyFileData(key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| clientOptions = append(clientOptions, client.WithAuth(client.JWTAuthentication(keyFile, client.ScopeZitadelAPI()))) | ||
| } | ||
| zitadelOptions := []zitadel.Option{ | ||
| zitadel.WithPort(cfg.Port), | ||
| zitadel.WithInsecureSkipVerifyTLS(), | ||
| } | ||
| if cfg.Scheme != "https" { | ||
| zitadelOptions = append(zitadelOptions, zitadel.WithInsecure(strconv.Itoa(int(cfg.Port)))) | ||
| } | ||
| c, err := client.New(cfg.Ctx, zitadel.New(cfg.Domain, zitadelOptions...), clientOptions...) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return c.ManagementService(), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,10 +24,10 @@ helm install my-zitadel zitadel/zitadel --values https://raw.githubusercontent.c | |
| When ZITADEL is ready, you can access the GUI via port-forwarding: | ||
|
|
||
| ```bash | ||
| kubectl port-forward svc/my-zitadel 8080 | ||
| kubectl port-forward svc/my-zitadel 8443:8080 | ||
| ``` | ||
|
|
||
| Now, open https://my-iam.127.0.0.1.sslip.io:8080 in your browser and log in with the following credentials: | ||
| Now, open https://my-iam.127.0.0.1.sslip.io:8443 in your browser and log in with the following credentials: | ||
|
|
||
| **Username**: [email protected] | ||
| **Password**: Password1! | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.