Skip to content

Cleanup dockerRegistry status when buildless enabled (#2116) #2119

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

Merged
MichalKalke merged 1 commit into from
Dec 11, 2025
Merged

Cleanup dockerRegistry status when buildless enabled (#2116) #2119

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions components/operator/controllers/serverless_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,6 @@ func shouldCreateServerless(h testHelper, serverlessName, serverlessDeploymentNa
}

func shouldPropagateSpecProperties(h testHelper, expected serverlessData) {
Eventually(h.createCheckRegistrySecretFunc(serverlessRegistrySecret, expected.registrySecretData)).
WithPolling(time.Second * 2).
WithTimeout(time.Second * 10).
Should(BeTrue())

Eventually(h.createCheckOptionalDependenciesFunc(serverlessDeploymentName, expected)).
WithPolling(time.Second * 2).
WithTimeout(time.Second * 10).
Expand Down
42 changes: 0 additions & 42 deletions components/operator/controllers/testhelper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,25 +306,6 @@ func (d *registrySecretData) toMap() map[string]string {
return result
}

func (h *testHelper) createCheckRegistrySecretFunc(serverlessRegistrySecret string, expected registrySecretData) func() (bool, error) {
return func() (bool, error) {
var configurationSecret corev1.Secret

if ok, err := h.getKubernetesObjectFunc(
serverlessRegistrySecret, &configurationSecret); !ok || err != nil {
return ok, err
}
if err := secretContainsSameValues(
expected.toMap(), configurationSecret); err != nil {
return false, err
}
if err := secretContainsRequired(configurationSecret); err != nil {
return false, err
}
return true, nil
}
}

func (h *testHelper) createCheckOptionalDependenciesFunc(deploymentName string, expected serverlessData) func() (bool, error) {
return func() (bool, error) {
var deploy appsv1.Deployment
Expand Down Expand Up @@ -369,26 +350,3 @@ func deploymentContainsEnv(deployment appsv1.Deployment, name, value string) err

return fmt.Errorf("env %s does not exist", name)
}

func secretContainsRequired(configurationSecret corev1.Secret) error {
for _, k := range []string{"username", "password", "registryAddress", "serverAddress"} {
_, ok := configurationSecret.Data[k]
if !ok {
return fmt.Errorf("values not propagated (%s is required)", k)
}
}
return nil
}

func secretContainsSameValues(expected map[string]string, configurationSecret corev1.Secret) error {
for k, expectedV := range expected {
v, okV := configurationSecret.Data[k]
if okV == false {
return fmt.Errorf("values not propagated (%s: nil != %s )", k, expectedV)
}
if expectedV != string(v) {
return fmt.Errorf("values not propagated (%s: %s != %s )", k, string(v), expectedV)
}
}
return nil
}
12 changes: 9 additions & 3 deletions components/operator/internal/state/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@ func sFnRegistryConfiguration(ctx context.Context, r *reconciler, s *systemState

func configureRegistry(ctx context.Context, r *reconciler, s *systemState) error {

//TODO: This is a temporary solution, delete it when legacy serverless is removed
if !isLegacyEnabled(s.instance.Annotations) {
setK3dRegistryConfig(s)
s.instance.Status.DockerRegistry = ""
return nil
}

switch {
case isRegistrySecretName(s.instance.Spec.DockerRegistry):
// case: use secret from secretName field
Expand Down Expand Up @@ -131,9 +138,8 @@ func setExternalRegistryConfig(ctx context.Context, r *reconciler, s *systemStat
}

func setK3dRegistryConfig(s *systemState) {
if isLegacyEnabled(s.instance.Annotations) {
s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress
}
s.instance.Status.DockerRegistry = v1alpha1.DefaultServerAddress

s.flagsBuilder.WithRegistryEnableInternal(
getEnableInternal(s.instance.Spec.DockerRegistry),
).WithRegistryAddresses(
Expand Down
279 changes: 0 additions & 279 deletions components/operator/internal/state/registry_test.go
View file
Open in desktop

This file was deleted.

Loading