Skip to content

Commit

Permalink
Merge pull request #11321 from k8s-infra-cherrypick-robot/cherry-pick…
Browse files Browse the repository at this point in the history
…-11318-to-release-1.8

[release-1.8] 🌱 Remove json logging replacement in e2e test config
  • Loading branch information
k8s-ci-robot authored Oct 22, 2024
2 parents 4f37883 + 03bb76f commit 4d5077e
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions test/e2e/config/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ providers:
- sourcePath: "../data/shared/v1.7/metadata.yaml"
- name: v1.8.99 # next; use manifest from source files
value: ../../../config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
- sourcePath: "../data/shared/main/metadata.yaml"

Expand Down Expand Up @@ -156,9 +153,6 @@ providers:
- sourcePath: "../data/shared/v1.7/metadata.yaml"
- name: v1.8.99 # next; use manifest from source files
value: ../../../bootstrap/kubeadm/config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
- sourcePath: "../data/shared/main/metadata.yaml"

Expand Down Expand Up @@ -221,9 +215,6 @@ providers:
- sourcePath: "../data/shared/v1.7/metadata.yaml"
- name: v1.8.99 # next; use manifest from source files
value: ../../../controlplane/kubeadm/config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
- sourcePath: "../data/shared/main/metadata.yaml"

Expand Down Expand Up @@ -298,9 +289,6 @@ providers:
- sourcePath: "../data/infrastructure-docker/v1.7/clusterclass-quick-start.yaml"
- name: v1.8.99 # next; use manifest from source files
value: ../../../test/infrastructure/docker/config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
# Add cluster templates
- sourcePath: "../data/infrastructure-docker/main/cluster-template.yaml"
Expand Down Expand Up @@ -329,9 +317,6 @@ providers:
versions:
- name: v1.8.99 # next; use manifest from source files
value: ../../../test/infrastructure/inmemory/config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
# Add cluster templates
- sourcePath: "../data/infrastructure-inmemory/main/clusterclass-in-memory.yaml"
Expand All @@ -343,9 +328,6 @@ providers:
versions:
- name: v1.8.99 # next; use manifest from source files
value: ../../../test/extension/config/default
replacements:
- old: "--leader-elect"
new: "--leader-elect\n - --logging-format=json"
files:
- sourcePath: "../data/shared/main/metadata.yaml"

Expand Down

0 comments on commit 4d5077e

Please sign in to comment.