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.

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

ci/test: bump various versions #3162

Merged
merged 1 commit into from
Aug 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ concurrency:

env:
GO_VERSION: ''
GOSEC_VERSION: '2.16.0'
GOSEC_VERSION: '2.17.0'

jobs:
filter:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-x86-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ concurrency:

env:
GO_VERSION: ''
GOSEC_VERSION: '2.16.0'
HELM_VERSION: v3.12.2
GOSEC_VERSION: '2.17.0'
HELM_VERSION: v3.12.3
SUBMARINER_VERSION: '0.14.6'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ concurrency:

env:
GO_VERSION: ''
HELM_VERSION: v3.12.2
HELM_VERSION: v3.12.3
SUBMARINER_VERSION: '0.14.6'

jobs:
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/
KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml
KUBEVIRT_TEST_YAML = https://kubevirt.io/labs/manifests/vm.yaml

CILIUM_VERSION = 1.13.4
CILIUM_VERSION = 1.14.1
CILIUM_IMAGE_REPO = quay.io/cilium/cilium

CERT_MANAGER_VERSION = v1.12.2
CERT_MANAGER_VERSION = v1.12.3
CERT_MANAGER_CONTROLLER = quay.io/jetstack/cert-manager-controller:$(CERT_MANAGER_VERSION)
CERT_MANAGER_CAINJECTOR = quay.io/jetstack/cert-manager-cainjector:$(CERT_MANAGER_VERSION)
CERT_MANAGER_WEBHOOK = quay.io/jetstack/cert-manager-webhook:$(CERT_MANAGER_VERSION)
Expand All @@ -59,7 +59,7 @@ DEEPFLOW_CHART_REPO = https://deepflow-ce.oss-cn-beijing.aliyuncs.com/chart/stab
DEEPFLOW_IMAGE_REPO = registry.cn-beijing.aliyuncs.com/deepflow-ce
DEEPFLOW_GRAFANA_PORT = 30080

KWOK_VERSION = v0.3.0
KWOK_VERSION = v0.4.0
KWOK_IMAGE = registry.k8s.io/kwok/kwok:$(KWOK_VERSION)

VPC_NAT_GW_IMG = $(REGISTRY)/vpc-nat-gateway:$(VERSION)
Expand Down
1 change: 1 addition & 0 deletions pkg/ovs/ovn-nb-acl.go
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,7 @@ func (c *ovnNbClient) GetAcl(parent, direction, priority, match string, ignoreNo
return nil, fmt.Errorf("more than one acl with same 'parent %s direction %s priority %s match %s'", parent, direction, priority, match)
}

// #nosec G602
return &aclList[0], nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/ovs/ovn-nb-load_balancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ func (c *ovnNbClient) GetLoadBalancer(lbName string, ignoreNotFound bool) (*ovnn
return nil, fmt.Errorf("more than one load balancer with same name %q", lbName)
}

// #nosec G602
return &lbList[0], nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/ovs/ovn-nb-logical_router.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ func (c *ovnNbClient) GetLogicalRouter(lrName string, ignoreNotFound bool) (*ovn
return nil, fmt.Errorf("more than one logical router with same name %q", lrName)
}

// #nosec G602
return &lrList[0], nil
}

Expand Down
1 change: 1 addition & 0 deletions pkg/ovs/ovn-nb-logical_switch.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ func (c *ovnNbClient) GetLogicalSwitch(lsName string, ignoreNotFound bool) (*ovn
return nil, fmt.Errorf("more than one logical switch with same name %q", lsName)
}

// #nosec G602
return &lsList[0], nil
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/ovs/ovn-sb-chassis.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ func (c *ovnSbClient) GetChassisByHost(nodeName string) (*ovnsb.Chassis, error)
klog.Error(err)
return nil, err
}

// #nosec G602
return &chassisList[0], nil
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/util/net.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ import (
kubeovnv1 "github.com/kubeovn/kube-ovn/pkg/apis/kubeovn/v1"
)

var vpcExternalNet = "ovn-vpc-external-network"
// #nosec G101
const vpcExternalNet = "ovn-vpc-external-network"

const (
IPv4Multicast = "224.0.0.0/4"
Expand Down