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 backend/kubernetes/resources/namespace.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func CreateNamespace(ctx context.Context, client client.Client, generateNamePref
name := identityHash(identity)
namespace := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%s", generateNamePrefix, name),
Name: fmt.Sprintf("%s%s", generateNamePrefix, name),
Annotations: map[string]string{
IdentityAnnotationKey: identity,
AuthorAnnotationKey: author,
Expand Down
4 changes: 2 additions & 2 deletions backend/kubernetes/resources/namespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func TestCreateNamespace(t *testing.T) {
},
{
name: "create new namespace with generateName already ending with dash",
generateName: "test-ns-",
generateName: "test-ns",
identity: "test-id-456",
author: "alice",
wantErr: false,
Expand Down Expand Up @@ -98,7 +98,7 @@ func TestCreateNamespace(t *testing.T) {

expectedPrefix := tt.generateName
expectedHash := expectedIdentityHash(tt.identity)
expectedName := fmt.Sprintf("%s-%s", expectedPrefix, expectedHash)
expectedName := fmt.Sprintf("%s%s", expectedPrefix, expectedHash)

if result.Name != expectedName {
t.Errorf("CreateNamespace() name = %v, expected %v", result.Name, expectedName)
Expand Down
2 changes: 1 addition & 1 deletion backend/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func NewOptions() *Options {

ExtraOptions: ExtraOptions{
Provider: "kubernetes",
NamespacePrefix: "cluster",
NamespacePrefix: "cluster-",
PrettyName: "Backend",
ConsumerScope: string(kubebindv1alpha2.NamespacedScope),
ClusterScopedIsolation: string(kubebindv1alpha2.IsolationPrefixed),
Expand Down
3 changes: 0 additions & 3 deletions deploy/examples/template-cowboys.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ spec:
labelSelector:
matchLabels:
app: cowboy
namespaces:
- name: wild-west

4 changes: 1 addition & 3 deletions deploy/examples/template-sheriffs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ spec:
group: wildwest.dev
jsonPath:
name: spec.secretRefs.#.name
namespace: spec.secretRefs.#.namespace
namespaces:
- name: wild-west
namespace: spec.secretRefs.#.namespace
1,067 changes: 636 additions & 431 deletions test/e2e/bind/happy-case_test.go

Large diffs are not rendered by default.

Loading