Skip to content
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

Jump to bottom

fix(kubernetes/tests): increased k3s version in rancher (DO NOT MERGE) #5419

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

fix(kubernetes/tests): increased k3s version in rancher (DO NOT MERGE) #5419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52c3063
initial
danielGz Jul 7, 2021
c665216
updated k3s
danielGz Jul 7, 2021
2ecd8c2
increased log verbosity in tests
danielGz Jul 7, 2021
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
2 changes: 1 addition & 1 deletion ...on/java/com/netflix/spinnaker/clouddriver/kubernetes/it/containers/KubernetesCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

public class KubernetesCluster extends GenericContainer<KubernetesCluster> {

private static final String DOCKER_IMAGE = "rancher/k3s:v1.17.11-k3s1";
private static final String DOCKER_IMAGE = "rancher/k3s:v1.21.2-k3s1";
private static final String KUBECFG_IN_CONTAINER = "/etc/rancher/k3s/k3s.yaml";

private static KubernetesCluster INSTANCE;
Expand Down
14 changes: 14 additions & 0 deletions clouddriver-kubernetes/src/integration/resources/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="DEBUG"/>
<logger name="com.github.dockerjava" level="DEBUG"/>
</configuration>
14 changes: 14 additions & 0 deletions ...bernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/logback-test.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<configuration>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n</pattern>
</encoder>
</appender>

<root level="info">
<appender-ref ref="STDOUT"/>
</root>

<logger name="org.testcontainers" level="DEBUG"/>
<logger name="com.github.dockerjava" level="DEBUG"/>
</configuration>