Skip to content

wire real plugin #2248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gangwgr wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −12
Draft

wire real plugin #2248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions test/library/encryption/kms/vault.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,18 @@ import (
)

const (
defaultVaultNamespace = "vault-kms"
defaultVaultPodName = "vault-0"
defaultVaultCredentialsSecret = "vault-credentials"
defaultVaultAppRoleSecretName = "vault-approle-secret"
defaultVaultKMSPluginImage = "quay.io/openshifttest/mock-kms-plugin@sha256:03bb07a2c08b509653c4c70217a06a4b389c10b4d87922f50ee5eac82db5e140"
Copy link
Copy Markdown
Member

@ardaguclu ardaguclu May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can keep this in new variable with the name defaultfakevaultkmspluginimage

Copy link
Copy Markdown
Contributor

@tjungblu tjungblu May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

still on my first coffee, but I think we should make this more visually distinct.

Like, FAKE_defaultVaultKMSPluginImage, hiding fake in between is a bit difficult to spot where we're using it. Just to make sure we don't mix it up.

Copy link
Copy Markdown
Member

@ardaguclu ardaguclu May 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, that works for me

defaultVaultAddress = "https://vault.vault-kms.svc:8200"
defaultVaultEnterpriseNS = "admin"
defaultVaultTransitMount = "transit"
defaultVaultTransitKey = "kms-key"
defaultAppRoleTargetNamespace = "openshift-config"
vaultCommandTimeout = 30 * time.Second
defaultVaultNamespace = "vault-kms"
defaultVaultPodName = "vault-0"
defaultVaultCredentialsSecret = "vault-credentials"
defaultVaultAppRoleSecretName = "vault-approle-secret"
defaultfakevaultkmspluginimage = "quay.io/openshifttest/mock-kms-plugin@sha256:03bb07a2c08b509653c4c70217a06a4b389c10b4d87922f50ee5eac82db5e140"
defaultVaultKMSPluginImage = "registry.ci.openshift.org/control-plane-custom-builds/vault-kube-kms@sha256:33599dd6eee61dcf9a60138759fafda3d88593a3c2072585156882c6b5bd3fa5"
defaultVaultAddress = "https://vault.vault-kms.svc:8200"
defaultVaultEnterpriseNS = "admin"
defaultVaultTransitMount = "transit"
defaultVaultTransitKey = "kms-key"
defaultAppRoleTargetNamespace = "openshift-config"
vaultCommandTimeout = 30 * time.Second
)

// DefaultVaultEncryptionProvider is a ready-to-use Vault KMS EncryptionProvider for e2e tests.
Expand Down Expand Up @@ -75,7 +76,7 @@ var DefaultFakeKMSPluginConfig = configv1.APIServerEncryption{
KMS: configv1.KMSPluginConfig{
Type: configv1.VaultKMSProvider,
Vault: configv1.VaultKMSPluginConfig{
KMSPluginImage: WellKnownUpstreamMockKMSPluginImage,
KMSPluginImage: defaultfakevaultkmspluginimage,
VaultAddress: "https://vault.example.com",
Authentication: configv1.VaultAuthentication{
Type: configv1.VaultAuthenticationTypeAppRole,
Expand Down