Skip to content
GitLab
Next
Projects
Groups
Snippets
Help
Loading...
Help
See what's new at GitLab
4
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
GitLab Operator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
26
Issues
26
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GitLab.org
OpenShift
GitLab Operator
Commits
f26dbe33
Commit
f26dbe33
authored
Sep 14, 2020
by
Edmund Ochieng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add gitlab managed and secured namespaces
parent
ef6a2ba4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
0 deletions
+52
-0
config/rbac/role.yaml
config/rbac/role.yaml
+12
-0
controllers/gitlab_controller.go
controllers/gitlab_controller.go
+40
-0
No files found.
config/rbac/role.yaml
View file @
f26dbe33
...
...
@@ -138,6 +138,18 @@ rules:
-
patch
-
update
-
watch
-
apiGroups
:
-
"
"
resources
:
-
namespaces
verbs
:
-
create
-
delete
-
get
-
list
-
patch
-
update
-
watch
-
apiGroups
:
-
"
"
resources
:
...
...
controllers/gitlab_controller.go
View file @
f26dbe33
...
...
@@ -56,6 +56,7 @@ type GitLabReconciler struct {
// +kubebuilder:rbac:groups=apps.gitlab.com,resources=gitlabs/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=namespaces,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=configmaps,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
...
...
@@ -83,6 +84,10 @@ func (r *GitLabReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
return
ctrl
.
Result
{},
err
}
if
err
:=
r
.
reconcileNamespaces
(
ctx
);
err
!=
nil
{
return
ctrl
.
Result
{},
err
}
if
err
:=
r
.
reconcileConfigMaps
(
gitlab
);
err
!=
nil
{
return
ctrl
.
Result
{},
err
}
...
...
@@ -689,3 +694,38 @@ func (r *GitLabReconciler) reconcileHPA(ctx context.Context, deployment *appsv1.
return
nil
}
func
(
r
*
GitLabReconciler
)
reconcileNamespaces
(
ctx
context
.
Context
)
error
{
secured
:=
&
corev1
.
Namespace
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"gitlab-secured-apps"
,
},
}
if
err
:=
r
.
createNamespace
(
ctx
,
secured
);
err
!=
nil
{
return
err
}
managed
:=
&
corev1
.
Namespace
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"gitlab-managed-apps"
,
},
}
return
r
.
createNamespace
(
ctx
,
managed
)
}
func
(
r
*
GitLabReconciler
)
createNamespace
(
ctx
context
.
Context
,
namespace
*
corev1
.
Namespace
)
error
{
found
:=
&
corev1
.
Namespace
{}
err
:=
r
.
Get
(
ctx
,
types
.
NamespacedName
{
Name
:
namespace
.
Name
},
found
)
if
err
!=
nil
{
// create namespace if doesnt exist
if
errors
.
IsNotFound
(
err
)
{
return
r
.
Create
(
ctx
,
namespace
)
}
return
err
}
return
nil
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment