Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use encryption models from Cilium dependency. #2318

Merged
merged 1 commit into from
Feb 21, 2024
Merged

Use encryption models from Cilium dependency. #2318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions encrypt/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

package encrypt

import "github.com/go-openapi/strfmt"

type clusterStatus struct {
TotalNodeCount int `json:"total-node-count,omitempty"`
EncDisabledNodeCount int `json:"enc-disabled-node-count,omitempty"`
Expand All @@ -16,45 +14,3 @@ type clusterStatus struct {
XfrmErrors map[string]int64 `json:"xfrm-errors,omitempty"`
XfrmErrorNodeCount map[string]int64 `json:"xfrm-error-node-count,omitempty"`
}

// EncryptionStatus Status of transparent encryption
type EncryptionStatus struct {
Ipsec *IPsecStatus `json:"ipsec,omitempty"`
Mode string `json:"mode,omitempty"`
Msg string `json:"msg,omitempty"`
Wireguard *WireguardStatus `json:"wireguard,omitempty"`
}

// IPsecStatus Status of the IPsec agent
type IPsecStatus struct {
DecryptInterfaces []string `json:"decrypt-interfaces"`
ErrorCount int64 `json:"error-count,omitempty"`
KeysInUse int64 `json:"keys-in-use,omitempty"`
MaxSeqNumber string `json:"max-seq-number,omitempty"`
XfrmErrors map[string]int64 `json:"xfrm-errors,omitempty"`
}

// WireguardStatus Status of the WireGuard agent
type WireguardStatus struct {
Interfaces []*WireguardInterface `json:"interfaces"`
NodeEncryption string `json:"node-encryption,omitempty"`
}

// WireguardInterface Status of a WireGuard interface
type WireguardInterface struct {
ListenPort int64 `json:"listen-port,omitempty"`
Name string `json:"name,omitempty"`
PeerCount int64 `json:"peer-count,omitempty"`
Peers []*WireguardPeer `json:"peers"`
PublicKey string `json:"public-key,omitempty"`
}

// WireguardPeer Status of a WireGuard peer
type WireguardPeer struct {
AllowedIps []string `json:"allowed-ips"`
Endpoint string `json:"endpoint,omitempty"`
LastHandshakeTime strfmt.DateTime `json:"last-handshake-time,omitempty"`
PublicKey string `json:"public-key,omitempty"`
TransferRx int64 `json:"transfer-rx,omitempty"`
TransferTx int64 `json:"transfer-tx,omitempty"`
}
43 changes: 22 additions & 21 deletions encrypt/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"strconv"
"strings"

"github.com/cilium/cilium/api/v1/models"
corev1 "k8s.io/api/core/v1"

"github.com/cilium/cilium-cli/defaults"
Expand All @@ -36,11 +37,11 @@ func (s *Encrypt) GetEncryptStatus(ctx context.Context) error {
return s.writeStatus(res)
}

func (s *Encrypt) fetchEncryptStatusConcurrently(ctx context.Context, pods []corev1.Pod) (map[string]EncryptionStatus, error) {
func (s *Encrypt) fetchEncryptStatusConcurrently(ctx context.Context, pods []corev1.Pod) (map[string]models.EncryptionStatus, error) {
// res contains data returned from cilium pod
type res struct {
nodeName string
status EncryptionStatus
status models.EncryptionStatus
err error
}
resCh := make(chan res)
Expand All @@ -60,7 +61,7 @@ func (s *Encrypt) fetchEncryptStatusConcurrently(ctx context.Context, pods []cor

// read from the channel, on error, store error and continue to next node
var err error
data := make(map[string]EncryptionStatus)
data := make(map[string]models.EncryptionStatus)
for range pods {
r := <-resCh
if r.err != nil {
Expand All @@ -72,42 +73,42 @@ func (s *Encrypt) fetchEncryptStatusConcurrently(ctx context.Context, pods []cor
return data, err
}

func (s *Encrypt) fetchEncryptStatusFromPod(ctx context.Context, pod corev1.Pod) (EncryptionStatus, error) {
func (s *Encrypt) fetchEncryptStatusFromPod(ctx context.Context, pod corev1.Pod) (models.EncryptionStatus, error) {
cmd := []string{"cilium", "encrypt", "status", "-o", "json"}
output, err := s.client.ExecInPod(ctx, pod.Namespace, pod.Name, defaults.AgentContainerName, cmd)
if err != nil {
return EncryptionStatus{}, fmt.Errorf("failed to fetch encryption status from %s: %v", pod.Name, err)
return models.EncryptionStatus{}, fmt.Errorf("failed to fetch encryption status from %s: %v", pod.Name, err)
}
encStatus, err := nodeStatusFromOutput(output.String())
if err != nil {
return EncryptionStatus{}, fmt.Errorf("failed to parse encryption status from %s: %v", pod.Name, err)
return models.EncryptionStatus{}, fmt.Errorf("failed to parse encryption status from %s: %v", pod.Name, err)
}
return encStatus, nil
}

func nodeStatusFromOutput(output string) (EncryptionStatus, error) {
func nodeStatusFromOutput(output string) (models.EncryptionStatus, error) {
if !json.Valid([]byte(output)) {
res, err := nodeStatusFromText(output)
if err != nil {
return EncryptionStatus{}, fmt.Errorf("failed to parse text: %v", err)
return models.EncryptionStatus{}, fmt.Errorf("failed to parse text: %v", err)
}
return res, nil
}
encStatus := EncryptionStatus{}
encStatus := models.EncryptionStatus{}
if err := json.Unmarshal([]byte(output), &encStatus); err != nil {
return EncryptionStatus{}, fmt.Errorf("failed to unmarshal json: %v", err)
return models.EncryptionStatus{}, fmt.Errorf("failed to unmarshal json: %v", err)
}
return encStatus, nil
}

func nodeStatusFromText(str string) (EncryptionStatus, error) {
res := EncryptionStatus{
Ipsec: &IPsecStatus{
func nodeStatusFromText(str string) (models.EncryptionStatus, error) {
res := models.EncryptionStatus{
Ipsec: &models.IPsecStatus{
DecryptInterfaces: make([]string, 0),
XfrmErrors: make(map[string]int64),
},
Wireguard: &WireguardStatus{
Interfaces: make([]*WireguardInterface, 0),
Wireguard: &models.WireguardStatus{
Interfaces: make([]*models.WireguardInterface, 0),
},
}
lines := strings.Split(str, "\n")
Expand All @@ -129,27 +130,27 @@ func nodeStatusFromText(str string) (EncryptionStatus, error) {
case "Keys in use":
keys, err := strconv.Atoi(value)
if err != nil {
return EncryptionStatus{}, fmt.Errorf("invalid number 'Keys in use' [%s]: %v", value, err)
return models.EncryptionStatus{}, fmt.Errorf("invalid number 'Keys in use' [%s]: %v", value, err)
}
res.Ipsec.KeysInUse = int64(keys)
case "Errors":
count, err := strconv.Atoi(value)
if err != nil {
return EncryptionStatus{}, fmt.Errorf("invalid number 'Errors' [%s]: %v", value, err)
return models.EncryptionStatus{}, fmt.Errorf("invalid number 'Errors' [%s]: %v", value, err)
}
res.Ipsec.ErrorCount = int64(count)
default:
count, err := strconv.Atoi(value)
if err != nil {
return EncryptionStatus{}, fmt.Errorf("invalid number '%s' [%s]: %v", key, value, err)
return models.EncryptionStatus{}, fmt.Errorf("invalid number '%s' [%s]: %v", key, value, err)
}
res.Ipsec.XfrmErrors[key] = int64(count)
}
}
return res, nil
}

func (s *Encrypt) writeStatus(res map[string]EncryptionStatus) error {
func (s *Encrypt) writeStatus(res map[string]models.EncryptionStatus) error {
if s.params.PerNodeDetails {
for nodeName, n := range res {
if err := printStatus(nodeName, n, s.params.Output); err != nil {
Expand All @@ -165,7 +166,7 @@ func (s *Encrypt) writeStatus(res map[string]EncryptionStatus) error {
return cs.printStatus(s.params.Output)
}

func clusterNodeStatus(res map[string]EncryptionStatus) (clusterStatus, error) {
func clusterNodeStatus(res map[string]models.EncryptionStatus) (clusterStatus, error) {
cs := clusterStatus{
TotalNodeCount: len(res),
IPsecKeysInUseNodeCount: make(map[int64]int64),
Expand Down Expand Up @@ -237,7 +238,7 @@ func (c clusterStatus) printStatus(format string) error {
return err
}

func printStatus(nodeName string, n EncryptionStatus, format string) error {
func printStatus(nodeName string, n models.EncryptionStatus, format string) error {
if format == status.OutputJSON {
return printJSONStatus(n)
}
Expand Down
Loading
Loading