Skip to content

Commit ca875db

Browse files
devigneddevigned
committed
increase verbosity of controller manager v=4
1 parent 2ce6090 commit ca875db

23 files changed

+38
-12
lines changed

‎templates/test/cluster-template-prow-ci-version.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
cloud-config: /etc/kubernetes/azure.json
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
66+
v: "4"
6667
extraVolumes:
6768
- hostPath: /etc/kubernetes/azure.json
6869
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-ipv6.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ spec:
8484
cluster-cidr: 2001:1234:5678:9a40::/58
8585
cluster-name: ${CLUSTER_NAME}
8686
configure-cloud-routes: "true"
87+
v: "4"
8788
extraVolumes:
8889
- hostPath: /etc/kubernetes/azure.json
8990
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-machine-pool-ci-version.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
cloud-config: /etc/kubernetes/azure.json
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
66+
v: "4"
6667
extraVolumes:
6768
- hostPath: /etc/kubernetes/azure.json
6869
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-machine-pool-windows.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ spec:
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
6666
configure-cloud-routes: "false"
67+
v: "4"
6768
extraVolumes:
6869
- hostPath: /etc/kubernetes/azure.json
6970
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-machine-pool.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
cloud-config: /etc/kubernetes/azure.json
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
66+
v: "4"
6667
extraVolumes:
6768
- hostPath: /etc/kubernetes/azure.json
6869
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-multi-tenancy.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ spec:
6868
cloud-config: /etc/kubernetes/azure.json
6969
cloud-provider: azure
7070
cluster-name: ${CLUSTER_NAME}
71+
v: "4"
7172
extraVolumes:
7273
- hostPath: /etc/kubernetes/azure.json
7374
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-nvidia-gpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
cloud-config: /etc/kubernetes/azure.json
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
66+
v: "4"
6667
extraVolumes:
6768
- hostPath: /etc/kubernetes/azure.json
6869
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-private.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ spec:
7878
cloud-config: /etc/kubernetes/azure.json
7979
cloud-provider: azure
8080
cluster-name: ${CLUSTER_NAME}
81+
v: "4"
8182
extraVolumes:
8283
- hostPath: /etc/kubernetes/azure.json
8384
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow-windows.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ spec:
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
6666
configure-cloud-routes: "false"
67+
v: "4"
6768
extraVolumes:
6869
- hostPath: /etc/kubernetes/azure.json
6970
mountPath: /etc/kubernetes/azure.json

‎templates/test/cluster-template-prow.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ spec:
6363
cloud-config: /etc/kubernetes/azure.json
6464
cloud-provider: azure
6565
cluster-name: ${CLUSTER_NAME}
66+
v: "4"
6667
extraVolumes:
6768
- hostPath: /etc/kubernetes/azure.json
6869
mountPath: /etc/kubernetes/azure.json

‎templates/test/patches/controller-manager.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
kind: KubeadmControlPlane
2+
apiVersion: controlplane.cluster.x-k8s.io/v1alpha3
3+
metadata:
4+
name: "${CLUSTER_NAME}-control-plane"
5+
spec:
6+
kubeadmConfigSpec:
7+
useExperimentalRetryJoin: true
8+
clusterConfiguration:
9+
controllerManager:
10+
extraArgs:
11+
v: "4"

‎templates/test/prow-ipv6/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ resources:
66
- cni-resource-set.yaml
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
9+
- ../patches/controller-manager.yaml
910
- patches/cluster-cni.yaml
1011

‎templates/test/prow-machine-pool-ci-version/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ resources:
55
- ../prow-machine-pool
66
patchesStrategicMerge:
77
- ../patches/control-plane-image-ci-version.yaml
8+
- ../patches/controller-manager.yaml
89
- patches/machine-pool-ci-version.yaml

‎templates/test/prow-machine-pool-windows/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ resources:
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
99
- ../patches/cni-resource-set.yaml
10+
- ../patches/controller-manager.yaml
1011

‎templates/test/prow-machine-pool/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ resources:
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
99
- ../patches/cni-resource-set.yaml
10+
- ../patches/controller-manager.yaml

‎templates/test/prow-multi-tenancy/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ resources:
66
- cni-resource-set.yaml
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
9+
- ../patches/controller-manager.yaml
910
- patches/cluster-cni.yaml

‎templates/test/prow-nvidia-gpu/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ resources:
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
99
- ../patches/cni-resource-set.yaml
10+
- ../patches/controller-manager.yaml
1011
patchesJson6902:
1112
- path: patches/node-storage-type.yaml
1213
target:

‎templates/test/prow-private/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ resources:
66
- cni-resource-set.yaml
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
9+
- ../patches/controller-manager.yaml
910
- patches/cluster-cni.yaml
1011
- patches/custom-vnet.yaml
1112

‎templates/test/prow-windows/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ resources:
77
patchesStrategicMerge:
88
- ../patches/tags.yaml
99
- ../patches/cni-resource-set.yaml
10+
- ../patches/controller-manager.yaml

‎templates/test/prow/kustomization.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ patchesStrategicMerge:
99
- ../patches/tags.yaml
1010
- ../patches/mhc.yaml
1111
- ../patches/cni-resource-set.yaml
12+
- ../patches/controller-manager.yaml

‎test/e2e/azure_lb.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ import (
2727
. "github.com/onsi/gomega"
2828
k8snet "k8s.io/utils/net"
2929

30-
deploymentBuilder "sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/deployment"
31-
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/job"
32-
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/node"
33-
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/windows"
34-
3530
corev1 "k8s.io/api/core/v1"
3631
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3732
"k8s.io/client-go/kubernetes"
3833
"sigs.k8s.io/cluster-api/test/framework"
34+
35+
deploymentBuilder "sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/deployment"
36+
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/job"
37+
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/node"
38+
"sigs.k8s.io/cluster-api-provider-azure/test/e2e/kubernetes/windows"
3939
)
4040

4141
// AzureLBSpecInput is the input for AzureLBSpec.

‎test/e2e/common.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,6 @@ func Byf(format string, a ...interface{}) {
6161
By(fmt.Sprintf(format, a...))
6262
}
6363

64-
func Logf(format string, a ...interface{}) {
65-
fmt.Fprintf(GinkgoWriter, "INFO: "+format+"\n", a...)
66-
}
67-
6864
func setupSpecNamespace(ctx context.Context, specName string, clusterProxy framework.ClusterProxy, artifactFolder string) (*corev1.Namespace, context.CancelFunc) {
6965
Byf("Creating a namespace for hosting the %q test spec", specName)
7066
namespace, cancelWatches := framework.CreateNamespaceAndWatchEvents(ctx, framework.CreateNamespaceAndWatchEventsInput{

‎test/e2e/e2e_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (acp *AzureClusterProxy) CollectWorkloadClusterLogs(ctx context.Context, na
118118
go func(pod corev1.Pod, container corev1.Container) {
119119
defer GinkgoRecover()
120120

121-
Logf("Creating log watcher for controller %s/%s, container %s", kubesystem, pod.Name, container.Name)
121+
Byf("Creating log watcher for controller %s/%s, container %s", kubesystem, pod.Name, container.Name)
122122
logFile := path.Join(aboveMachinesPath, kubesystem, pod.Name, container.Name+".log")
123123
Expect(os.MkdirAll(filepath.Dir(logFile), 0755)).To(Succeed())
124124

@@ -134,7 +134,7 @@ func (acp *AzureClusterProxy) CollectWorkloadClusterLogs(ctx context.Context, na
134134
podLogs, err := workload.GetClientSet().CoreV1().Pods(kubesystem).GetLogs(pod.Name, opts).Stream()
135135
if err != nil {
136136
// Failing to stream logs should not cause the test to fail
137-
Logf("Error starting logs stream for pod %s/%s, container %s: %v", kubesystem, pod.Name, container.Name, err)
137+
Byf("Error starting logs stream for pod %s/%s, container %s: %v", kubesystem, pod.Name, container.Name, err)
138138
return
139139
}
140140
defer podLogs.Close()
@@ -144,7 +144,7 @@ func (acp *AzureClusterProxy) CollectWorkloadClusterLogs(ctx context.Context, na
144144
_, err = out.ReadFrom(podLogs)
145145
if err != nil && err != io.ErrUnexpectedEOF {
146146
// Failing to stream logs should not cause the test to fail
147-
Logf("Got error while streaming logs for pod %s/%s, container %s: %v", kubesystem, pod.Name, container.Name, err)
147+
Byf("Got error while streaming logs for pod %s/%s, container %s: %v", kubesystem, pod.Name, container.Name, err)
148148
}
149149
}(pod, container)
150150
}

0 commit comments

Comments
 (0)