Skip to content

Commit

Permalink
v1alpha1: one port forward object may contain multiple forwards (#4489)
Browse files Browse the repository at this point in the history
  • Loading branch information
Maia McCormick committed Apr 30, 2021
1 parent 1d7293d commit 325dbf8
Show file tree
Hide file tree
Showing 6 changed files with 569 additions and 322 deletions.
2 changes: 1 addition & 1 deletion internal/engine/upper_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3715,7 +3715,7 @@ func TestPortForwardActions(t *testing.T) {

pfA := &portforward.PortForward{
ObjectMeta: metav1.ObjectMeta{Name: pfAName},
Spec: portforward.PortForwardSpec{Pod: "pod-A"},
Spec: portforward.PortForwardSpec{PodName: "pod-A"},
}

f.Start([]model.Manifest{})
Expand Down
749 changes: 466 additions & 283 deletions pkg/apis/core/v1alpha1/generated.pb.go

Large diffs are not rendered by default.

28 changes: 17 additions & 11 deletions pkg/apis/core/v1alpha1/generated.proto

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions pkg/apis/core/v1alpha1/portforward_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,25 @@ type PortForwardList struct {
// PortForwardSpec defines the desired state of PortForward
type PortForwardSpec struct {
// The name of the pod to port forward to/from. Required.
Pod string `json:"pod" protobuf:"bytes,1,opt,name=pod"`
PodName string `json:"podName" protobuf:"bytes,1,opt,name=podName"`

// The namespace of the pod to port forward to/from. Defaults to the kubecontext default namespace.
//
// +optional
Namespace string `json:"namespace,omitempty" protobuf:"bytes,2,opt,name=namespace"`

// The port on the Kubernetes pod to connect to. Required.
ContainerPort int32 `json:"containerPort" protobuf:"varint,3,opt,name=containerPort"`
// One or more port forwards to execute on the given pod. Required.
Forwards []Forward `json:"forwards" protobuf:"bytes,3,rep,name=forwards"`
}

// Forward defines a port forward to execute on a given pod.
type Forward struct {
// The port to expose on the current machine. Required.
LocalPort int32 `json:"localPort" protobuf:"varint,4,opt,name=localPort"`

// The port on the Kubernetes pod to connect to. Required.
ContainerPort int32 `json:"containerPort" protobuf:"varint,3,opt,name=containerPort"`

// Optional host to bind to on the current machine (localhost by default)
//
// +optional
Expand Down
23 changes: 22 additions & 1 deletion pkg/apis/core/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 54 additions & 23 deletions pkg/openapi/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 325dbf8

Please sign in to comment.