Skip to content

Fixes needed to run on latest openshift. #144

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

Merged
merged 3 commits into from
Jun 1, 2018
Merged

Fixes needed to run on latest openshift. #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
74f0937
Make image ID pod work on openshift
ewoutp May 28, 2018
4cbb6c4
Leave BlockOwnerDeletion untouched
ewoutp May 28, 2018
fdc250c
Typo
ewoutp May 28, 2018
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 manifests/templates/deployment/rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ rules:

---

## Bind the cluster role granting access to ArangoLocalStorage resources
## Bind the cluster role granting access to ArangoDeployment resources
## to the default service account of the configured namespace.
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: RoleBinding
Expand Down
13 changes: 7 additions & 6 deletions pkg/apis/deployment/v1alpha/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,13 @@ type ArangoDeployment struct {
func (d *ArangoDeployment) AsOwner() metav1.OwnerReference {
trueVar := true
return metav1.OwnerReference{
APIVersion: SchemeGroupVersion.String(),
Kind: ArangoDeploymentResourceKind,
Name: d.Name,
UID: d.UID,
Controller: &trueVar,
BlockOwnerDeletion: &trueVar,
APIVersion: SchemeGroupVersion.String(),
Kind: ArangoDeploymentResourceKind,
Name: d.Name,
UID: d.UID,
Controller: &trueVar,
// For now BlockOwnerDeletion does not work on OpenShift, so we leave it out.
//BlockOwnerDeletion: &trueVar,
}
}

Expand Down
2 changes: 2 additions & 0 deletions pkg/deployment/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ func (ib *imagesBuilder) fetchArangoDBImageIDAndVersion(ctx context.Context, ima
args := []string{
"--server.authentication=false",
fmt.Sprintf("--server.endpoint=tcp://[::]:%d", k8sutil.ArangoPort),
Copy link

@matthewvon matthewvon Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this imply that the connection will never be ssl? and never use authentication?

Copy link
Contributor Author

@ewoutp ewoutp Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the ID pod : Yes.

Copy link
Contributor Author

@ewoutp ewoutp Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ID pod is run very quickly to fetch version information for a given image name.

Copy link
Contributor Author

@ewoutp ewoutp Jun 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will never be accessible from outside, nor will it store any data or live longer than a few seconds

"--database.directory=" + k8sutil.ArangodVolumeMountDir,
"--log.output=+",
}
terminationGracePeriod := time.Second * 30
tolerations := make([]v1.Toleration, 0, 2)
Expand Down