Skip to content
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 .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ release:
>
> | Kubernetes version | Minimum required |
> |--------------------|------------------|
> | `v1.34` | `>= 1.34.0` |
> | `v1.35` | `>= 1.35.0` |

Thanks to all the contributors! 🚀 🦄
checksum:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ IMG ?= $(IMG_BASE):$(VERSION)
CAPSULE_PROXY_IMG ?= $(REGISTRY)/$(IMG_BASE)

## Kubernetes Version Support
KUBERNETES_SUPPORTED_VERSION ?= "v1.34.0"
KUBERNETES_SUPPORTED_VERSION ?= "v1.35.0"

## Tool Binaries
KUBECTL ?= kubectl
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/globalproxysettings_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package v1beta1

import (
capsuleapi "github.com/projectcapsule/capsule/pkg/api"
capsulerbac "github.com/projectcapsule/capsule/pkg/api/rbac"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand All @@ -28,7 +28,7 @@ type GlobalSubjectSpec struct {

type GlobalSubject struct {
// Kind of tenant owner. Possible values are "User", "Group", and "ServiceAccount".
Kind capsuleapi.OwnerKind `json:"kind"`
Kind capsulerbac.OwnerKind `json:"kind"`
// Name of tenant owner.
Name string `json:"name"`
}
Expand Down
2 changes: 1 addition & 1 deletion api/v1beta1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var (
GroupVersion = schema.GroupVersion{Group: "capsule.clastix.io", Version: "v1beta1"}

// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
//nolint:gochecknoglobals
//nolint:gochecknoglobals,staticcheck
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

// AddToScheme adds the types in this group-version to the given scheme.
Expand Down
6 changes: 3 additions & 3 deletions api/v1beta1/proxysettings_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
package v1beta1

import (
capsuleapi "github.com/projectcapsule/capsule/pkg/api"
capsulerbac "github.com/projectcapsule/capsule/pkg/api/rbac"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

type OwnerSpec struct {
// Kind of tenant owner. Possible values are "User", "Group", and "ServiceAccount"
Kind capsuleapi.OwnerKind `json:"kind"`
Kind capsulerbac.OwnerKind `json:"kind"`
// Name of tenant owner.
Name string `json:"name"`
// Cluster Resources for tenant Owner.
ClusterResources []ClusterResource `json:"clusterResources,omitempty"`
// Deprecated: Use Global Proxy Settings instead (https://projectcapsule.dev/docs/proxy/proxysettings/#globalproxysettings)
//
// Proxy settings for tenant owner.
ProxyOperations []capsuleapi.ProxySettings `json:"proxySettings,omitempty"`
ProxyOperations []capsulerbac.ProxySettings `json:"proxySettings,omitempty"`
}

// ProxySettingSpec defines the additional Capsule Proxy settings for additional users of the Tenant.
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion e2e/distro/objects/capsule.flux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
chart:
spec:
chart: capsule
version: "0.12.4"
version: "0.13.0"
sourceRef:
kind: HelmRepository
name: projectcapsule
Expand Down
34 changes: 25 additions & 9 deletions e2e/namespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
capsuleapi "github.com/projectcapsule/capsule/pkg/api"
capsulerbac "github.com/projectcapsule/capsule/pkg/api/rbac"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"

Expand All @@ -22,16 +22,24 @@ var _ = Describe("Namespaces", func() {
Labels: e2eLabels(),
},
Spec: capsulev1beta2.TenantSpec{
Owners: capsuleapi.OwnerListSpec{
Owners: capsulerbac.OwnerListSpec{
{
CoreOwnerSpec: capsuleapi.CoreOwnerSpec{
UserSpec: capsuleapi.UserSpec{
CoreOwnerSpec: capsulerbac.CoreOwnerSpec{
UserSpec: capsulerbac.UserSpec{

Name: "alice",
Kind: "User",
},
},
},
{
CoreOwnerSpec: capsulerbac.CoreOwnerSpec{
UserSpec: capsulerbac.UserSpec{
Name: "wind:users",
Kind: "Group",
},
},
},
},
},
}
Expand All @@ -43,25 +51,33 @@ var _ = Describe("Namespaces", func() {
Labels: e2eLabels(),
},
Spec: capsulev1beta2.TenantSpec{
Owners: capsuleapi.OwnerListSpec{
Owners: capsulerbac.OwnerListSpec{
{
CoreOwnerSpec: capsuleapi.CoreOwnerSpec{
UserSpec: capsuleapi.UserSpec{
CoreOwnerSpec: capsulerbac.CoreOwnerSpec{
UserSpec: capsulerbac.UserSpec{

Name: "alice",
Kind: "User",
},
},
},
{
CoreOwnerSpec: capsuleapi.CoreOwnerSpec{
UserSpec: capsuleapi.UserSpec{
CoreOwnerSpec: capsulerbac.CoreOwnerSpec{
UserSpec: capsulerbac.UserSpec{

Name: "bob",
Kind: "User",
},
},
},
{
CoreOwnerSpec: capsulerbac.CoreOwnerSpec{
UserSpec: capsulerbac.UserSpec{
Name: "wind:users",
Kind: "Group",
},
},
},
},
},
}
Expand Down
6 changes: 3 additions & 3 deletions e2e/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"time"

. "github.com/onsi/gomega"
capsuleapi "github.com/projectcapsule/capsule/pkg/api"
capsulerbac "github.com/projectcapsule/capsule/pkg/api/rbac"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -91,15 +91,15 @@ func NewNamespace(name string, labels ...map[string]string) *corev1.Namespace {
}
}

func NamespaceCreation(ns *corev1.Namespace, owner capsuleapi.OwnerSpec, timeout time.Duration) AsyncAssertion {
func NamespaceCreation(ns *corev1.Namespace, owner capsulerbac.OwnerSpec, timeout time.Duration) AsyncAssertion {
cs := ownerClient(owner)
return Eventually(func() (err error) {
_, err = cs.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
return
}, timeout, defaultPollInterval)
}

func ownerClient(owner capsuleapi.OwnerSpec) (cs kubernetes.Interface) {
func ownerClient(owner capsulerbac.OwnerSpec) (cs kubernetes.Interface) {
c, err := config.GetConfig()
Expect(err).ToNot(HaveOccurred())
c.Impersonate.Groups = []string{"projectcapsule.dev", owner.Name}
Expand Down
91 changes: 49 additions & 42 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,35 +1,39 @@
module github.com/projectcapsule/capsule-proxy

go 1.26.0
go 1.26.3

require (
github.com/go-logr/logr v1.4.3
github.com/golang-jwt/jwt/v5 v5.3.1
github.com/gorilla/handlers v1.5.2
github.com/gorilla/mux v1.8.1
github.com/onsi/ginkgo/v2 v2.28.3
github.com/onsi/gomega v1.40.0
github.com/onsi/ginkgo/v2 v2.29.0
github.com/onsi/gomega v1.41.0
github.com/pkg/errors v0.9.1
github.com/projectcapsule/capsule v0.12.4
github.com/projectcapsule/capsule v0.13.0
github.com/prometheus/client_golang v1.23.2
github.com/prometheus/client_model v0.6.2
github.com/spf13/pflag v1.0.10
github.com/thediveo/enumflag v0.10.1
go.uber.org/zap v1.28.0
golang.org/x/net v0.55.0
k8s.io/api v0.34.3
k8s.io/apiextensions-apiserver v0.34.3
k8s.io/apimachinery v0.34.3
k8s.io/apiserver v0.34.3
k8s.io/client-go v0.34.3
k8s.io/component-base v0.34.3
k8s.io/kubectl v0.34.0
k8s.io/api v0.36.1
k8s.io/apiextensions-apiserver v0.36.1
k8s.io/apimachinery v0.36.1
k8s.io/apiserver v0.36.1
k8s.io/client-go v0.36.1
k8s.io/component-base v0.36.1
k8s.io/kubectl v0.36.1
k8s.io/utils v0.0.0-20260507154919-ff6756f316d2
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/controller-runtime v0.24.1
)

require (
github.com/Masterminds/semver/v3 v3.4.0 // indirect
dario.cat/mergo v1.0.2 // indirect
filippo.io/age v1.3.1 // indirect
filippo.io/hpke v0.4.0 // indirect
github.com/BurntSushi/toml v1.6.0 // indirect
github.com/Masterminds/semver/v3 v3.5.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand All @@ -38,61 +42,64 @@ require (
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/fsnotify/fsnotify v1.10.1 // indirect
github.com/fxamacker/cbor/v2 v2.9.2 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.22.4 // indirect
github.com/go-openapi/jsonreference v0.21.4 // indirect
github.com/go-openapi/swag v0.25.4 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
github.com/go-openapi/swag/loading v0.25.4 // indirect
github.com/go-openapi/swag/mangling v0.25.4 // indirect
github.com/go-openapi/swag/netutils v0.25.4 // indirect
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/go-openapi/jsonpointer v0.23.1 // indirect
github.com/go-openapi/jsonreference v0.21.5 // indirect
github.com/go-openapi/swag v0.26.0 // indirect
github.com/go-openapi/swag/cmdutils v0.26.0 // indirect
github.com/go-openapi/swag/conv v0.26.0 // indirect
github.com/go-openapi/swag/fileutils v0.26.0 // indirect
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
github.com/go-openapi/swag/jsonutils v0.26.0 // indirect
github.com/go-openapi/swag/loading v0.26.0 // indirect
github.com/go-openapi/swag/mangling v0.26.0 // indirect
github.com/go-openapi/swag/netutils v0.26.0 // indirect
github.com/go-openapi/swag/stringutils v0.26.0 // indirect
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
github.com/go-sprout/sprout v1.0.3 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20260402051712-545e8a4df936 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.20.1 // indirect
github.com/spf13/cast v1.10.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.opentelemetry.io/otel v1.39.0 // indirect
go.opentelemetry.io/otel/trace v1.39.0 // indirect
go.opentelemetry.io/otel v1.44.0 // indirect
go.opentelemetry.io/otel/trace v1.44.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.52.0 // indirect
golang.org/x/mod v0.35.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sync v0.20.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/term v0.43.0 // indirect
golang.org/x/text v0.37.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/tools v0.44.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kube-openapi v0.0.0-20260520065146-aa012df4f4af // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading