-
Notifications
You must be signed in to change notification settings - Fork 430
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1932 from jsturtevant/deflake-upstream
Improve Windows logging and general stability for upstream e2e tests
- Loading branch information
Showing
19 changed files
with
458 additions
and
33 deletions.
There are no files selected for viewing
14 changes: 14 additions & 0 deletions
14
templates/addons/windows/containerd-logging/containerd-logger-resource-set.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| --- | ||
| apiVersion: addons.cluster.x-k8s.io/v1beta1 | ||
| kind: ClusterResourceSet | ||
| metadata: | ||
| name: containerd-logger-${CLUSTER_NAME} | ||
| namespace: default | ||
| spec: | ||
| clusterSelector: | ||
| matchLabels: | ||
| containerd-logger: enabled | ||
| resources: | ||
| - kind: ConfigMap | ||
| name: containerd-logger-${CLUSTER_NAME} | ||
| strategy: ApplyOnce |
108 changes: 108 additions & 0 deletions
108
templates/addons/windows/containerd-logging/containerd-logger.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| apiVersion: apps/v1 | ||
| kind: DaemonSet | ||
| metadata: | ||
| labels: | ||
| k8s-app: containerd-logger | ||
| name: containerd-logger | ||
| namespace: kube-system | ||
| spec: | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: containerd-logger | ||
| template: | ||
| metadata: | ||
| labels: | ||
| k8s-app: containerd-logger | ||
| spec: | ||
| securityContext: | ||
| windowsOptions: | ||
| hostProcess: true | ||
| runAsUserName: "NT AUTHORITY\\system" | ||
| hostNetwork: true | ||
| containers: | ||
| - image: ghcr.io/kubernetes-sigs/sig-windows/eventflow-logger:v0.1.0 | ||
| args: [ "config.json" ] | ||
| name: containerd-logger | ||
| imagePullPolicy: Always | ||
| volumeMounts: | ||
| - name: containerd-logger-config | ||
| mountPath: /config.json | ||
| subPath: config.json | ||
| nodeSelector: | ||
| kubernetes.io/os: windows | ||
| tolerations: | ||
| - key: CriticalAddonsOnly | ||
| operator: Exists | ||
| - operator: Exists | ||
| volumes: | ||
| - configMap: | ||
| name: containerd-logger-config | ||
| name: containerd-logger-config | ||
| updateStrategy: | ||
| type: RollingUpdate | ||
| --- | ||
| kind: ConfigMap | ||
| apiVersion: v1 | ||
| metadata: | ||
| name: containerd-logger-config | ||
| namespace: kube-system | ||
| data: | ||
| config.json: | | ||
| { | ||
| "inputs": [ | ||
| { | ||
| "type": "ETW", | ||
| "sessionNamePrefix": "containerd", | ||
| "cleanupOldSessions": true, | ||
| "reuseExistingSession": true, | ||
| "providers": [ | ||
| { | ||
| "providerName": "Microsoft.Virtualization.RunHCS", | ||
| "providerGuid": "0B52781F-B24D-5685-DDF6-69830ED40EC3", | ||
| "level": "Verbose" | ||
| }, | ||
| { | ||
| "providerName": "ContainerD", | ||
| "providerGuid": "2acb92c0-eb9b-571a-69cf-8f3410f383ad", | ||
| "level": "Verbose" | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "filters": [ | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == Stats && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == hcsshim::LayerID && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == hcsshim::NameToGuid && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == containerd.task.v2.Task.Stats && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == containerd.task.v2.Task.State && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == HcsGetProcessProperties && hasnoproperty error" | ||
| }, | ||
| { | ||
| "type": "drop", | ||
| "include": "ProviderName == Microsoft.Virtualization.RunHCS && name == HcsGetComputeSystemProperties && hasnoproperty error" | ||
| } | ||
| ], | ||
| "outputs": [ | ||
| { | ||
| "type": "StdOutput" | ||
| } | ||
| ], | ||
| "schemaVersion": "2016-08-11" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.