Skip to content

Commit 18332ce

Browse files
anmazzottianmazzotti
authored
Merge pull request #1896 from anmazzotti/enable_rancher_debug_logs
ci: bump Rancher to 2.13.0-rc1 and enable debug logging
2 parents 105f853 + 0fe131a commit 18332ce

File tree

7 files changed

+20
-12
lines changed

7 files changed

+20
-12
lines changed

‎.github/workflows/test_chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
CONTROLLER_IMG: controller
1717
PULL_POLICY: Never
1818
CERT_MANAGER_VERSION: v1.16.3
19-
RANCHER_VERSION: v2.13.0-alpha3
19+
RANCHER_VERSION: v2.13.0-rc1
2020

2121
jobs:
2222
prime-test:
@@ -70,13 +70,13 @@ jobs:
7070
run: helm repo add jetstack https://charts.jetstack.io
7171

7272
- name: Add rancher chart repo
73-
run: helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha
73+
run: helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
7474

7575
- name: Install cert-manager
7676
run: helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version ${{ env.CERT_MANAGER_VERSION }} --set crds.enabled=true --set crds.keep=true --wait
7777

7878
- name: Install Rancher
79-
run: helm install rancher rancher-alpha/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
79+
run: helm install rancher rancher-latest/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
8080

8181
- name: Wait for rancher-webhook
8282
run: |
@@ -150,7 +150,7 @@ jobs:
150150
run: helm repo add jetstack https://charts.jetstack.io && helm install cert-manager jetstack/cert-manager --namespace cert-manager --create-namespace --version ${{ env.CERT_MANAGER_VERSION }} --set crds.enabled=true --set crds.keep=true --wait
151151

152152
- name: Install Rancher
153-
run: helm repo add rancher-alpha https://releases.rancher.com/server-charts/alpha && helm install rancher rancher-alpha/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
153+
run: helm repo add rancher-latest https://releases.rancher.com/server-charts/latest && helm install rancher rancher-latest/rancher --namespace cattle-system --create-namespace --set bootstrapPassword=rancheradmin --set replicas=1 --set hostname="e2e.dev.rancher" --set 'extraEnv[0].name=CATTLE_FEATURES' --set 'extraEnv[0].value=turtles=false' --version ${{ env.RANCHER_VERSION }} --wait
154154

155155
- name: Wait for rancher-webhook
156156
run: |

‎internal/controllers/testdata/import_sample.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ spec:
192192
value: 726f86e0-b3bc-41f1-9757-8a0ee24560f4
193193
- name: CATTLE_INGRESS_IP_DOMAIN
194194
value: sslip.io
195-
image: rancher/rancher-agent:v2.13.0-alpha3
195+
image: rancher/rancher-agent:v2.13.0-rc1
196196
volumeMounts:
197197
- name: cattle-credentials
198198
mountPath: /cattle-credentials

‎scripts/turtles-dev.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424

2525
RANCHER_CHANNEL=${RANCHER_CHANNEL:-alpha}
2626
RANCHER_PASSWORD=${RANCHER_PASSWORD:-rancheradmin}
27-
RANCHER_VERSION=${RANCHER_VERSION:-v2.13.0-alpha3}
27+
RANCHER_VERSION=${RANCHER_VERSION:-v2.13.0-rc1}
2828
RANCHER_IMAGE_TAG=${RANCHER_IMAGE_TAG:-$RANCHER_VERSION} # Set RANCHER_IMAGE_TAG=head to test with latest build
2929
RANCHER_IMAGE=${RANCHER_IMAGE:-rancher/rancher:$RANCHER_IMAGE_TAG}
3030
CLUSTER_NAME=${CLUSTER_NAME:-capi-test}
@@ -101,6 +101,7 @@ helm install rancher rancher-$RANCHER_CHANNEL/rancher \
101101
--set extraEnv[1].value=$RANCHER_CHARTS_BASE_BRANCH \
102102
--set extraEnv[2].name=CATTLE_RANCHER_TURTLES_VERSION \
103103
--set extraEnv[2].value=$RANCHER_CHART_DEV_VERSION \
104+
--set debug=true \
104105
--version="$RANCHER_VERSION" \
105106
--wait
106107

‎scripts/turtles-quickstart.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
set -e
1919

2020
RANCHER_CHANNEL=${RANCHER_CHANNEL:-latest}
21-
RANCHER_VERSION=${RANCHER_VERSION:-v2.13.0-alpha3}
21+
RANCHER_VERSION=${RANCHER_VERSION:-v2.13.0-rc1}
2222
RANCHER_IMAGE=${RANCHER_IMAGE:-rancher/rancher:$RANCHER_VERSION}
2323
RANCHER_CLUSTER_NAME=${RANCHER_CLUSTER_NAME:-rancher-cluster}
2424
RANCHER_TURTLES_VERSION=${RANCHER_TURTLES_VERSION:-v0.24.1}

‎test/e2e/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Most notable ones:
162162

163163
```yaml
164164
variables:
165-
RANCHER_VERSION: "v2.13.0-alpha3" # Default rancher version to install
165+
RANCHER_VERSION: "v2.13.0-rc1" # Default rancher version to install
166166
RANCHER_HOSTNAME: "localhost" # Your ngrok domain
167167
NGROK_API_KEY: "" # Key and token values for establishing ingress
168168
NGROK_AUTHTOKEN: ""

‎test/e2e/config/operator.yaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,13 @@ variables:
8383
HELM_EXTRA_VALUES_FOLDER: "/tmp"
8484

8585
# Rancher Configuration
86-
RANCHER_VERSION: "v2.13.0-alpha3"
87-
RANCHER_REPO_NAME: "rancher-alpha"
88-
RANCHER_PATH: "rancher-alpha/rancher"
89-
RANCHER_URL: "https://releases.rancher.com/server-charts/alpha"
86+
RANCHER_VERSION: "v2.13.0-rc1"
87+
RANCHER_REPO_NAME: "rancher-latest"
88+
RANCHER_PATH: "rancher-latest/rancher"
89+
RANCHER_URL: "https://releases.rancher.com/server-charts/latest"
9090
RANCHER_HOSTNAME: "localhost"
9191
RANCHER_PASSWORD: "rancheradmin"
92+
RANCHER_DEBUG: true
9293

9394
# Turtles Configuration
9495
TURTLES_VERSION: "v0.0.1"

‎test/testenv/rancher.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ type DeployRancherInput struct {
108108

109109
// RancherInstallationTimeout is the timeout for Rancher installation.
110110
RancherInstallationTimeout string `env:"RANCHER_INSTALLATION_TIMEOUT" envDefault:"5m"`
111+
112+
// RancherDebug enables the `debug` chart value
113+
RancherDebug bool `env:"RANCHER_DEBUG"`
111114
}
112115

113116
type deployRancherValuesFile struct {
@@ -236,6 +239,9 @@ func DeployRancher(ctx context.Context, input DeployRancherInput) PreRancherInst
236239
"--set", "extraEnv[0].name=CATTLE_FEATURES",
237240
"--set", "extraEnv[0].value=turtles=false",
238241
)
242+
if input.RancherDebug {
243+
installFlags = append(installFlags, "--set", "debug=true")
244+
}
239245
if input.RancherVersion != "" {
240246
installFlags = append(installFlags, "--version", input.RancherVersion)
241247
}

0 commit comments

Comments
 (0)