Skip to content

Commit e9c3833

Browse files
authored
Merge pull request #554 from andyzhangx/cve
fix: install updated packages to fix CVE issues
2 parents fe56272 + c287f5c commit e9c3833

File tree

8 files changed

+23
-17
lines changed

8 files changed

+23
-17
lines changed

.github/workflows/trivy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
exit-code: '1'
2929
ignore-unfixed: true
3030
vuln-type: 'os,library'
31-
severity: 'CRITICAL,HIGH'
31+
severity: 'CRITICAL,HIGH,MEDIUM,LOW,UNKNOWN'
3232

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
k8s.io/client-go v0.22.1
2626
k8s.io/component-base v0.22.1
2727
k8s.io/klog/v2 v2.10.0
28-
k8s.io/kubernetes v1.21.0
28+
k8s.io/kubernetes v1.21.1
2929
k8s.io/mount-utils v0.0.0
3030
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
3131
sigs.k8s.io/cloud-provider-azure v0.7.4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,8 +1138,8 @@ k8s.io/kubectl v0.21.0 h1:WZXlnG/yjcE4LWO2g6ULjFxtzK6H1TKzsfaBFuVIhNg=
11381138
k8s.io/kubectl v0.21.0/go.mod h1:EU37NukZRXn1TpAkMUoy8Z/B2u6wjHDS4aInsDzVvks=
11391139
k8s.io/kubelet v0.21.0 h1:1VUfM5vKqLPlWFI0zee6fm9kwIZ/UEOGCodVFN+OZrg=
11401140
k8s.io/kubelet v0.21.0/go.mod h1:G5ZxMTVev9t4bhmsSxDAWhH6wXDYEVHVVFyYsw4laR4=
1141-
k8s.io/kubernetes v1.21.0 h1:LUUQgdFsKB+wVgKPUapmXjkvvJHSLN53CuQwre4c+mM=
1142-
k8s.io/kubernetes v1.21.0/go.mod h1:Yx6XZ8zalyqEk7but+j4+5SvLzdyH1eeqZ4cwO+5dD4=
1141+
k8s.io/kubernetes v1.21.1 h1:U7cVOSdG+sMNOfL9XlenBV7avSBDHyWPE66gWnnYIIc=
1142+
k8s.io/kubernetes v1.21.1/go.mod h1:ef++isEL1PW0taH6z7DXrSztPglrZ7jQhyvcMEtm0gQ=
11431143
k8s.io/legacy-cloud-providers v0.21.0/go.mod h1:bNxo7gDg+PGkBmT/MFZswLTWdSWK9kAlS1s8DJca5q4=
11441144
k8s.io/metrics v0.21.0/go.mod h1:L3Ji9EGPP1YBbfm9sPfEXSpnj8i24bfQbAFAsW0NueQ=
11451145
k8s.io/mount-utils v0.21.1 h1:uYf6zlKaaoUcPhWn6MElLkWf/f7UQgtkPZteumgwDbA=

pkg/blobplugin/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
FROM k8s.gcr.io/build-image/debian-base:bullseye-v1.0.0
1616
COPY ./_output/blobplugin /blobplugin
1717
RUN apt update && apt-mark unhold libcap2
18-
RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common libssl1.1
18+
RUN clean-install ca-certificates libfuse-dev libcurl4-gnutls-dev libgnutls28-dev uuid-dev libgcrypt20-dev util-linux mount udev wget e2fsprogs nfs-common
19+
# install updated packages to fix CVE issues
20+
RUN clean-install libssl1.1 libgssapi-krb5-2 libk5crypto3 libkrb5-3 libkrb5support0
1921
RUN mkdir /blobfuse-proxy/
2022
COPY ./_output/blobfuse-proxy.deb /blobfuse-proxy/
2123
# for compatibility, remove this after v1.6.0 release (todo)

vendor/k8s.io/kubernetes/pkg/apis/core/annotation_key_constants.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/pkg/apis/core/validation/validation.go

Lines changed: 11 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/test/utils/image/manifest.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ k8s.io/kubectl/pkg/scale
812812
k8s.io/kubectl/pkg/util/podutils
813813
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.21.0
814814
k8s.io/kubelet/pkg/apis/stats/v1alpha1
815-
# k8s.io/kubernetes v1.21.0
815+
# k8s.io/kubernetes v1.21.1
816816
## explicit
817817
k8s.io/kubernetes/pkg/api/legacyscheme
818818
k8s.io/kubernetes/pkg/api/service

0 commit comments

Comments
 (0)