Skip to content

Cherry-pick minor fixes from open PRs #960

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
merged 2 commits into from
Oct 28, 2022
Merged

Cherry-pick minor fixes from open PRs #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2ba1ea
Update process for logging in as DWO SA when using make run/debug
amisevsk Oct 27, 2022
8f15802
Avoid waiting 5 seconds for image pull secret on every k8s start
amisevsk Oct 27, 2022
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
12 changes: 9 additions & 3 deletions build/make/deploy.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,15 @@ _check_cert_manager:
endif

_login_with_devworkspace_sa:
$(eval SA_TOKEN := $(shell $(K8S_CLI) get secrets -o=json -n $(NAMESPACE) | jq -r '[.items[] | select (.type == "kubernetes.io/service-account-token" and .metadata.annotations."kubernetes.io/service-account.name" == "$(DEVWORKSPACE_CTRL_SA)")][0].data.token' | base64 --decode ))
echo "Logging as controller's SA in $(NAMESPACE)"
oc login --token=$(SA_TOKEN) --kubeconfig=$(BUMPED_KUBECONFIG)
# Kubernetes 1.23 and below: get SA token from service-account-token secret; Kubernetes 1.24 and above, use `kubectl create token`
SA_TOKEN=$$($(K8S_CLI) get secrets -o=json -n $(NAMESPACE) \
| jq -r '[.items[] | select (.type == "kubernetes.io/service-account-token" and .metadata.annotations."kubernetes.io/service-account.name" == "$(DEVWORKSPACE_CTRL_SA)")][0].data.token' \
| base64 --decode ); \
if [[ "$$SA_TOKEN" == $$(echo 'null' | base64 -d) ]]; then \
SA_TOKEN=$$($(K8S_CLI) create token -n "$(NAMESPACE)" "$(DEVWORKSPACE_CTRL_SA)"); \
fi; \
echo "Logging as controller's SA in $(NAMESPACE)"; \
oc login --token="$$SA_TOKEN" --kubeconfig=$(BUMPED_KUBECONFIG)

### install_cert_manager: Installs Cert Mananger v1.5.4 on the cluster
install_cert_manager:
Expand Down
15 changes: 9 additions & 6 deletions pkg/provision/workspace/pull_secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"
"time"

"github.com/devfile/devworkspace-operator/pkg/infrastructure"
"github.com/devfile/devworkspace-operator/pkg/provision/sync"
"k8s.io/apimachinery/pkg/types"

Expand Down Expand Up @@ -80,12 +81,14 @@ func PullSecrets(clusterAPI sync.ClusterAPI, serviceAccountName, namespace strin
}
}

if len(serviceAccount.ImagePullSecrets) == 0 && serviceAccount.CreationTimestamp.Add(pullSecretCreationTimeout).After(time.Now()) {
return PullSecretsProvisioningStatus{
ProvisioningStatus: ProvisioningStatus{
Requeue: true,
Message: "Waiting for image pull secrets",
},
if infrastructure.IsOpenShift() {
if len(serviceAccount.ImagePullSecrets) == 0 && serviceAccount.CreationTimestamp.Add(pullSecretCreationTimeout).After(time.Now()) {
return PullSecretsProvisioningStatus{
ProvisioningStatus: ProvisioningStatus{
Requeue: true,
Message: "Waiting for image pull secrets",
},
}
}
}

Expand Down