Skip to content

Commit 536e4df

Browse files
authored
chore: update sigs.k8s.io/controller-runtime to v0.22.1 (#2042)
* chore: Update sigs.k8s.io/controller-runtime to v0.22.1 Signed-off-by: Anatolii Bazko <[email protected]>
1 parent 5aa36da commit 536e4df

File tree

1,469 files changed

+126046
-38519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,469 files changed

+126046
-38519
lines changed

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,7 @@ run: install-che-operands genenerate-env ## Run Eclipse Che operator
109109
debug: SHELL := /bin/bash
110110
debug: install-che-operands genenerate-env ## Run and debug Eclipse Che operator
111111
source $(BASH_ENV_FILE)
112-
# dlv has an issue with 'Ctrl-C' termination, that's why we're doing trick with detach.
113-
dlv debug --listen=:2345 --headless=true --api-version=2 cmd/main.go -- &
114-
DLV_PID=$!
115-
wait $${DLV_PID}
112+
dlv debug --listen=:2345 --headless=true --api-version=2 cmd/main.go --
116113

117114
docker-build: ## Build Eclipse Che operator image
118115
if [ "$(SKIP_TESTS)" = true ]; then

build/scripts/clear-defined-test.sh

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ declare -A replaced_modules=(
8282
["go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0"]="github.com/open-telemetry/opentelemetry-go-contrib v1.35.0"
8383
# https://github.com/census-instrumentation/opencensus-go/commits/v0.23.0/
8484
["go.opencensus.io v0.23.0"]="census-instrumentation/opencensus-go 49838f207d61097fc0ebb8aeef306913388376ca"
85+
# https://github.com/sean-/seed/tree/e2103e2c35297fb7e17febb81e49b312087a2372
86+
["github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"]="sean-/seed e2103e2c35297fb7e17febb81e49b312087a2372"
8587
)
8688

8789
# replaces to have a correct link for clearlydefined.io api request
@@ -93,16 +95,41 @@ declare -A replaced_paths=(
9395
# replaces to have a correct link for clearlydefined.io api request
9496
declare -A replaced_api_suffix=(
9597
["census-instrumentation/opencensus-go"]="git/github"
98+
["sean-/seed"]="git/github"
9699
)
97100

101+
# Exceptions for dependencies that are not yet harvested in clearlydefined.io
102+
# License must be checked manually
98103
declare -A ignored_paths=(
99-
["github.com/sean-/seed"]="Harvesting in progress"
104+
["github.com/devfile/devworkspace-operator"]="Harvesting in progress"
105+
["go.etcd.io/etcd/pkg/v3"]="Harvesting in progress"
106+
["go.etcd.io/etcd/server/v3"]="Harvesting in progress"
100107
)
101108

102109
declare -A ignored_paths_license=(
103-
["github.com/sean-/seed"]="MIT"
110+
["github.com/devfile/devworkspace-operator"]="Apache-2.0"
111+
["go.etcd.io/etcd/pkg/v3"]="Apache-2.0"
112+
["go.etcd.io/etcd/server/v3"]="Apache-2.0"
104113
)
105114

115+
retryUrl() {
116+
url=$1
117+
118+
body=""
119+
max_retries=5
120+
for ((i=1; i<=max_retries; i++)); do
121+
response=$(curl -s -w "HTTPSTATUS:%{http_code}" "$url")
122+
body=$(echo "$response" | sed -e 's/HTTPSTATUS\:.*//g')
123+
status=$(echo "$response" | tr -d '\n' | sed -e 's/.*HTTPSTATUS://')
124+
if [[ "$status" == "200" ]] || [[ "$status" == "404" ]]; then
125+
break
126+
else
127+
sleep 5s
128+
fi
129+
done
130+
131+
echo "$body"
132+
}
106133

107134
go list -m -mod=mod all | while read -r module; do
108135
# ignore the first dependency which is the current module
@@ -146,10 +173,14 @@ go list -m -mod=mod all | while read -r module; do
146173
orig_url="https://api.clearlydefined.io/definitions/${api_suffix}/${path}/${version}"
147174
url=$orig_url
148175

149-
score=$(curl -s "$url" | jq -r '.scores.effective')
176+
score=""
177+
body=$(retryUrl "$url")
178+
if [[ ! -z "$body" ]]; then
179+
score=$(echo "$body" | jq -r '.scores.effective')
180+
fi
150181

151182
# try a shorter path if the first one returns null
152-
while [[ "$score" == "null" ]] || [[ "$score" == "35" ]]; do
183+
while [[ "$score" == "" ]] || [[ "$score" == "null" ]] || [[ "$score" == "35" ]]; do
153184
# remove the last part of the path
154185
path="${path%/*}"
155186
old_url=$url
@@ -162,7 +193,11 @@ go list -m -mod=mod all | while read -r module; do
162193
fi
163194

164195
# get the score again
165-
score=$(curl -s $url | jq -r '.scores.effective')
196+
score=""
197+
body=$(retryUrl "$url")
198+
if [[ ! -z "$body" ]]; then
199+
score=$(echo "$body" | jq -r '.scores.effective')
200+
fi
166201
done
167202

168203
if [[ $score == "N/A" ]]; then
@@ -199,6 +234,8 @@ go list -m -mod=mod all | while read -r module; do
199234
result="[WARN]"
200235
fi
201236
printf "%-7s %-70s %-25s %-10s %s\n" "$result" "$orig_module" "$license" "$score" "$url"
237+
238+
sleep 0.1s
202239
done
203240

204241
echo "[INFO] All dependencies are defined correctly."

bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ metadata:
8686
categories: Developer Tools
8787
certified: "false"
8888
containerImage: quay.io/eclipse/che-operator:next
89-
createdAt: "2025-08-28T09:40:43Z"
89+
createdAt: "2025-09-17T12:17:05Z"
9090
description: A Kube-native development solution that delivers portable and collaborative
9191
developer workspaces.
9292
features.operators.openshift.io/cnf: "false"
@@ -108,7 +108,7 @@ metadata:
108108
operatorframework.io/arch.amd64: supported
109109
operatorframework.io/arch.arm64: supported
110110
operatorframework.io/os.linux: supported
111-
name: eclipse-che.v7.109.0-940.next
111+
name: eclipse-che.v7.109.0-941.next
112112
namespace: placeholder
113113
spec:
114114
apiservicedefinitions: {}
@@ -1141,7 +1141,7 @@ spec:
11411141
name: gateway-authorization-sidecar-k8s
11421142
- image: quay.io/che-incubator/header-rewrite-proxy:latest
11431143
name: gateway-header-sidecar
1144-
version: 7.109.0-940.next
1144+
version: 7.109.0-941.next
11451145
webhookdefinitions:
11461146
- admissionReviewVersions:
11471147
- v1

0 commit comments

Comments
 (0)