Skip to content

Commit 84d2808

Browse files
authored
[installer] Remove admin-login-secret, unused (#16889)
* [installer] Remove admin-login-secret, unused * fix
1 parent 50e09cc commit 84d2808

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

dev/preview/workflow/preview/deploy-gitpod.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -347,20 +347,6 @@ if [[ "${GITPOD_WITH_DEDICATED_EMU}" == "true" ]]
347347
then
348348
# Suppress the Self-Hosted setup modal
349349
yq w -i "${INSTALLER_CONFIG_PATH}" experimental.webapp.server.showSetupModal "false"
350-
351-
#
352-
# configure admin-login-secret
353-
#
354-
kubectl --kubeconfig "${DEV_KUBE_PATH}" --context "${DEV_KUBE_CONTEXT}" -n werft get secret admin-login-secret -o yaml > admin-login-secret.yaml
355-
yq w -i admin-login-secret.yaml metadata.namespace "default"
356-
yq d -i admin-login-secret.yaml metadata.creationTimestamp
357-
yq d -i admin-login-secret.yaml metadata.uid
358-
yq d -i admin-login-secret.yaml metadata.resourceVersion
359-
diff-apply "${PREVIEW_K3S_KUBE_CONTEXT}" admin-login-secret.yaml
360-
rm -f admin-login-secret.yaml
361-
362-
yq w -i "${INSTALLER_CONFIG_PATH}" adminLoginSecret.kind "secret"
363-
yq w -i "${INSTALLER_CONFIG_PATH}" adminLoginSecret.name "admin-login-secret"
364350
fi
365351

366352
#

install/installer/pkg/config/v1/config.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@ type Config struct {
161161

162162
Telemetry *TelemetryConfig `json:"telemetry,omitempty"`
163163

164-
AdminLoginSecret *ObjectRef `json:"adminLoginSecret,omitempty"`
165-
166164
Experimental *experimental.Config `json:"experimental,omitempty"`
167165
}
168166

install/installer/pkg/config/v1/validation.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@ func (v version) ClusterValidation(rcfg interface{}) cluster.ValidationChecks {
267267
res = append(res, cluster.CheckSecret(cfg.MessageBus.Credentials.Name, cluster.CheckSecretRequiredData("rabbitmq-password")))
268268
}
269269

270-
if cfg.AdminLoginSecret != nil {
271-
res = append(res, cluster.CheckSecret(cfg.AdminLoginSecret.Name, cluster.CheckSecretRequiredData("login-key")))
272-
}
273-
274270
res = append(res, experimental.ClusterValidation(cfg.Experimental)...)
275271

276272
return res

0 commit comments

Comments
 (0)