mirror of
https://gitee.com/rancher/rancher.git
synced 2025-12-06 07:49:17 +08:00
[main] Bump rancher-turtles to v0.25.0-rc.3 and update Turtles namespace to cattle-turtles-system (#52294)
* fix: Change Turtles namespace to `cattle-turtles-system` * fix: Bump Turtles version
This commit is contained in:
committed by
GitHub
parent
5c77a6ca07
commit
6f47f0373d
@@ -1,7 +1,7 @@
|
||||
webhookVersion: 108.0.0+up0.9.0-rc.9
|
||||
remoteDialerProxyVersion: 106.0.2+up0.6.0-rc.4
|
||||
provisioningCAPIVersion: 108.0.0+up0.9.0
|
||||
turtlesVersion: 108.0.0+up0.25.0-rc.2
|
||||
turtlesVersion: 108.0.0+up0.25.0-rc.3
|
||||
cspAdapterMinVersion: 108.0.0+up8.0.0-rc.3
|
||||
defaultShellVersion: rancher/shell:v0.6.0-rc.1
|
||||
fleetVersion: 108.0.0+up0.14.0-alpha.5
|
||||
|
||||
@@ -62,7 +62,7 @@ var (
|
||||
"cattle-logging",
|
||||
"cattle-fleet-system",
|
||||
"cattle-provisioning-capi-system",
|
||||
"rancher-turtles-system",
|
||||
"cattle-turtles-system",
|
||||
"cattle-impersonation-system",
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,6 @@ const (
|
||||
FleetVersion = "108.0.0+up0.14.0-alpha.5"
|
||||
ProvisioningCAPIVersion = "108.0.0+up0.9.0"
|
||||
RemoteDialerProxyVersion = "106.0.2+up0.6.0-rc.4"
|
||||
TurtlesVersion = "108.0.0+up0.25.0-rc.2"
|
||||
TurtlesVersion = "108.0.0+up0.25.0-rc.3"
|
||||
WebhookVersion = "108.0.0+up0.9.0-rc.9"
|
||||
)
|
||||
|
||||
@@ -36,7 +36,7 @@ var FeatureAppNS = []string{
|
||||
"cattle-ui-plugin-system", // UI Plugin System
|
||||
"tigera-operator", // RKE2 restricted PSA Config, source: https://github.com/rancher/rke2/blob/34633dcc188d3a79744636fe21529ef6f5d64d71/pkg/rke2/psa.go#L58
|
||||
"cattle-provisioning-capi-system", // CAPI core controller manager
|
||||
"rancher-turtles-system", // Turtles core controller manager
|
||||
"cattle-turtles-system", // Turtles core controller manager
|
||||
}
|
||||
|
||||
// addDefaultPodSecurityAdmissionConfigurationTemplates creates or updates the default PSACTs with the builtin templates.
|
||||
|
||||
@@ -14,7 +14,7 @@ const (
|
||||
GlobalNamespace = "cattle-global-data"
|
||||
NodeTemplateGlobalNamespace = "cattle-global-nt"
|
||||
ProvisioningCAPINamespace = "cattle-provisioning-capi-system"
|
||||
TurtlesNamespace = "rancher-turtles-system"
|
||||
TurtlesNamespace = "cattle-turtles-system"
|
||||
)
|
||||
|
||||
func SetNamespaceCondition(namespace *v1.Namespace, d time.Duration, conditionType string, conditionStatus bool, message string) error {
|
||||
|
||||
@@ -131,8 +131,8 @@ echo "Waiting up to 5 minutes for rancher-turtles deployment"
|
||||
--message-interval 30 `# Print the progress message below every 30 attempts (roughly every minute)` \
|
||||
--message "rancher-turtles was not available after {{elapsed}} seconds" `# Print this progress message` \
|
||||
--exit-command "dump_rancher_logs" `# Dump logs to find out why turtles did not start` \
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns rancher-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n rancher-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns cattle-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n cattle-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
|
||||
echo Running integrationsetup
|
||||
export CATTLE_TEST_CONFIG=$(pwd)/config.yaml # used by integration tests and test setup
|
||||
|
||||
@@ -249,8 +249,8 @@ echo "Waiting up to 5 minutes for rancher-turtles deployment"
|
||||
--message-interval 30 `# Print the progress message below every 30 attempts (roughly every minute)` \
|
||||
--message "rancher-turtles was not available after {{elapsed}} seconds" `# Print this progress message` \
|
||||
--exit-command "dump_rancher_logs" `# Dump logs to find out why turtles did not start` \
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns rancher-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n rancher-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns cattle-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n cattle-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
|
||||
# only push the image if we're not using the default image:tag
|
||||
if [ "${CATTLE_AGENT_IMAGE}" != "rancher/rancher-agent:head" ]; then
|
||||
|
||||
@@ -169,8 +169,8 @@ echo "Waiting up to 5 minutes for rancher-turtles deployment"
|
||||
--sleep 2 `# Sleep for 2 seconds in between attempts` \
|
||||
--message-interval 30 `# Print the progress message below every 30 attempts (roughly every minute)` \
|
||||
--message "rancher-turtles was not available after {{elapsed}} seconds" `# Print this progress message` \
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns rancher-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n rancher-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
"kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml get ns cattle-turtles-system &>/dev/null \
|
||||
&& kubectl --kubeconfig /etc/rancher/k3s/k3s.yaml rollout status -w -n cattle-turtles-system deploy/rancher-turtles-controller-manager &>/dev/null"
|
||||
|
||||
#kill $TPID
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ services:
|
||||
exemptions:
|
||||
namespaces:
|
||||
- cattle-provisioning-capi-system
|
||||
- rancher-turtles-system
|
||||
- cattle-turtles-system
|
||||
- calico-apiserver
|
||||
- calico-system
|
||||
- cattle-alerting
|
||||
|
||||
Reference in New Issue
Block a user