Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
drupal
paas
drupalSite-operator
Commits
ec68d991
Commit
ec68d991
authored
Mar 07, 2021
by
Vineet Reddy Rajula
Committed by
Konstantinos Samaras-Tsakiris
Mar 07, 2021
Browse files
deploymentCongis -> deployments, createOrUpdate function
parent
3040baa2
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
config/rbac/role.yaml
View file @
ec68d991
...
...
@@ -7,9 +7,9 @@ metadata:
name
:
manager-role
rules
:
-
apiGroups
:
-
app
s.openshift.io
-
app
resources
:
-
deployment
config
s
-
deployments
verbs
:
-
'
*'
-
apiGroups
:
...
...
controllers/drupalsite_controller.go
View file @
ec68d991
...
...
@@ -21,12 +21,12 @@ import (
"fmt"
"github.com/go-logr/logr"
appsv1
"github.com/openshift/api/apps/v1"
buildv1
"github.com/openshift/api/build/v1"
imagev1
"github.com/openshift/api/image/v1"
routev1
"github.com/openshift/api/route/v1"
"github.com/operator-framework/operator-lib/status"
webservicesv1a1
"gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
appsv1
"k8s.io/api/apps/v1"
batchv1
"k8s.io/api/batch/v1"
corev1
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
...
...
@@ -47,8 +47,7 @@ type DrupalSiteReconciler struct {
// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=drupal.webservices.cern.ch,resources=drupalsites/finalizers,verbs=update
// +kubebuilder:rbac:groups=apps.openshift.io,resources=deploymentconfigs,verbs=*
// +kubebuilder:rbac:groups=app,resources=deployments,verbs=*
// +kubebuilder:rbac:groups=build.openshift.io,resources=buildconfig,verbs=*
// +kubebuilder:rbac:groups=image.openshift.io,resources=imagestream,verbs=*
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=*
...
...
@@ -60,7 +59,7 @@ type DrupalSiteReconciler struct {
func
(
r
*
DrupalSiteReconciler
)
SetupWithManager
(
mgr
ctrl
.
Manager
)
error
{
return
ctrl
.
NewControllerManagedBy
(
mgr
)
.
For
(
&
webservicesv1a1
.
DrupalSite
{})
.
Owns
(
&
appsv1
.
Deployment
Config
{})
.
Owns
(
&
appsv1
.
Deployment
{})
.
Owns
(
&
buildv1
.
BuildConfig
{})
.
Owns
(
&
imagev1
.
ImageStream
{})
.
Owns
(
&
routev1
.
Route
{})
.
...
...
controllers/drupalsite_resources.go
View file @
ec68d991
This diff is collapsed.
Click to expand it.
controllers/error_types.go
View file @
ec68d991
...
...
@@ -14,6 +14,7 @@ var (
// Consider constraining the arg type.
ErrFunctionDomain
=
errors
.
New
(
"FunctionDomainError"
)
ErrClientK8s
=
errors
.
New
(
"k8sAPIClientError"
)
ErrFilesystemIO
=
errors
.
New
(
"FilesystemIOError"
)
)
type
reconcileError
interface
{
...
...
main.go
View file @
ec68d991
...
...
@@ -41,10 +41,10 @@ import (
"gitlab.cern.ch/drupal/paas/drupalsite-operator/controllers"
// +kubebuilder:scaffold:imports
appsv1
"github.com/openshift/api/apps/v1"
buildv1
"github.com/openshift/api/build/v1"
imagev1
"github.com/openshift/api/image/v1"
routev1
"github.com/openshift/api/route/v1"
appsv1
"k8s.io/api/apps/v1"
)
var
(
...
...
Write
Preview
Supports
Markdown
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