Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit 75085b8

Browse files
committed
fix: disable gpg checks for https yum repos
1 parent 6ffb758 commit 75085b8

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

internal/operator/nodeagent/dep/k8s/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ name=Kubernetes
5555
baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64
5656
enabled=1
5757
gpgcheck=1
58-
repo_gpgcheck=1
58+
repo_gpgcheck=0
5959
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg`), 0644); err != nil {
6060
return err
6161
}

internal/operator/nodeagent/dep/package-manager-init.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dep
22

33
import (
44
"bytes"
5+
"errors"
56
"fmt"
67
"os"
78
"os/exec"
@@ -38,8 +39,23 @@ func (p *PackageManager) remSpecificInit() error {
3839
)
3940
}
4041

42+
func (p *PackageManager) remSpecificDisableGPGRepoCheckForGcloudRepo() error {
43+
44+
repoSpecPath := "/etc/yum.repos.d/google-cloud.repo"
45+
if _, err := os.Stat(repoSpecPath); errors.Is(err, os.ErrNotExist) {
46+
// Do nothing if repo file doesn't exist
47+
return nil
48+
}
49+
50+
return exec.Command("sed", "-i", "s/repo_gpgcheck=1/repo_gpgcheck=0/g", repoSpecPath).Run()
51+
}
52+
4153
func (p *PackageManager) remSpecificUpdatePackages() error {
4254

55+
if err := p.remSpecificDisableGPGRepoCheckForGcloudRepo(); err != nil {
56+
return err
57+
}
58+
4359
conflictingCronFile := "/etc/cron.daily/yumupdate.sh"
4460
removeConflictingCronFile := true
4561
_, err := os.Stat(conflictingCronFile)

0 commit comments

Comments
 (0)