mirror of
https://github.com/k8snetworkplumbingwg/whereabouts.git
synced 2025-06-03 06:42:26 +00:00

* build: generate ip pool clientSet/informers/listers
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* vendor: update vendor stuff
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* build: vendor net-attach-def-client types
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* config: look for the whereabouts config file in multiple places
The reconciler controller will have access to the whereabouts
configuration via a mount point. As such, we need a way to specify its
path.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* reconcile-loop: requires the IP ranges in normalized format
The IP reconcile loop also requires the IP ranges in a normalized
format; as such, we export it into a function, which will be used in a
follow-up commit.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* config: allow IPAM config parsing from a NetConfList
Currently whereabouts is only able to parse network configurations in
the strict [0] format - i.e. **do not accept** a plugin list - [1].
The `ip-control-loop` must recover the full plugin configuration, which
may be in the network configuration format.
This commit allows whereabouts to now understand both formats.
Furthermore, the current CNI release - v1.0.Z - removed the support for
[0], meaning that only the configuration list format is now supported
[2].
[0] - https://github.com/containernetworking/cni/blob/v0.8.1/SPEC.md#network-configuration
[1] - https://github.com/containernetworking/cni/blob/v0.8.1/SPEC.md#network-configuration-lists
[2] - https://github.com/containernetworking/cni/blob/master/SPEC.md#released-versions
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* reconcile-loop: add a controller
Listen to pod deletion, and for every deleted pod, assure their IPs
are gone.
The rough algorithm goes like this:
- for every network-status in the pod's annotations:
- read associated net-attach-def from the k8s API
- extract the range from the net-attach-def
- find the corresponding IP pool
- look for allocations belonging to the deleted pod
- delete them using `IPManagement(..., types.Deallocate, ...)`
All the API reads go through the informer cache, which is kept updated
whenever the objects are updated on the API.
The dockerfiles are also updated, to ship this new binary.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* e2e tests: remove manual cluster reconciliation
This would leave the `ip-control-loop` as the reconciliation tool.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* unit tests: assure stale IPAllocation cleanup
This commit adds a unit where it is checked that the pod deletion leads
to the cleanup of a stale IP address.
This commit features the automatic provisioning of the controller informer cache
with the data present on the fake clientset tracker (the "fake" datastore).
This way, users can just create the client with provisioned data, and
that'll trickle down to the informer cache of the pod controller.
Because the `network-attachment-definitions` resources feature dashes,
the heuristic function that guesses - yes, guesses. very deterministic
... - the name of the resource can't be used - [0]. As such, it was
needed to create an alternate `newFakeNetAttachDefClient` where it is
possible to specify the correct resource name.
[0] - 2fd7267afc/vendor/k8s.io/client-go/testing/fixture.go (L331)
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* unit tests: move helper funcs to other files
The helper files are tagged with the `test` build tag, to prevent them
from being shipped on the production code binary.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* control loop, queueing: use a rate-limiting queue
Using a queue allows us to re-queue errors.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* control loop: add IPAllocation cleanup related events
Adds two new events related to garbage collection of the whereabouts IP
addresses:
- when an IP address is garbage collected
- when a cleanup operation fails and is not re-queued
The former event looks like:
```
116s Normal IPAddressGarbageCollected pod/macvlan1-worker1 \
successful cleanup of IP address [192.168.2.1] from network \
whereabouts-conf
```
The latter event looks like:
```
10s Warning IPAddressGarbageCollectionFailed failed to garbage \
collect addresses for pod default/macvlan1-worker1
```
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* e2e tests: check out statefulset scenarios
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* e2e tests: test different scale up/down order and instance deltas
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* ci: test e2e bash scripts last
These ugly tests do not cleanup after themselves; this way, the golang
based tests (which **do** cleanup after themselves) will not be impacted by
these left-overs.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* ip control loop, unit tests: test negative scenarios
Check the event thrown when a request is dropped from the queue, and
assure reconciling an allocation is impossible without having access to
the attachment configuration data.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* e2e tests: test fix for issue #182
Issue [0] reports an error when a pod associated to a `StatefulSet`
whose IPPool is already full is deleted. According to it, the new pod -
scheduled by the `StatefulSet` - cannot run because the IPPool is
already full, and the old pod's IP cannot be garbage collected because
we match by pod reference - and the "new" pod is stuck in `creating`
phase.
[0] - https://github.com/k8snetworkplumbingwg/whereabouts/issues/182
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* ip-control-loop: strip pod before queueing it
The ip reconcile loop only requires the pod metadata and its network
status annotatations to garbage collect the stale IP addresses.
As such, we remove the status and spec parameters from the pod before
queueing it.
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
* reconcile-loop: focus on networks w/ whereabouts IPAM type
Signed-off-by: Miguel Duarte Barroso <mdbarroso@redhat.com>
103 lines
3.5 KiB
Go
103 lines
3.5 KiB
Go
// Copyright 2020 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package execabs is a drop-in replacement for os/exec
|
|
// that requires PATH lookups to find absolute paths.
|
|
// That is, execabs.Command("cmd") runs the same PATH lookup
|
|
// as exec.Command("cmd"), but if the result is a path
|
|
// which is relative, the Run and Start methods will report
|
|
// an error instead of running the executable.
|
|
//
|
|
// See https://blog.golang.org/path-security for more information
|
|
// about when it may be necessary or appropriate to use this package.
|
|
package execabs
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"reflect"
|
|
"unsafe"
|
|
)
|
|
|
|
// ErrNotFound is the error resulting if a path search failed to find an executable file.
|
|
// It is an alias for exec.ErrNotFound.
|
|
var ErrNotFound = exec.ErrNotFound
|
|
|
|
// Cmd represents an external command being prepared or run.
|
|
// It is an alias for exec.Cmd.
|
|
type Cmd = exec.Cmd
|
|
|
|
// Error is returned by LookPath when it fails to classify a file as an executable.
|
|
// It is an alias for exec.Error.
|
|
type Error = exec.Error
|
|
|
|
// An ExitError reports an unsuccessful exit by a command.
|
|
// It is an alias for exec.ExitError.
|
|
type ExitError = exec.ExitError
|
|
|
|
func relError(file, path string) error {
|
|
return fmt.Errorf("%s resolves to executable in current directory (.%c%s)", file, filepath.Separator, path)
|
|
}
|
|
|
|
// LookPath searches for an executable named file in the directories
|
|
// named by the PATH environment variable. If file contains a slash,
|
|
// it is tried directly and the PATH is not consulted. The result will be
|
|
// an absolute path.
|
|
//
|
|
// LookPath differs from exec.LookPath in its handling of PATH lookups,
|
|
// which are used for file names without slashes. If exec.LookPath's
|
|
// PATH lookup would have returned an executable from the current directory,
|
|
// LookPath instead returns an error.
|
|
func LookPath(file string) (string, error) {
|
|
path, err := exec.LookPath(file)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if filepath.Base(file) == file && !filepath.IsAbs(path) {
|
|
return "", relError(file, path)
|
|
}
|
|
return path, nil
|
|
}
|
|
|
|
func fixCmd(name string, cmd *exec.Cmd) {
|
|
if filepath.Base(name) == name && !filepath.IsAbs(cmd.Path) {
|
|
// exec.Command was called with a bare binary name and
|
|
// exec.LookPath returned a path which is not absolute.
|
|
// Set cmd.lookPathErr and clear cmd.Path so that it
|
|
// cannot be run.
|
|
lookPathErr := (*error)(unsafe.Pointer(reflect.ValueOf(cmd).Elem().FieldByName("lookPathErr").Addr().Pointer()))
|
|
if *lookPathErr == nil {
|
|
*lookPathErr = relError(name, cmd.Path)
|
|
}
|
|
cmd.Path = ""
|
|
}
|
|
}
|
|
|
|
// CommandContext is like Command but includes a context.
|
|
//
|
|
// The provided context is used to kill the process (by calling os.Process.Kill)
|
|
// if the context becomes done before the command completes on its own.
|
|
func CommandContext(ctx context.Context, name string, arg ...string) *exec.Cmd {
|
|
cmd := exec.CommandContext(ctx, name, arg...)
|
|
fixCmd(name, cmd)
|
|
return cmd
|
|
|
|
}
|
|
|
|
// Command returns the Cmd struct to execute the named program with the given arguments.
|
|
// See exec.Command for most details.
|
|
//
|
|
// Command differs from exec.Command in its handling of PATH lookups,
|
|
// which are used when the program name contains no slashes.
|
|
// If exec.Command would have returned an exec.Cmd configured to run an
|
|
// executable from the current directory, Command instead
|
|
// returns an exec.Cmd that will return an error from Start or Run.
|
|
func Command(name string, arg ...string) *exec.Cmd {
|
|
cmd := exec.Command(name, arg...)
|
|
fixCmd(name, cmd)
|
|
return cmd
|
|
}
|