Skip to content

Commit 8700c81

Browse files
nilo19nilo19
authored
Merge branch 'master' into fix-ip-comparison-bug
2 parents ac1b07f + bd225d8 commit 8700c81

File tree

10 files changed

+11
-20
lines changed

10 files changed

+11
-20
lines changed

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474

7575
# Initializes the CodeQL tools for scanning.
7676
- name: Initialize CodeQL
77-
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
77+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
7878
with:
7979
languages: ${{ matrix.language }}
8080
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -97,4 +97,4 @@ jobs:
9797
format: golang
9898

9999
- name: Perform CodeQL Analysis
100-
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
100+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5

‎.github/workflows/codeql-azclient.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060

6161
# Initializes the CodeQL tools for scanning.
6262
- name: Initialize CodeQL
63-
uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
63+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
6464
with:
6565
languages: ${{ matrix.language }}
6666
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -77,4 +77,4 @@ jobs:
7777
echo "fail if files changed"
7878
git add . && git diff --quiet && git diff --cached --quiet
7979
- name: Perform CodeQL Analysis
80-
uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
80+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ jobs:
7272

7373
# Upload the results to GitHub's code scanning dashboard.
7474
- name: "Upload to code-scanning"
75-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
75+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
7676
with:
7777
sarif_file: results.sarif

‎.github/workflows/trivy.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
env:
7070
TRIVY_SKIP_DB_UPDATE: true
7171
- name: Upload Trivy scan results to GitHub Security tab
72-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
72+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
7373
with:
7474
sarif_file: 'trivy-ccm-results.sarif'
7575
category: azure-cloud-controller-manager-image
@@ -85,7 +85,7 @@ jobs:
8585
env:
8686
TRIVY_SKIP_DB_UPDATE: true
8787
- name: Upload Trivy scan results to GitHub Security tab
88-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
88+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
8989
with:
9090
sarif_file: 'trivy-cnm-linux-results.sarif'
9191
category: azure-cloud-node-manager-linux-image
@@ -101,7 +101,7 @@ jobs:
101101
env:
102102
TRIVY_SKIP_DB_UPDATE: true
103103
- name: Upload Trivy scan results to GitHub Security tab
104-
uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
104+
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
105105
with:
106106
sarif_file: 'trivy-health-probe-proxy-linux-results.sarif'
107107
category: health-probe-proxy-linux-image

‎examples/out-of-tree/kubelet.manifest‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
--network-plugin=kubenet \
2727
--node-status-update-frequency=10s \
2828
--non-masquerade-cidr=0.0.0.0/0 \
29-
--pod-infra-container-image=registry.k8s.io/pause-amd64:3.1 \
3029
--pod-manifest-path=/etc/kubernetes/manifests \
3130
--pod-max-pids=-1 \
3231
--protect-kernel-defaults=true \

‎pkg/azclient/configloader/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.24.6
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
7-
github.com/onsi/ginkgo/v2 v2.27.1
7+
github.com/onsi/ginkgo/v2 v2.27.2
88
github.com/onsi/gomega v1.38.2
99
k8s.io/api v0.34.1
1010
k8s.io/apimachinery v0.34.1
@@ -35,7 +35,6 @@ require (
3535
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3636
github.com/pkg/errors v0.9.1 // indirect
3737
github.com/x448/float16 v0.8.4 // indirect
38-
go.uber.org/automaxprocs v1.6.0 // indirect
3938
go.yaml.in/yaml/v2 v2.4.2 // indirect
4039
go.yaml.in/yaml/v3 v3.0.4 // indirect
4140
golang.org/x/mod v0.27.0 // indirect

‎pkg/azclient/configloader/go.sum‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,14 @@ github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee h1:W5t00kpgFd
7171
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
7272
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7373
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
74-
github.com/onsi/ginkgo/v2 v2.27.1 h1:0LJC8MpUSQnfnp4n/3W3GdlmJP3ENGF0ZPzjQGLPP7s=
75-
github.com/onsi/ginkgo/v2 v2.27.1/go.mod h1:wmy3vCqiBjirARfVhAqFpYt8uvX0yaFe+GudAqqcCqA=
74+
github.com/onsi/ginkgo/v2 v2.27.2 h1:LzwLj0b89qtIy6SSASkzlNvX6WktqurSHwkk2ipF/Ns=
75+
github.com/onsi/ginkgo/v2 v2.27.2/go.mod h1:ArE1D/XhNXBXCBkKOLkbsb2c81dQHCRcF5zwn/ykDRo=
7676
github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A=
7777
github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k=
7878
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
7979
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
8080
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
8181
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
82-
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
83-
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
8482
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
8583
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
8684
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
@@ -108,8 +106,6 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
108106
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
109107
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
110108
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
111-
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
112-
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
113109
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
114110
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
115111
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version-oot-credential-provider.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,6 @@ spec:
522522
cloud-provider: external
523523
image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider
524524
image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml
525-
pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.9
526525
name: '{{ ds.meta_data["local_hostname"] }}'
527526
postKubeadmCommands:
528527
- nssm set kubelet start SERVICE_AUTO_START

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ spec:
477477
kubeletExtraArgs:
478478
azure-container-registry-config: c:/k/azure.json
479479
cloud-provider: external
480-
pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1
481480
name: '{{ ds.meta_data["local_hostname"] }}'
482481
postKubeadmCommands:
483482
- nssm set kubelet start SERVICE_AUTO_START

‎tests/k8s-azure/manifest/cluster-api/linux-vmss-multiple-zones-ci-version.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,6 @@ spec:
530530
cloud-provider: external
531531
image-credential-provider-bin-dir: /var/lib/kubelet/credential-provider
532532
image-credential-provider-config: /var/lib/kubelet/credential-provider-config.yaml
533-
pod-infra-container-image: mcr.microsoft.com/oss/kubernetes/pause:3.4.1
534533
name: '{{ ds.meta_data["local_hostname"] }}'
535534
postKubeadmCommands:
536535
- nssm set kubelet start SERVICE_AUTO_START

0 commit comments

Comments
 (0)