Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: harvester/network-controller-harvester
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.2
Choose a base ref
...
head repository: harvester/network-controller-harvester
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.3.3
Choose a head ref
  • 3 commits
  • 26 files changed
  • 1 contributor

Commits on Jun 2, 2023

  1. Fix goling lint warning

    yaocw2020 authored and guangbochen committed Jun 2, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0fb7c34 View commit details

Commits on Jun 13, 2023

  1. Remove deprerated CRD nodenetworks

    yaocw2020 authored and futuretea committed Jun 13, 2023
    Copy the full SHA
    24bb90b View commit details
  2. Update generated codes

    yaocw2020 authored and futuretea committed Jun 13, 2023
    Copy the full SHA
    4df332a View commit details
Showing with 6,635 additions and 1,450 deletions.
  1. +2 −1 .golangci.json
  2. +7 −3 README.md
  3. +3 −3 cmd/network-helper/main.go
  4. +0 −159 manifests/crds/network.harvesterhci.io_nodenetworks.yaml
  5. +0 −66 manifests/daemonset.yaml
  6. +6,611 −0 manifests/dependency_crds/kubevirt.io_virtualmachineinstances.yaml
  7. +0 −86 manifests/deployment.yaml
  8. +0 −84 manifests/rbac.yaml
  9. +0 −114 pkg/apis/network.harvesterhci.io/v1beta1/nodenetwork.go
  10. +0 −170 pkg/apis/network.harvesterhci.io/v1beta1/zz_generated_deepcopy.go
  11. +0 −17 pkg/apis/network.harvesterhci.io/v1beta1/zz_generated_list_types.go
  12. +0 −3 pkg/apis/network.harvesterhci.io/v1beta1/zz_generated_register.go
  13. +0 −1 pkg/codegen/main.go
  14. +1 −1 pkg/controller/agent/linkmonitor/controller.go
  15. +4 −4 pkg/controller/agent/vlanconfig/controller.go
  16. +2 −6 pkg/controller/manager/clusternetwork/controller.go
  17. +1 −5 pkg/controller/manager/nad/controller.go
  18. +0 −4 ...ntset/versioned/typed/network.harvesterhci.io/v1beta1/fake/fake_network.harvesterhci.io_client.go
  19. +0 −133 pkg/generated/clientset/versioned/typed/network.harvesterhci.io/v1beta1/fake/fake_nodenetwork.go
  20. +0 −2 pkg/generated/clientset/versioned/typed/network.harvesterhci.io/v1beta1/generated_expansion.go
  21. +0 −5 ...rated/clientset/versioned/typed/network.harvesterhci.io/v1beta1/network.harvesterhci.io_client.go
  22. +0 −184 pkg/generated/clientset/versioned/typed/network.harvesterhci.io/v1beta1/nodenetwork.go
  23. +0 −4 pkg/generated/controllers/network.harvesterhci.io/v1beta1/interface.go
  24. +0 −376 pkg/generated/controllers/network.harvesterhci.io/v1beta1/nodenetwork.go
  25. +1 −5 pkg/network/iface/bond.go
  26. +3 −14 pkg/network/iface/link.go
3 changes: 2 additions & 1 deletion .golangci.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,8 @@
"gofmt",
"misspell",
"revive",
"prealloc"
"prealloc",
"gosec"
]
},
"run": {
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -6,9 +6,13 @@ Harvester Network Controller

A network controller helps to manage the host network configuration of the [Harvester](https://github.com/harvester/harvester) cluster.

## Manifests and Deploying
The `./manifests` folder contains useful YAML manifests to use for deploying and developing the Harvester network controller.
This simply YAML deployment creates a Daemonset using the `rancher/harvester-network-controller` container.
## How to deploy
```
$ helm repo add harvester https://charts.harvesterhci.io
$ helm repo update
$ kubectl apply -f https://raw.githubusercontent.com/harvester/network-controller-harvester/master/manifests/dependency_crds
$ helm install harvester-network-controller harvester/harvester-network-controller
```

## License
Copyright (c) 2020 [Rancher Labs, Inc.](http://rancher.com)
6 changes: 3 additions & 3 deletions cmd/network-helper/main.go
Original file line number Diff line number Diff line change
@@ -77,10 +77,10 @@ func run(c *cli.Context) error {
}
netHelper := helper.New(cni)

for _, selectedNetwork := range selectedNetworks {
networkConf := netHelper.GetVLANLayer3Network(&selectedNetwork, dhcpServerIPAddr)
for i := range selectedNetworks {
networkConf := netHelper.GetVLANLayer3Network(&selectedNetworks[i], dhcpServerIPAddr)

if err := netHelper.RecordToNad(&selectedNetwork, networkConf); err != nil {
if err := netHelper.RecordToNad(&selectedNetworks[i], networkConf); err != nil {
return fmt.Errorf("failed to record to nad cr, error: %w", err)
}
}
159 changes: 0 additions & 159 deletions manifests/crds/network.harvesterhci.io_nodenetworks.yaml

This file was deleted.

66 changes: 0 additions & 66 deletions manifests/daemonset.yaml

This file was deleted.

Loading