Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: properly set the AccessRequest type on creation #46

Merged
merged 2 commits into from
Oct 24, 2024
Merged

fix: properly set the AccessRequest type on creation #46

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ede20c
fix: properly set the AccessRequest type on creation
leoluz Oct 24, 2024
8499b1c
fix test
leoluz Oct 24, 2024
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
15 changes: 15 additions & 0 deletions config/samples/ephemeral-access_v1alpha1_accessbinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: ephemeral-access.argoproj-labs.io/v1alpha1
kind: AccessBinding
metadata:
labels:
app.kubernetes.io/name: argocd-ephemeral-access
app.kubernetes.io/managed-by: kustomize
name: some-access-binding
spec:
roleTemplateRef:
name: devops
subjects:
- group1
if: "true"
ordinal: 1
friendlyName: "Devops (AB)"
11 changes: 9 additions & 2 deletions config/samples/ephemeral-access_v1alpha1_roletemplate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ metadata:
labels:
app.kubernetes.io/name: argocd-ephemeral-access
app.kubernetes.io/managed-by: kustomize
name: roletemplate-sample
name: devops
spec:
# TODO(user): Add fields here
description: write permission in application {{.Application}}
name: "DevOps (Write)"
policies:
- p, {{.Role}}, applications, sync, {{.Project}}/{{.Application}}, allow
- p, {{.Role}}, applications, get, {{.Project}}/{{.Application}}, deny
- p, {{.Role}}, applications, action/*, {{.Project}}/{{.Application}}, allow
- p, {{.Role}}, applications, delete/*/Pod/*, {{.Project}}/{{.Application}}, allow
- p, {{.Role}}, logs, get, {{.Project}}/{{.Namespace}}/{{.Application}}, allow
5 changes: 5 additions & 0 deletions internal/backend/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ func (s *DefaultService) matchSubject(subjects, groups []string) bool {
func (s *DefaultService) CreateAccessRequest(ctx context.Context, key *AccessRequestKey, binding *api.AccessBinding) (*api.AccessRequest, error) {
roleName := binding.Spec.RoleTemplateRef.Name
ar := &api.AccessRequest{
TypeMeta: metav1.TypeMeta{
Kind: "AccessRequest",
APIVersion: "v1alpha1",
},
ObjectMeta: metav1.ObjectMeta{
Namespace: key.Namespace,
GenerateName: getAccessRequestPrefix(key.Username, roleName),
Expand Down Expand Up @@ -213,6 +217,7 @@ func getAccessRequestPrefix(username, roleName string) string {
}

func (s *DefaultService) GetApplication(ctx context.Context, name string, namespace string) (*unstructured.Unstructured, error) {
s.logger.Debug("Getting application", "name", name, "namespace", namespace)
app, err := s.k8s.GetApplication(ctx, name, namespace)
if err != nil {
if apierrors.IsNotFound(err) {
Expand Down
Loading