Commit 6e7679e8 authored by Edmund Ochieng's avatar Edmund Ochieng

Merge branch 'manual_deploy' into 'master'

Manual deploy

Closes #21

See merge request !28
parents c7bdb4fa 3b08cfa9
Pipeline #194167395 passed with stages
in 16 minutes and 55 seconds
......@@ -186,6 +186,10 @@ type GitLabStatus struct {
// +kubebuilder:object:root=true
// +kubebuilder:resource:shortName=gl
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="STATUS",type=string,JSONPath=`.status.phase`
// +kubebuilder:printcolumn:name="REDIS",type=string,JSONPath=`.status.health.redis`
// +kubebuilder:printcolumn:name="DATABASE",type=string,JSONPath=`.status.health.database`
// +kubebuilder:printcolumn:name="CONSOLE",type=string,JSONPath=`.status.health.workhorse`
// +operator-sdk:csv:customresourcedefinitions:displayName="GitLab"
// +operator-sdk:csv:customresourcedefinitions:resources={{ConfigMap,v1,""},{Secret,v1,""},{Service,v1,""},{Pod,v1,""},{Deployment,v1,""},{StatefulSet,v1,""},{PersistentVolumeClaim,v1,""},{Runner,v1beta1,""},{GLBackup,v1beta1,""}}
......
......@@ -6,6 +6,19 @@ metadata:
creationTimestamp: null
name: gitlabs.apps.gitlab.com
spec:
additionalPrinterColumns:
- JSONPath: .status.phase
name: STATUS
type: string
- JSONPath: .status.health.redis
name: REDIS
type: string
- JSONPath: .status.health.database
name: DATABASE
type: string
- JSONPath: .status.health.workhorse
name: CONSOLE
type: string
group: apps.gitlab.com
names:
kind: GitLab
......
......@@ -556,6 +556,18 @@ spec:
- patch
- update
- watch
- apiGroups:
- k8s.nginx.org
resources:
- nginxingresscontrollers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
......
......@@ -8,6 +8,19 @@ metadata:
creationTimestamp: null
name: gitlabs.apps.gitlab.com
spec:
additionalPrinterColumns:
- JSONPath: .status.phase
name: STATUS
type: string
- JSONPath: .status.health.redis
name: REDIS
type: string
- JSONPath: .status.health.database
name: DATABASE
type: string
- JSONPath: .status.health.workhorse
name: CONSOLE
type: string
group: apps.gitlab.com
names:
kind: GitLab
......
......@@ -6,6 +6,19 @@ metadata:
creationTimestamp: null
name: gitlabs.apps.gitlab.com
spec:
additionalPrinterColumns:
- JSONPath: .status.phase
name: STATUS
type: string
- JSONPath: .status.health.redis
name: REDIS
type: string
- JSONPath: .status.health.database
name: DATABASE
type: string
- JSONPath: .status.health.workhorse
name: CONSOLE
type: string
group: apps.gitlab.com
names:
kind: GitLab
......
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
......@@ -40,6 +42,12 @@ rules:
- patch
- update
- watch
- apiGroups:
- apps.gitlab.com
resources:
- gitlabs/finalizers
verbs:
- update
- apiGroups:
- apps.gitlab.com
resources:
......@@ -80,6 +88,14 @@ rules:
- patch
- update
- watch
- apiGroups:
- apps.gitlab.com
resources:
- runners/finalizers
verbs:
- delete
- patch
- update
- apiGroups:
- apps.gitlab.com
resources:
......@@ -113,9 +129,9 @@ rules:
- update
- watch
- apiGroups:
- ""
- cert-manager.io
resources:
- configmaps
- certificates
verbs:
- create
- delete
......@@ -125,9 +141,9 @@ rules:
- update
- watch
- apiGroups:
- ""
- cert-manager.io
resources:
- cronjobs
- issuers
verbs:
- create
- delete
......@@ -139,7 +155,7 @@ rules:
- apiGroups:
- ""
resources:
- namespaces
- configmaps
verbs:
- create
- delete
......@@ -151,7 +167,7 @@ rules:
- apiGroups:
- ""
resources:
- persistentvolumeclaims
- cronjobs
verbs:
- create
- delete
......@@ -163,7 +179,7 @@ rules:
- apiGroups:
- ""
resources:
- secrets
- endpoints
verbs:
- create
- delete
......@@ -175,7 +191,7 @@ rules:
- apiGroups:
- ""
resources:
- services
- events
verbs:
- create
- delete
......@@ -185,9 +201,9 @@ rules:
- update
- watch
- apiGroups:
- extensions
- ""
resources:
- ingresses
- namespaces
verbs:
- create
- delete
......@@ -197,9 +213,9 @@ rules:
- update
- watch
- apiGroups:
- monitoring.coreos.com
- ""
resources:
- prometheuses
- persistentvolumeclaims
verbs:
- create
- delete
......@@ -209,9 +225,9 @@ rules:
- update
- watch
- apiGroups:
- monitoring.coreos.com
- ""
resources:
- servicemonitors
- secrets
verbs:
- create
- delete
......@@ -221,21 +237,21 @@ rules:
- update
- watch
- apiGroups:
- authentication.k8s.io
resources:
- tokenreviews
verbs:
- create
- apiGroups:
- authorization.k8s.io
- ""
resources:
- subjectaccessreviews
- services
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
- extensions
resources:
- events
- ingresses
verbs:
- create
- delete
......@@ -245,10 +261,9 @@ rules:
- update
- watch
- apiGroups:
- cert-manager.io
- k8s.nginx.org
resources:
- issuers
- certificates
- nginxingresscontrollers
verbs:
- create
- delete
......@@ -258,16 +273,21 @@ rules:
- update
- watch
- apiGroups:
- apps.gitlab.com
- monitoring.coreos.com
resources:
- gitlabs/finalizers
- prometheuses
verbs:
- update
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
- monitoring.coreos.com
resources:
- endpoints
- servicemonitors
verbs:
- create
- delete
......
......@@ -260,6 +260,18 @@ rules:
- patch
- update
- watch
- apiGroups:
- k8s.nginx.org
resources:
- nginxingresscontrollers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
......
......@@ -75,6 +75,7 @@ type GitLabReconciler struct {
// +kubebuilder:rbac:groups=cert-manager.io,resources=certificates,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes/custom-host,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=k8s.nginx.org,resources=nginxingresscontrollers,verbs=get;list;watch;create;update;patch;delete
// Reconcile triggers when an event occurs on the watched resource
func (r *GitLabReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment