diff --git a/Dockerfile b/Dockerfile
index 0c31f8e46d9aeedf871d51d1830b7ab4b29ebf21..d9d9b6d8ee002d090447927444c6db7446a73a45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# Build the manager binary
-FROM golang:1.13 as builder
+FROM golang:1.15 as builder
WORKDIR /workspace
@@ -26,6 +26,6 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager
FROM gcr.io/distroless/static:nonroot
WORKDIR /
COPY --from=builder /workspace/manager .
-USER nonroot:nonroot
+USER 65532:65532
ENTRYPOINT ["/manager"]
diff --git a/Makefile b/Makefile
index 4c89511fc6bba74aefedf08c560dd09cc1d12705..33f9acea6acedfad61e2e63ec020e3688ca4ee1f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-SHELL := /bin/bash
# Current Operator version
VERSION ?= 0.0.1
# Default bundle image tag
@@ -15,7 +14,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
# Image URL to use all building/pushing image targets
IMG ?= controller:latest
# Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
-CRD_OPTIONS ?= "crd:trivialVersions=true"
+CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
@@ -27,13 +26,11 @@ endif
all: manager
# Run tests
-# test: generate fmt vet manifests
-# go test ./... -coverprofile cover.out
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
test: generate fmt vet manifests
mkdir -p ${ENVTEST_ASSETS_DIR}
- test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/master/hack/setup-envtest.sh
- . ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
+ test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.7.0/hack/setup-envtest.sh
+ source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
# Build manager binary
manager: generate fmt vet
@@ -56,6 +53,10 @@ deploy: manifests kustomize
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
$(KUSTOMIZE) build config/default | kubectl apply -f -
+# UnDeploy controller from the configured Kubernetes cluster in ~/.kube/config
+undeploy:
+ $(KUSTOMIZE) build config/default | kubectl delete -f -
+
# Generate manifests e.g. CRD, RBAC etc.
manifests: controller-gen
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
@@ -74,43 +75,35 @@ generate: controller-gen
# Build the docker image
docker-build: test
- docker build . -t ${IMG}
+ docker build -t ${IMG} .
# Push the docker image
docker-push:
docker push ${IMG}
-# find or download controller-gen
-# download controller-gen if necessary
+# Download controller-gen locally if necessary
+CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
controller-gen:
-ifeq (, $(shell which controller-gen))
- @{ \
- set -e ;\
- CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
- cd $$CONTROLLER_GEN_TMP_DIR ;\
- go mod init tmp ;\
- go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.3.0 ;\
- rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
- }
-CONTROLLER_GEN=$(GOBIN)/controller-gen
-else
-CONTROLLER_GEN=$(shell which controller-gen)
-endif
+ $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)
+# Download kustomize locally if necessary
+KUSTOMIZE = $(shell pwd)/bin/kustomize
kustomize:
-ifeq (, $(shell which kustomize))
- @{ \
- set -e ;\
- KUSTOMIZE_GEN_TMP_DIR=$$(mktemp -d) ;\
- cd $$KUSTOMIZE_GEN_TMP_DIR ;\
- go mod init tmp ;\
- go get sigs.k8s.io/kustomize/kustomize/v3@v3.5.4 ;\
- rm -rf $$KUSTOMIZE_GEN_TMP_DIR ;\
- }
-KUSTOMIZE=$(GOBIN)/kustomize
-else
-KUSTOMIZE=$(shell which kustomize)
-endif
+ $(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
+
+# go-get-tool will 'go get' any package $2 and install it to $1.
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+define go-get-tool
+@[ -f $(1) ] || { \
+set -e ;\
+TMP_DIR=$$(mktemp -d) ;\
+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+rm -rf $$TMP_DIR ;\
+}
+endef
# Generate bundle manifests and metadata, then validate generated files.
.PHONY: bundle
diff --git a/PROJECT b/PROJECT
index 3b6badf3daeeb501997b8c3dc9acb41e15b0e154..9b3fba71492ed2589670bf1f69a1991f2c80f49f 100644
--- a/PROJECT
+++ b/PROJECT
@@ -1,11 +1,13 @@
-domain: webservices.cern.ch
-layout: go.kubebuilder.io/v2
+domain: cern.ch
+layout: go.kubebuilder.io/v3
projectName: drupalsite-operator
repo: gitlab.cern.ch/drupal/paas/drupalsite-operator
resources:
-- group: webservices.cern.ch
- kind: DrupalSiteRequest
+- crdVersion: v1
+ group: drupal.webservices
+ kind: DrupalSite
version: v1alpha1
version: 3-alpha
plugins:
- go.sdk.operatorframework.io/v2-alpha: {}
+ manifests.sdk.operatorframework.io/v2: {}
+ scorecard.sdk.operatorframework.io/v2: {}
diff --git a/api/v1alpha1/drupalsiterequest_types.go b/api/v1alpha1/drupalsite_types.go
similarity index 60%
rename from api/v1alpha1/drupalsiterequest_types.go
rename to api/v1alpha1/drupalsite_types.go
index b9f948b00c317f9e8a4c52e948d8bb69a9905c6a..c305fc72372cfe2d4cb88339e902fecdc4a691a1 100644
--- a/api/v1alpha1/drupalsiterequest_types.go
+++ b/api/v1alpha1/drupalsite_types.go
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -22,16 +22,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
-// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
-
-// DrupalSiteRequestSpec defines the desired state of DrupalSiteRequest
-type DrupalSiteRequestSpec struct {
- // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
- // Important: Run "make" to regenerate code after modifying this file
-
- // Foo is an example field of DrupalSiteRequest. Edit DrupalSiteRequest_types.go to remove/update
-
+// DrupalSiteSpec defines the desired state of DrupalSite
+type DrupalSiteSpec struct {
// Publish defines if the site has to be published or not
// +kubebuilder:validation:Required
Publish bool `json:"publish"`
@@ -42,8 +34,8 @@ type DrupalSiteRequestSpec struct {
DrupalVersion string `json:"drupalVersion"` // Convert to enum
}
-// DrupalSiteRequestStatus defines the observed state of DrupalSiteRequest
-type DrupalSiteRequestStatus struct {
+// DrupalSiteStatus defines the observed state of DrupalSite
+type DrupalSiteStatus struct {
// Phase aggregates the information from all the conditions and reports on the lifecycle phase of the resource
// Enum: {Creating,Created,Deleted}
Phase string `json:"phase,omitempty"`
@@ -56,29 +48,29 @@ type DrupalSiteRequestStatus struct {
// +kubebuilder:object:root=true
// +kubebuilder:subresource:status
-// DrupalSiteRequest is the Schema for the drupalsiterequests API
-type DrupalSiteRequest struct {
+// DrupalSite is the Schema for the drupalsites API
+type DrupalSite struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
- Spec DrupalSiteRequestSpec `json:"spec,omitempty"`
- Status DrupalSiteRequestStatus `json:"status,omitempty"`
+ Spec DrupalSiteSpec `json:"spec,omitempty"`
+ Status DrupalSiteStatus `json:"status,omitempty"`
}
// +kubebuilder:object:root=true
-// DrupalSiteRequestList contains a list of DrupalSiteRequest
-type DrupalSiteRequestList struct {
+// DrupalSiteList contains a list of DrupalSite
+type DrupalSiteList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
- Items []DrupalSiteRequest `json:"items"`
+ Items []DrupalSite `json:"items"`
}
func init() {
- SchemeBuilder.Register(&DrupalSiteRequest{}, &DrupalSiteRequestList{})
+ SchemeBuilder.Register(&DrupalSite{}, &DrupalSiteList{})
}
-func (drp DrupalSiteRequest) ConditionTrue(condition status.ConditionType) (update bool) {
+func (drp DrupalSite) ConditionTrue(condition status.ConditionType) (update bool) {
init := drp.Status.Conditions.GetCondition(condition)
return init != nil && init.Status == v1.ConditionTrue
}
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
index f26e91e6496412905081fe37cc3f0a2d08b03380..811211fd62a0663f8408d49552e905f29f369871 100644
--- a/api/v1alpha1/groupversion_info.go
+++ b/api/v1alpha1/groupversion_info.go
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-// Package v1alpha1 contains API Schema definitions for the webservices.cern.ch v1alpha1 API group
+// Package v1alpha1 contains API Schema definitions for the drupal.webservices v1alpha1 API group
// +kubebuilder:object:generate=true
-// +groupName=webservices.cern.ch
+// +groupName=drupal.webservices.cern.ch
package v1alpha1
import (
@@ -26,7 +26,7 @@ import (
var (
// GroupVersion is group version used to register these objects
- GroupVersion = schema.GroupVersion{Group: "webservices.cern.ch", Version: "v1alpha1"}
+ GroupVersion = schema.GroupVersion{Group: "drupal.webservices.cern.ch", Version: "v1alpha1"}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
index 6a71c9d7ac6774223232cdc7885ff6be50749616..3ad980193106d9f5bc4a39410b783a77a92620d6 100644
--- a/api/v1alpha1/zz_generated.deepcopy.go
+++ b/api/v1alpha1/zz_generated.deepcopy.go
@@ -1,7 +1,7 @@
// +build !ignore_autogenerated
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import (
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DrupalSiteRequest) DeepCopyInto(out *DrupalSiteRequest) {
+func (in *DrupalSite) DeepCopyInto(out *DrupalSite) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -34,18 +34,18 @@ func (in *DrupalSiteRequest) DeepCopyInto(out *DrupalSiteRequest) {
in.Status.DeepCopyInto(&out.Status)
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteRequest.
-func (in *DrupalSiteRequest) DeepCopy() *DrupalSiteRequest {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSite.
+func (in *DrupalSite) DeepCopy() *DrupalSite {
if in == nil {
return nil
}
- out := new(DrupalSiteRequest)
+ out := new(DrupalSite)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *DrupalSiteRequest) DeepCopyObject() runtime.Object {
+func (in *DrupalSite) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
@@ -53,31 +53,31 @@ func (in *DrupalSiteRequest) DeepCopyObject() runtime.Object {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DrupalSiteRequestList) DeepCopyInto(out *DrupalSiteRequestList) {
+func (in *DrupalSiteList) DeepCopyInto(out *DrupalSiteList) {
*out = *in
out.TypeMeta = in.TypeMeta
in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
- *out = make([]DrupalSiteRequest, len(*in))
+ *out = make([]DrupalSite, len(*in))
for i := range *in {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteRequestList.
-func (in *DrupalSiteRequestList) DeepCopy() *DrupalSiteRequestList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteList.
+func (in *DrupalSiteList) DeepCopy() *DrupalSiteList {
if in == nil {
return nil
}
- out := new(DrupalSiteRequestList)
+ out := new(DrupalSiteList)
in.DeepCopyInto(out)
return out
}
// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *DrupalSiteRequestList) DeepCopyObject() runtime.Object {
+func (in *DrupalSiteList) DeepCopyObject() runtime.Object {
if c := in.DeepCopy(); c != nil {
return c
}
@@ -85,22 +85,22 @@ func (in *DrupalSiteRequestList) DeepCopyObject() runtime.Object {
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DrupalSiteRequestSpec) DeepCopyInto(out *DrupalSiteRequestSpec) {
+func (in *DrupalSiteSpec) DeepCopyInto(out *DrupalSiteSpec) {
*out = *in
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteRequestSpec.
-func (in *DrupalSiteRequestSpec) DeepCopy() *DrupalSiteRequestSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteSpec.
+func (in *DrupalSiteSpec) DeepCopy() *DrupalSiteSpec {
if in == nil {
return nil
}
- out := new(DrupalSiteRequestSpec)
+ out := new(DrupalSiteSpec)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *DrupalSiteRequestStatus) DeepCopyInto(out *DrupalSiteRequestStatus) {
+func (in *DrupalSiteStatus) DeepCopyInto(out *DrupalSiteStatus) {
*out = *in
if in.Conditions != nil {
in, out := &in.Conditions, &out.Conditions
@@ -111,12 +111,12 @@ func (in *DrupalSiteRequestStatus) DeepCopyInto(out *DrupalSiteRequestStatus) {
}
}
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteRequestStatus.
-func (in *DrupalSiteRequestStatus) DeepCopy() *DrupalSiteRequestStatus {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DrupalSiteStatus.
+func (in *DrupalSiteStatus) DeepCopy() *DrupalSiteStatus {
if in == nil {
return nil
}
- out := new(DrupalSiteRequestStatus)
+ out := new(DrupalSiteStatus)
in.DeepCopyInto(out)
return out
}
diff --git a/config/README.md b/config/README.md
deleted file mode 100644
index a0d5fd03f0e5c99cca0ea6eee6989baf9a1b95f1..0000000000000000000000000000000000000000
--- a/config/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-## Note
-- The [www.conf](config/www.conf) is an example config and is to be passed as an input file to the operator [helm chart](#17).
\ No newline at end of file
diff --git a/config/certmanager/certificate.yaml b/config/certmanager/certificate.yaml
index 58db114fa054180ae22f1d3511e11e826859880d..52d866183c76d4c5ef9b15d68b00940e02951d08 100644
--- a/config/certmanager/certificate.yaml
+++ b/config/certmanager/certificate.yaml
@@ -1,8 +1,7 @@
# The following manifests contain a self-signed issuer CR and a certificate CR.
# More document can be found at https://docs.cert-manager.io
-# WARNING: Targets CertManager 0.11 check https://docs.cert-manager.io/en/latest/tasks/upgrading/index.html for
-# breaking changes
-apiVersion: cert-manager.io/v1alpha2
+# WARNING: Targets CertManager v1.0. Check https://cert-manager.io/docs/installation/upgrading/ for breaking changes.
+apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
name: selfsigned-issuer
@@ -10,7 +9,7 @@ metadata:
spec:
selfSigned: {}
---
-apiVersion: cert-manager.io/v1alpha2
+apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml
diff --git a/config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml b/config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e4d3af24310dd4011928266d71e7c706cd260dd5
--- /dev/null
+++ b/config/crd/bases/drupal.webservices.cern.ch_drupalsites.yaml
@@ -0,0 +1,108 @@
+
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ annotations:
+ controller-gen.kubebuilder.io/version: v0.4.1
+ creationTimestamp: null
+ name: drupalsites.drupal.webservices.cern.ch
+spec:
+ group: drupal.webservices.cern.ch
+ names:
+ kind: DrupalSite
+ listKind: DrupalSiteList
+ plural: drupalsites
+ singular: drupalsite
+ scope: Namespaced
+ versions:
+ - name: v1alpha1
+ schema:
+ openAPIV3Schema:
+ description: DrupalSite is the Schema for the drupalsites API
+ properties:
+ apiVersion:
+ description: 'APIVersion defines the versioned schema of this representation
+ of an object. Servers should convert recognized schemas to the latest
+ internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+ type: string
+ kind:
+ description: 'Kind is a string value representing the REST resource this
+ object represents. Servers may infer this from the endpoint the client
+ submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+ type: string
+ metadata:
+ type: object
+ spec:
+ description: DrupalSiteSpec defines the desired state of DrupalSite
+ properties:
+ drupalVersion:
+ description: DrupalVerion defines the version of the Drupal to install
+ minLength: 1
+ type: string
+ publish:
+ description: Publish defines if the site has to be published or not
+ type: boolean
+ required:
+ - drupalVersion
+ - publish
+ type: object
+ status:
+ description: DrupalSiteStatus defines the observed state of DrupalSite
+ properties:
+ conditions:
+ description: TODO conditions
+ items:
+ description: "Condition represents an observation of an object's
+ state. Conditions are an extension mechanism intended to be used
+ when the details of an observation are not a priori known or would
+ not apply to all instances of a given Kind. \n Conditions should
+ be added to explicitly convey properties that users and components
+ care about rather than requiring those properties to be inferred
+ from other observations. Once defined, the meaning of a Condition
+ can not be changed arbitrarily - it becomes part of the API, and
+ has the same backwards- and forwards-compatibility concerns of
+ any other part of the API."
+ properties:
+ lastTransitionTime:
+ format: date-time
+ type: string
+ message:
+ type: string
+ reason:
+ description: ConditionReason is intended to be a one-word, CamelCase
+ representation of the category of cause of the current status.
+ It is intended to be used in concise output, such as one-line
+ kubectl get output, and in summarizing occurrences of causes.
+ type: string
+ status:
+ type: string
+ type:
+ description: "ConditionType is the type of the condition and
+ is typically a CamelCased word or short phrase. \n Condition
+ types should indicate state in the \"abnormal-true\" polarity.
+ For example, if the condition indicates when a policy is invalid,
+ the \"is valid\" case is probably the norm, so the condition
+ should be called \"Invalid\"."
+ type: string
+ required:
+ - status
+ - type
+ type: object
+ type: array
+ phase:
+ description: 'Phase aggregates the information from all the conditions
+ and reports on the lifecycle phase of the resource Enum: {Creating,Created,Deleted}'
+ type: string
+ type: object
+ type: object
+ served: true
+ storage: true
+ subresources:
+ status: {}
+status:
+ acceptedNames:
+ kind: ""
+ plural: ""
+ conditions: []
+ storedVersions: []
diff --git a/config/crd/bases/webservices.cern.ch_drupalsiterequests.yaml b/config/crd/bases/webservices.cern.ch_drupalsiterequests.yaml
deleted file mode 100644
index 32c5e7d13b0ada7aabd48356bc3edeb092663d24..0000000000000000000000000000000000000000
--- a/config/crd/bases/webservices.cern.ch_drupalsiterequests.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
- annotations:
- controller-gen.kubebuilder.io/version: v0.3.0
- creationTimestamp: null
- name: drupalsiterequests.webservices.cern.ch
-spec:
- group: webservices.cern.ch
- names:
- kind: DrupalSiteRequest
- listKind: DrupalSiteRequestList
- plural: drupalsiterequests
- singular: drupalsiterequest
- scope: Namespaced
- subresources:
- status: {}
- validation:
- openAPIV3Schema:
- description: DrupalSiteRequest is the Schema for the drupalsiterequests API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: DrupalSiteRequestSpec defines the desired state of DrupalSiteRequest
- properties:
- drupalVersion:
- description: DrupalVerion defines the version of the Drupal to install
- minLength: 1
- type: string
- publish:
- description: Publish defines if the site has to be published or not
- type: boolean
- required:
- - drupalVersion
- - publish
- type: object
- status:
- description: DrupalSiteRequestStatus defines the observed state of DrupalSiteRequest
- properties:
- conditions:
- description: TODO conditions
- items:
- description: "Condition represents an observation of an object's state.
- Conditions are an extension mechanism intended to be used when the
- details of an observation are not a priori known or would not apply
- to all instances of a given Kind. \n Conditions should be added
- to explicitly convey properties that users and components care about
- rather than requiring those properties to be inferred from other
- observations. Once defined, the meaning of a Condition can not be
- changed arbitrarily - it becomes part of the API, and has the same
- backwards- and forwards-compatibility concerns of any other part
- of the API."
- properties:
- lastTransitionTime:
- format: date-time
- type: string
- message:
- type: string
- reason:
- description: ConditionReason is intended to be a one-word, CamelCase
- representation of the category of cause of the current status.
- It is intended to be used in concise output, such as one-line
- kubectl get output, and in summarizing occurrences of causes.
- type: string
- status:
- type: string
- type:
- description: "ConditionType is the type of the condition and is
- typically a CamelCased word or short phrase. \n Condition types
- should indicate state in the \"abnormal-true\" polarity. For
- example, if the condition indicates when a policy is invalid,
- the \"is valid\" case is probably the norm, so the condition
- should be called \"Invalid\"."
- type: string
- required:
- - status
- - type
- type: object
- type: array
- phase:
- description: 'Phase aggregates the information from all the conditions
- and reports on the lifecycle phase of the resource Enum: {Creating,Created,Deleted}'
- type: string
- type: object
- type: object
- version: v1alpha1
- versions:
- - name: v1alpha1
- served: true
- storage: true
-status:
- acceptedNames:
- kind: ""
- plural: ""
- conditions: []
- storedVersions: []
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index 85f65afb1b69ec5d1be139bb5f4d7490ce3d8ef4..45f1376ebbeda96646c64dbfdc21b3e025bc8d9a 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -2,18 +2,18 @@
# since it depends on service name and namespace that are out of this kustomize package.
# It should be run by config/default
resources:
-- bases/webservices.cern.ch_drupalsiterequests.yaml
+- bases/drupal.webservices.cern.ch_drupalsites.yaml
# +kubebuilder:scaffold:crdkustomizeresource
patchesStrategicMerge:
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
# patches here are for enabling the conversion webhook for each CRD
-#- patches/webhook_in_drupalsiterequests.yaml
+#- patches/webhook_in_drupalsites.yaml
# +kubebuilder:scaffold:crdkustomizewebhookpatch
# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
# patches here are for enabling the CA injection for each CRD
-#- patches/cainjection_in_drupalsiterequests.yaml
+#- patches/cainjection_in_drupalsites.yaml
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
# the following config is for teaching kustomize how to do kustomization for CRDs.
diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
index 6f83d9a94bc5b86c7922399d3a1c9c81345c3b18..ec5c150a9df257f152db0dbe2fbab375c1c1156b 100644
--- a/config/crd/kustomizeconfig.yaml
+++ b/config/crd/kustomizeconfig.yaml
@@ -4,13 +4,15 @@ nameReference:
version: v1
fieldSpecs:
- kind: CustomResourceDefinition
+ version: v1
group: apiextensions.k8s.io
- path: spec/conversion/webhookClientConfig/service/name
+ path: spec/conversion/webhook/clientConfig/service/name
namespace:
- kind: CustomResourceDefinition
+ version: v1
group: apiextensions.k8s.io
- path: spec/conversion/webhookClientConfig/service/namespace
+ path: spec/conversion/webhook/clientConfig/service/namespace
create: false
varReference:
diff --git a/config/crd/patches/cainjection_in_drupalsiterequests.yaml b/config/crd/patches/cainjection_in_drupalsites.yaml
similarity index 62%
rename from config/crd/patches/cainjection_in_drupalsiterequests.yaml
rename to config/crd/patches/cainjection_in_drupalsites.yaml
index 71dff75682685793ee912391a83062ad4509ccd1..dfda01ec9603bdbb0dc32e5c1283530f08babeaa 100644
--- a/config/crd/patches/cainjection_in_drupalsiterequests.yaml
+++ b/config/crd/patches/cainjection_in_drupalsites.yaml
@@ -1,8 +1,7 @@
# The following patch adds a directive for certmanager to inject CA into the CRD
-# CRD conversion requires k8s 1.13 or later.
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
- name: drupalsiterequests.webservices.cern.ch
+ name: drupalsites.drupal.webservices.cern.ch
diff --git a/config/crd/patches/webhook_in_drupalsiterequests.yaml b/config/crd/patches/webhook_in_drupalsiterequests.yaml
deleted file mode 100644
index 8341138c62b7b2800c8eb22c17c277284a9590ec..0000000000000000000000000000000000000000
--- a/config/crd/patches/webhook_in_drupalsiterequests.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-# The following patch enables conversion webhook for CRD
-# CRD conversion requires k8s 1.13 or later.
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
- name: drupalsiterequests.webservices.cern.ch
-spec:
- conversion:
- strategy: Webhook
- webhookClientConfig:
- # this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
- # but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
- caBundle: Cg==
- service:
- namespace: system
- name: webhook-service
- path: /convert
diff --git a/config/crd/patches/webhook_in_drupalsites.yaml b/config/crd/patches/webhook_in_drupalsites.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3adacb8f6d2a0f943f5bd8b5a7a007c80fc66718
--- /dev/null
+++ b/config/crd/patches/webhook_in_drupalsites.yaml
@@ -0,0 +1,14 @@
+# The following patch enables a conversion webhook for the CRD
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ name: drupalsites.drupal.webservices.cern.ch
+spec:
+ conversion:
+ strategy: Webhook
+ webhook:
+ clientConfig:
+ service:
+ namespace: system
+ name: webhook-service
+ path: /convert
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 87675ddd043a8e34a755f1444380853a35756863..ccfb27b302a466eec976f053969d6cf72283b5bc 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -25,11 +25,15 @@ bases:
#- ../prometheus
patchesStrategicMerge:
- # Protect the /metrics endpoint by putting it behind auth.
- # If you want your controller-manager to expose the /metrics
- # endpoint w/o any authn/z, please comment the following line.
+# Protect the /metrics endpoint by putting it behind auth.
+# If you want your controller-manager to expose the /metrics
+# endpoint w/o any authn/z, please comment the following line.
- manager_auth_proxy_patch.yaml
+# Mount the controller config file for loading manager configurations
+# through a ComponentConfig type
+#- manager_config_patch.yaml
+
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# crd/kustomization.yaml
#- manager_webhook_patch.yaml
@@ -46,7 +50,7 @@ vars:
# objref:
# kind: Certificate
# group: cert-manager.io
-# version: v1alpha2
+# version: v1
# name: serving-cert # this name should match the one in certificate.yaml
# fieldref:
# fieldpath: metadata.namespace
@@ -54,7 +58,7 @@ vars:
# objref:
# kind: Certificate
# group: cert-manager.io
-# version: v1alpha2
+# version: v1
# name: serving-cert # this name should match the one in certificate.yaml
#- name: SERVICE_NAMESPACE # namespace of the service
# objref:
diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index 77e743d1c1c1f6f6ce6a1c953971ef12b80fbe1c..49b1f1ab36e8d028a19670dc83a108323677a29c 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -1,4 +1,4 @@
-# This patch inject a sidecar container which is a HTTP proxy for the
+# This patch inject a sidecar container which is a HTTP proxy for the
# controller manager, it performs RBAC authorization against the Kubernetes API using SubjectAccessReviews.
apiVersion: apps/v1
kind: Deployment
@@ -21,5 +21,6 @@ spec:
name: https
- name: manager
args:
- - "--metrics-addr=127.0.0.1:8080"
- - "--enable-leader-election"
+ - "--health-probe-bind-address=:8081"
+ - "--metrics-bind-address=127.0.0.1:8080"
+ - "--leader-elect"
diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6c400155cfbc874a9a45ee5e8869125edeb1bb30
--- /dev/null
+++ b/config/default/manager_config_patch.yaml
@@ -0,0 +1,20 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: controller-manager
+ namespace: system
+spec:
+ template:
+ spec:
+ containers:
+ - name: manager
+ args:
+ - "--config=controller_manager_config.yaml"
+ volumeMounts:
+ - name: manager-config
+ mountPath: /controller_manager_config.yaml
+ subPath: controller_manager_config.yaml
+ volumes:
+ - name: manager-config
+ configMap:
+ name: manager-config
diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml
deleted file mode 100644
index 738de350b71e1c37a8f91eef98ce30bd3fdc1f60..0000000000000000000000000000000000000000
--- a/config/default/manager_webhook_patch.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: controller-manager
- namespace: system
-spec:
- template:
- spec:
- containers:
- - name: manager
- ports:
- - containerPort: 9443
- name: webhook-server
- protocol: TCP
- volumeMounts:
- - mountPath: /tmp/k8s-webhook-server/serving-certs
- name: cert
- readOnly: true
- volumes:
- - name: cert
- secret:
- defaultMode: 420
- secretName: webhook-server-cert
diff --git a/config/default/webhookcainjection_patch.yaml b/config/default/webhookcainjection_patch.yaml
deleted file mode 100644
index 7e79bf9955a23ea564ef8b08f5177c330d646be1..0000000000000000000000000000000000000000
--- a/config/default/webhookcainjection_patch.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# This patch add annotation to admission webhook config and
-# the variables $(CERTIFICATE_NAMESPACE) and $(CERTIFICATE_NAME) will be substituted by kustomize.
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: MutatingWebhookConfiguration
-metadata:
- name: mutating-webhook-configuration
- annotations:
- cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
----
-apiVersion: admissionregistration.k8s.io/v1beta1
-kind: ValidatingWebhookConfiguration
-metadata:
- name: validating-webhook-configuration
- annotations:
- cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
diff --git a/config/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..febf39dd0550987523e0f53f44e959eae0ca1705
--- /dev/null
+++ b/config/manager/controller_manager_config.yaml
@@ -0,0 +1,11 @@
+apiVersion: controller-runtime.sigs.k8s.io/v1alpha1
+kind: ControllerManagerConfig
+health:
+ healthProbeBindAddress: :8081
+metrics:
+ bindAddress: 127.0.0.1:8080
+webhook:
+ port: 9443
+leaderElection:
+ leaderElect: true
+ resourceName: 78d40201.cern.ch
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index ad13e96b3fca7818613a1c923067e9b44d7dc17f..2bcd3eeaa943224ec83d142c72b95a8d0ce1b939 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,8 +1,10 @@
resources:
- manager.yaml
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
- newName: controller
- newTag: latest
+
+generatorOptions:
+ disableNameSuffixHash: true
+
+configMapGenerator:
+- name: manager-config
+ files:
+ - controller_manager_config.yaml
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index b6c85a52d5fcea33cbef60440f936a3d8c76ab06..70e3f6acf1af65684bde13c88221223d514fbe9e 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -22,13 +22,29 @@ spec:
labels:
control-plane: controller-manager
spec:
+ securityContext:
+ runAsUser: 65532
containers:
- command:
- /manager
args:
- - --enable-leader-election
+ - --leader-elect
image: controller:latest
name: manager
+ securityContext:
+ allowPrivilegeEscalation: false
+ livenessProbe:
+ httpGet:
+ path: /healthz
+ port: 8081
+ initialDelaySeconds: 15
+ periodSeconds: 20
+ readinessProbe:
+ httpGet:
+ path: /readyz
+ port: 8081
+ initialDelaySeconds: 5
+ periodSeconds: 10
resources:
limits:
cpu: 100m
diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/auth_proxy_client_clusterrole.yaml
index 7d62534c5ffbe56e5e0be90a317b9aa46e7ddfb1..bd4af137a9fed7ae5bc3f6ea3b3d50e7c4171550 100644
--- a/config/rbac/auth_proxy_client_clusterrole.yaml
+++ b/config/rbac/auth_proxy_client_clusterrole.yaml
@@ -1,4 +1,4 @@
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: metrics-reader
diff --git a/config/rbac/drupalsiterequest_editor_role.yaml b/config/rbac/drupalsite_editor_role.yaml
similarity index 53%
rename from config/rbac/drupalsiterequest_editor_role.yaml
rename to config/rbac/drupalsite_editor_role.yaml
index bb5e13dfb9ab69a9aa8a07692b9306b20513039a..a66b95be4330e747ebd464bbd0beae41ef7bbbd1 100644
--- a/config/rbac/drupalsiterequest_editor_role.yaml
+++ b/config/rbac/drupalsite_editor_role.yaml
@@ -1,13 +1,13 @@
-# permissions for end users to edit drupalsiterequests.
+# permissions for end users to edit drupalsites.
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- name: drupalsiterequest-editor-role
+ name: drupalsite-editor-role
rules:
- apiGroups:
- - webservices.cern.ch
+ - drupal.webservices.cern.ch
resources:
- - drupalsiterequests
+ - drupalsites
verbs:
- create
- delete
@@ -17,8 +17,8 @@ rules:
- update
- watch
- apiGroups:
- - webservices.cern.ch
+ - drupal.webservices.cern.ch
resources:
- - drupalsiterequests/status
+ - drupalsites/status
verbs:
- get
diff --git a/config/rbac/drupalsite_viewer_role.yaml b/config/rbac/drupalsite_viewer_role.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..07ff778963a300c98149e6996b20639d54213184
--- /dev/null
+++ b/config/rbac/drupalsite_viewer_role.yaml
@@ -0,0 +1,20 @@
+# permissions for end users to view drupalsites.
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+ name: drupalsite-viewer-role
+rules:
+- apiGroups:
+ - drupal.webservices.cern.ch
+ resources:
+ - drupalsites
+ verbs:
+ - get
+ - list
+ - watch
+- apiGroups:
+ - drupal.webservices.cern.ch
+ resources:
+ - drupalsites/status
+ verbs:
+ - get
diff --git a/config/rbac/drupalsiterequest_viewer_role.yaml b/config/rbac/drupalsiterequest_viewer_role.yaml
deleted file mode 100644
index dfb8bb01f0601ad17f13a5270f0978d73b46e1be..0000000000000000000000000000000000000000
--- a/config/rbac/drupalsiterequest_viewer_role.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# permissions for end users to view drupalsiterequests.
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: drupalsiterequest-viewer-role
-rules:
-- apiGroups:
- - webservices.cern.ch
- resources:
- - drupalsiterequests
- verbs:
- - get
- - list
- - watch
-- apiGroups:
- - webservices.cern.ch
- resources:
- - drupalsiterequests/status
- verbs:
- - get
diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml
index 7dc16c420ec4bb6c9acc804e3eda10badaa0bc52..6334cc51c831c04427d66430f44c7869a6cd8fdd 100644
--- a/config/rbac/leader_election_role.yaml
+++ b/config/rbac/leader_election_role.yaml
@@ -6,8 +6,10 @@ metadata:
rules:
- apiGroups:
- ""
+ - coordination.k8s.io
resources:
- configmaps
+ - leases
verbs:
- get
- list
@@ -16,14 +18,6 @@ rules:
- update
- patch
- delete
-- apiGroups:
- - ""
- resources:
- - configmaps/status
- verbs:
- - get
- - update
- - patch
- apiGroups:
- ""
resources:
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 130e0a3bf5b87a53dd6ba83f3ae55052e898b21d..a496faca4774ed9112749fff6801f85e8b75b600 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -38,9 +38,9 @@ rules:
- get
- list
- apiGroups:
- - route.openshift.io
+ - drupal.webservices.cern.ch
resources:
- - routes
+ - drupalsites
verbs:
- create
- delete
@@ -50,22 +50,28 @@ rules:
- update
- watch
- apiGroups:
- - webservices.cern.ch
+ - drupal.webservices.cern.ch
resources:
- - drupalsiterequests
+ - drupalsites/finalizers
+ verbs:
+ - update
+- apiGroups:
+ - drupal.webservices.cern.ch
+ resources:
+ - drupalsites/status
verbs:
- - create
- - delete
- get
- - list
- patch
- update
- - watch
- apiGroups:
- - webservices.cern.ch
+ - route.openshift.io
resources:
- - drupalsiterequests/status
+ - routes
verbs:
+ - create
+ - delete
- get
+ - list
- patch
- update
+ - watch
diff --git a/config/samples/drupal.webservices_v1alpha1_drupalsite.yaml b/config/samples/drupal.webservices_v1alpha1_drupalsite.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2d654f25b6c4c66925a2d72428b0e7fab3459109
--- /dev/null
+++ b/config/samples/drupal.webservices_v1alpha1_drupalsite.yaml
@@ -0,0 +1,7 @@
+apiVersion: drupal.webservices.cern.ch/v1alpha1
+kind: DrupalSite
+metadata:
+ name: drupalsite-sample
+spec:
+ publish: false
+ drupalVersion: "9.0.7"
diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml
index f3b8c0ef1f0b2cbdef76e05ab2149b5bc01bbf13..61ff30740aa62e4fe958ce10a23388fd03c9778e 100644
--- a/config/samples/kustomization.yaml
+++ b/config/samples/kustomization.yaml
@@ -1,4 +1,4 @@
## Append samples you want in your CSV to this file as resources ##
resources:
-- webservices.cern.ch_v1alpha1_drupalsiterequest.yaml
+- drupal.webservices_v1alpha1_drupalsite.yaml
# +kubebuilder:scaffold:manifestskustomizesamples
diff --git a/config/samples/webservices.cern.ch_v1alpha1_drupalsiterequest.yaml b/config/samples/webservices.cern.ch_v1alpha1_drupalsiterequest.yaml
deleted file mode 100644
index f4ac9b665c0ecfaf80e251e52dd55879a07c7d2c..0000000000000000000000000000000000000000
--- a/config/samples/webservices.cern.ch_v1alpha1_drupalsiterequest.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: webservices.cern.ch/v1alpha1
-kind: DrupalSiteRequest
-metadata:
- name: drupalsiterequest-sample
-spec:
- # Add fields here
- publish: false
- drupalVersion: "9.0.7"
diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml
index 0016b652f77e5162c4ea53458bb8a7855dbd0087..d43478617811a5caf89c8e6a5086267fce5165e2 100644
--- a/config/scorecard/patches/basic.config.yaml
+++ b/config/scorecard/patches/basic.config.yaml
@@ -4,7 +4,7 @@
entrypoint:
- scorecard-test
- basic-check-spec
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: basic
test: basic-check-spec-test
diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml
index a39bfc51836ab77cf18c08b9488703b4cb5d5155..890bf0572a3d62dc22a1647424c6b2c4168a2a93 100644
--- a/config/scorecard/patches/olm.config.yaml
+++ b/config/scorecard/patches/olm.config.yaml
@@ -4,7 +4,7 @@
entrypoint:
- scorecard-test
- olm-bundle-validation
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: olm
test: olm-bundle-validation-test
@@ -14,7 +14,7 @@
entrypoint:
- scorecard-test
- olm-crds-have-validation
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: olm
test: olm-crds-have-validation-test
@@ -24,7 +24,7 @@
entrypoint:
- scorecard-test
- olm-crds-have-resources
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: olm
test: olm-crds-have-resources-test
@@ -34,7 +34,7 @@
entrypoint:
- scorecard-test
- olm-spec-descriptors
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: olm
test: olm-spec-descriptors-test
@@ -44,7 +44,7 @@
entrypoint:
- scorecard-test
- olm-status-descriptors
- image: quay.io/operator-framework/scorecard-test:v1.0.1
+ image: quay.io/operator-framework/scorecard-test:v1.3.0
labels:
suite: olm
test: olm-status-descriptors-test
diff --git a/config/webhook/kustomization.yaml b/config/webhook/kustomization.yaml
deleted file mode 100644
index 9cf26134e4d532aaa13b204462db91163493d188..0000000000000000000000000000000000000000
--- a/config/webhook/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-resources:
-- manifests.yaml
-- service.yaml
-
-configurations:
-- kustomizeconfig.yaml
diff --git a/config/webhook/kustomizeconfig.yaml b/config/webhook/kustomizeconfig.yaml
deleted file mode 100644
index 25e21e3c963f0023f8ca76d726a1526e660371f3..0000000000000000000000000000000000000000
--- a/config/webhook/kustomizeconfig.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# the following config is for teaching kustomize where to look at when substituting vars.
-# It requires kustomize v2.1.0 or newer to work properly.
-nameReference:
-- kind: Service
- version: v1
- fieldSpecs:
- - kind: MutatingWebhookConfiguration
- group: admissionregistration.k8s.io
- path: webhooks/clientConfig/service/name
- - kind: ValidatingWebhookConfiguration
- group: admissionregistration.k8s.io
- path: webhooks/clientConfig/service/name
-
-namespace:
-- kind: MutatingWebhookConfiguration
- group: admissionregistration.k8s.io
- path: webhooks/clientConfig/service/namespace
- create: true
-- kind: ValidatingWebhookConfiguration
- group: admissionregistration.k8s.io
- path: webhooks/clientConfig/service/namespace
- create: true
-
-varReference:
-- path: metadata/annotations
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/config/webhook/service.yaml b/config/webhook/service.yaml
deleted file mode 100644
index 31e0f82959198381af44cb9c871ae1b0f9b5e6dc..0000000000000000000000000000000000000000
--- a/config/webhook/service.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-apiVersion: v1
-kind: Service
-metadata:
- name: webhook-service
- namespace: system
-spec:
- ports:
- - port: 443
- targetPort: 9443
- selector:
- control-plane: controller-manager
diff --git a/config/www.conf b/config/www.conf
deleted file mode 100644
index 6a36b265a45a23d4f011d469ae313c201ebecddc..0000000000000000000000000000000000000000
--- a/config/www.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[www]
-listen = 9000
-pm = dynamic
-pm.max_children = 5
-pm.start_servers = 2
-pm.min_spare_servers = 1
-pm.max_spare_servers = 3
-catch_workers_output = yes
-php_admin_value[error_log] = /var/log/fpm-php.www.log
-php_admin_flag[log_errors] = on
-access.log = /proc/self/fd/2
\ No newline at end of file
diff --git a/controllers/drupalsiterequest_controller.go b/controllers/drupalsite_controller.go
similarity index 75%
rename from controllers/drupalsiterequest_controller.go
rename to controllers/drupalsite_controller.go
index beef533c5a8183aeb4fee138708550d210aa92cc..0c5039537b22d9eefb4f1b8176a4d87244b7185d 100644
--- a/controllers/drupalsiterequest_controller.go
+++ b/controllers/drupalsite_controller.go
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -34,51 +34,41 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
)
-// DrupalSiteRequestReconciler reconciles a DrupalSiteRequest object
-type DrupalSiteRequestReconciler struct {
+// DrupalSiteReconciler reconciles a DrupalSite object
+type DrupalSiteReconciler struct {
client.Client
Log logr.Logger
Scheme *runtime.Scheme
}
-/*
-The Reconcile(req ctrl.Request) (ctrl.Result, error) steps
-1. read the resource
-1. handle deletion
-1. ensure finalizer
-1. [validate spec]
-1. ensure children resources
- - Check if resources are created. Check error and resolve. Check resource spec also for detailed error and report it
-*/
+// +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=webservices.cern.ch,resources=drupalsiterequests,verbs=get;list;watch;create;update;patch;delete
-// +kubebuilder:rbac:groups=webservices.cern.ch,resources=drupalsiterequests/status,verbs=get;update;patch
// +kubebuilder:rbac:groups=apps.openshift.io,resources=deploymentconfigs,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;
// +kubebuilder:rbac:groups=route.openshift.io,resources=routes,verbs=get;list;watch;create;update;patch;delete
-// Reconcile runs the main reocncile loop
-func (r *DrupalSiteRequestReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
- ctx := context.TODO()
+func (r *DrupalSiteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
// _ = context.Background()
log := r.Log.WithValues("Request.Namespace", req.NamespacedName, "Request.Name", req.Name)
log.Info("Reconciling request")
- // Fetch the DrupalSiteRequest instance
- drupalSiteRequest := &webservicesv1a1.DrupalSiteRequest{}
+ // Fetch the DrupalSite instance
+ drupalSiteRequest := &webservicesv1a1.DrupalSite{}
err := r.Get(ctx, req.NamespacedName, drupalSiteRequest)
if err != nil {
if errors.IsNotFound(err) {
// Request object not found, could have been deleted after reconcile request.
// Owned objects are automatically garbage collected. For additional cleanup logic use finalizers.
// Return and don't requeue
- log.Info("DrupalSiteRequest resource not found. Ignoring since object must be deleted")
+ log.Info("DrupalSite resource not found. Ignoring since object must be deleted")
return ctrl.Result{}, nil
}
// Error reading the object - requeue the request.
- log.Error(err, "Failed to get DrupalSiteRequest")
+ log.Error(err, "Failed to get DrupalSite")
return ctrl.Result{}, err
}
@@ -86,7 +76,7 @@ func (r *DrupalSiteRequestReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
if drupalSiteRequest.GetDeletionTimestamp() != nil {
// drupalSiteRequest.Status.Phase = "Deleted"
// r.updateCRStatusorFailReconcile(ctx, log, drupalSiteRequest)
- return r.cleanupDrupalSiteRequest(ctx, log, drupalSiteRequest)
+ return r.cleanupDrupalSite(ctx, log, drupalSiteRequest)
}
handleTransientErr := func(transientErr reconcileError, logstrFmt string) (reconcile.Result, error) {
@@ -102,18 +92,18 @@ func (r *DrupalSiteRequestReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
// Init. Check if finalizer is set. If not, set it, validate and update CR status
if update := ensureSpecFinalizer(drupalSiteRequest); update {
- log.Info("Initializing DrupalSiteRequest Spec")
+ log.Info("Initializing DrupalSite Spec")
return r.updateCRorFailReconcile(ctx, log, drupalSiteRequest)
}
if err := validateSpec(drupalSiteRequest.Spec); err != nil {
- log.Error(err, fmt.Sprintf("%v failed to validate DrupalSiteRequest spec", err.Unwrap()))
+ log.Error(err, fmt.Sprintf("%v failed to validate DrupalSite spec", err.Unwrap()))
setErrorCondition(drupalSiteRequest, err)
return r.updateCRStatusorFailReconcile(ctx, log, drupalSiteRequest)
}
if !drupalSiteRequest.ConditionTrue("Installed") {
// NOTE: we can put the installation workflow here, because some parts of it will be different than `ensureDependentResources`
- log.Info("Installing DrupalSiteRequest")
+ log.Info("Installing DrupalSite")
reconcile, transientErr := r.ensureInstalled(ctx, drupalSiteRequest)
if transientErr != nil {
return handleTransientErr(transientErr, "%v while installing the website")
@@ -138,9 +128,9 @@ func (r *DrupalSiteRequestReconciler) Reconcile(req ctrl.Request) (ctrl.Result,
}
// SetupWithManager adds a manager which watches the resources
-func (r *DrupalSiteRequestReconciler) SetupWithManager(mgr ctrl.Manager) error {
+func (r *DrupalSiteReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
- For(&webservicesv1a1.DrupalSiteRequest{}).
+ For(&webservicesv1a1.DrupalSite{}).
Owns(&appsv1.DeploymentConfig{}).
Owns(&corev1.Service{}).
Owns(&corev1.PersistentVolumeClaim{}).
@@ -159,15 +149,15 @@ func (r *DrupalSiteRequestReconciler) SetupWithManager(mgr ctrl.Manager) error {
// Status - creation complete
// Transient Error Reconcile Error
-// cleanupDrupalSiteRequest checks and removes if a finalizer exists on the resource
-func (r *DrupalSiteRequestReconciler) cleanupDrupalSiteRequest(ctx context.Context, log logr.Logger, app *webservicesv1a1.DrupalSiteRequest) (ctrl.Result, error) {
+// cleanupDrupalSite checks and removes if a finalizer exists on the resource
+func (r *DrupalSiteReconciler) cleanupDrupalSite(ctx context.Context, log logr.Logger, app *webservicesv1a1.DrupalSite) (ctrl.Result, error) {
// finalizer: dependentResources
// 1. check if such resources exist
// - delete them
// - reconcile
// 1. if not, delete the finalizer key manually and let Kubernetes delete the resource cleanly
// TODO
- log.Info("Deleting DrupalSiteRequest")
+ log.Info("Deleting DrupalSite")
remainingFinalizers := app.GetFinalizers()
for i, finalizer := range remainingFinalizers {
if finalizer == finalizerStr {
@@ -179,13 +169,13 @@ func (r *DrupalSiteRequestReconciler) cleanupDrupalSiteRequest(ctx context.Conte
return r.updateCRorFailReconcile(ctx, log, app)
}
-func setReady(drp *webservicesv1a1.DrupalSiteRequest) (update bool) {
+func setReady(drp *webservicesv1a1.DrupalSite) (update bool) {
return drp.Status.Conditions.SetCondition(status.Condition{
Type: "Ready",
Status: "True",
})
}
-func setNotReady(drp *webservicesv1a1.DrupalSiteRequest, transientErr reconcileError) (update bool) {
+func setNotReady(drp *webservicesv1a1.DrupalSite, transientErr reconcileError) (update bool) {
return drp.Status.Conditions.SetCondition(status.Condition{
Type: "Ready",
Status: "False",
@@ -193,7 +183,7 @@ func setNotReady(drp *webservicesv1a1.DrupalSiteRequest, transientErr reconcileE
Message: transientErr.Error(),
})
}
-func setErrorCondition(drp *webservicesv1a1.DrupalSiteRequest, err reconcileError) (update bool) {
+func setErrorCondition(drp *webservicesv1a1.DrupalSite, err reconcileError) (update bool) {
return drp.Status.Conditions.SetCondition(status.Condition{
Type: "Error",
Status: "True",
diff --git a/controllers/drupalsiterequest_controller_test.go b/controllers/drupalsiterequest_controller_test.go
index 13df927c34bd7aa5815a477063b34faed7495258..fba6b41213342c6b545733990d55790b107bd084 100644
--- a/controllers/drupalsiterequest_controller_test.go
+++ b/controllers/drupalsiterequest_controller_test.go
@@ -29,7 +29,7 @@ import (
webservicescernchv1alpha1 "gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
)
-var _ = Describe("DrupalSiteRequest controller", func() {
+var _ = Describe("DrupalSite controller", func() {
// Define utility constants for object names and testing timeouts/durations and intervals.
const (
@@ -49,16 +49,16 @@ var _ = Describe("DrupalSiteRequest controller", func() {
Name: Name,
Namespace: Namespace,
}
- drupalSiteRequestObject := &webservicescernchv1alpha1.DrupalSiteRequest{
+ drupalSiteRequestObject := &webservicescernchv1alpha1.DrupalSite{
TypeMeta: metav1.TypeMeta{
APIVersion: "webservices.cern.ch/v1alpha1",
- Kind: "DrupalSiteRequest",
+ Kind: "DrupalSite",
},
ObjectMeta: metav1.ObjectMeta{
Name: key.Name,
Namespace: Namespace,
},
- Spec: webservicescernchv1alpha1.DrupalSiteRequestSpec{
+ Spec: webservicescernchv1alpha1.DrupalSiteSpec{
Publish: false,
DrupalVersion: "8.9.7",
},
@@ -68,21 +68,21 @@ var _ = Describe("DrupalSiteRequest controller", func() {
// By("Expecting created")
// Eventually(func() error {
- // d := &webservicescernchv1alpha1.DrupalSiteRequest{}
+ // d := &webservicescernchv1alpha1.DrupalSite{}
// return k8sClient.Get(ctx, key, d)
// }, timeout, interval).Should(Succeed())
// Delete
// By("Expecting to delete successfully")
// Eventually(func() error {
- // d := &webservicescernchv1alpha1.DrupalSiteRequest{}
+ // d := &webservicescernchv1alpha1.DrupalSite{}
// k8sClient.Get(ctx, key, d)
// return k8sClient.Delete(context.Background(), d)
// }, timeout, interval).Should(Succeed())
// By("Expecting to delete finish")
// Eventually(func() error {
- // d := &webservicescernchv1alpha1.DrupalSiteRequest{}
+ // d := &webservicescernchv1alpha1.DrupalSite{}
// return k8sClient.Get(ctx, key, d)
// }, timeout, interval).ShouldNot(Succeed())
})
diff --git a/controllers/drupalsiterequest_resources.go b/controllers/drupalsiterequest_resources.go
index 86847da1d2dca868ba022e34e8189157cab58757..6b146481de67fe4082bfb34d84ed40ea8108701f 100644
--- a/controllers/drupalsiterequest_resources.go
+++ b/controllers/drupalsiterequest_resources.go
@@ -39,22 +39,22 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/utils/pointer"
ctrl "sigs.k8s.io/controller-runtime"
+ "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
)
const (
- // finalizerStr string that is going to added to every DrupalSiteRequest created
+ // finalizerStr string that is going to added to every DrupalSite created
finalizerStr = "controller.drupalsiterequest.webservices.cern.ch"
MAX_BACKOFF_MS = 10000
)
-//validateSpec validates the spec against the DrupalSiteRequestSpec definition
-func validateSpec(drpSpec webservicesv1a1.DrupalSiteRequestSpec) reconcileError {
+//validateSpec validates the spec against the DrupalSiteSpec definition
+func validateSpec(drpSpec webservicesv1a1.DrupalSiteSpec) reconcileError {
_, err := govalidator.ValidateStruct(drpSpec)
if err != nil {
return newApplicationError(err, ErrInvalidSpec)
@@ -73,7 +73,7 @@ func contains(a []string, x string) bool {
// ensureSpecFinalizer ensures that the spec is valid, adding extra info if necessary, and that the finalizer is there,
// then returns if it needs to be updated.
-func ensureSpecFinalizer(drp *webservicesv1a1.DrupalSiteRequest) (update bool) {
+func ensureSpecFinalizer(drp *webservicesv1a1.DrupalSite) (update bool) {
if !contains(drp.GetFinalizers(), finalizerStr) {
drp.SetFinalizers(append(drp.GetFinalizers(), finalizerStr))
update = true
@@ -89,7 +89,7 @@ func exponentialBackoffMillisec(attempts int) (waitMs time.Duration) {
}
// ensureInstalled implements the site install workflow and updates the Status conditions accordingly
-func (r *DrupalSiteRequestReconciler) ensureInstalled(ctx context.Context, drp *webservicesv1a1.DrupalSiteRequest) (reconcile ctrl.Result, transientErr reconcileError) {
+func (r *DrupalSiteReconciler) ensureInstalled(ctx context.Context, drp *webservicesv1a1.DrupalSite) (reconcile ctrl.Result, transientErr reconcileError) {
if transientErr := r.ensurePreInstallResources(drp); transientErr != nil {
drp.Status.Conditions.SetCondition(status.Condition{
Type: "Installed",
@@ -133,7 +133,7 @@ func (r *DrupalSiteRequestReconciler) ensureInstalled(ctx context.Context, drp *
ensurePreInstallResources ensures presence of the primary set of resources namely MySQL DeploymentConfig,
MySQL Service, PersistentVolumeClaim and Site install Kubernetes Job
*/
-func (r *DrupalSiteRequestReconciler) ensurePreInstallResources(drp *webservicesv1a1.DrupalSiteRequest) (transientErr reconcileError) {
+func (r *DrupalSiteReconciler) ensurePreInstallResources(drp *webservicesv1a1.DrupalSite) (transientErr reconcileError) {
ctx := context.TODO()
if transientErr := r.ensureResourceX(ctx, drp, "pvc"); transientErr != nil {
return transientErr.Wrap("%v: for PVC")
@@ -154,7 +154,7 @@ func (r *DrupalSiteRequestReconciler) ensurePreInstallResources(drp *webservices
ensureDependentResources ensures the presence of the requested dependent resources namely PHP DeploymentConfig,
PHP Service, PHP ConfigMap, Nginx DeploymentConfig, Nginx Service, Route
*/
-func (r *DrupalSiteRequestReconciler) ensureDependentResources(drp *webservicesv1a1.DrupalSiteRequest) (transientErr reconcileError) {
+func (r *DrupalSiteReconciler) ensureDependentResources(drp *webservicesv1a1.DrupalSite) (transientErr reconcileError) {
ctx := context.TODO()
if transientErr := r.ensureResourceX(ctx, drp, "dc_php"); transientErr != nil {
@@ -184,8 +184,8 @@ func labelsForDrupalSiterequest(name string) map[string]string {
return map[string]string{"CRD": "drupalSiteRequest", "drupalSiteRequest_cr": name}
}
-// deploymentConfigForDrupalSiteRequestMySQL returns a DeploymentConfig object for MySQL
-func deploymentConfigForDrupalSiteRequestMySQL(d *webservicesv1a1.DrupalSiteRequest) *appsv1.DeploymentConfig {
+// deploymentConfigForDrupalSiteMySQL returns a DeploymentConfig object for MySQL
+func deploymentConfigForDrupalSiteMySQL(d *webservicesv1a1.DrupalSite) *appsv1.DeploymentConfig {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "mysql"
objectName := "drupal-mysql-" + d.Name
@@ -242,15 +242,15 @@ func deploymentConfigForDrupalSiteRequestMySQL(d *webservicesv1a1.DrupalSiteRequ
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, dep, r.Scheme)
// Add owner reference
addOwnerRefToObject(dep, asOwner(d))
return dep
}
-// deploymentConfigForDrupalSiteRequestNginx returns a DeploymentConfig for Nginx
-func deploymentConfigForDrupalSiteRequestNginx(d *webservicesv1a1.DrupalSiteRequest) *appsv1.DeploymentConfig {
+// deploymentConfigForDrupalSiteNginx returns a DeploymentConfig for Nginx
+func deploymentConfigForDrupalSiteNginx(d *webservicesv1a1.DrupalSite) *appsv1.DeploymentConfig {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "nginx"
@@ -308,15 +308,15 @@ func deploymentConfigForDrupalSiteRequestNginx(d *webservicesv1a1.DrupalSiteRequ
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, dep, r.Scheme)
// Add owner reference
addOwnerRefToObject(dep, asOwner(d))
return dep
}
-// deploymentConfigForDrupalSiteRequestPHP returns a DeploymentConfig object for PHP
-func deploymentConfigForDrupalSiteRequestPHP(d *webservicesv1a1.DrupalSiteRequest) *appsv1.DeploymentConfig {
+// deploymentConfigForDrupalSitePHP returns a DeploymentConfig object for PHP
+func deploymentConfigForDrupalSitePHP(d *webservicesv1a1.DrupalSite) *appsv1.DeploymentConfig {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "php"
@@ -392,15 +392,15 @@ func deploymentConfigForDrupalSiteRequestPHP(d *webservicesv1a1.DrupalSiteReques
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, dep, r.Scheme)
// Add owner reference
addOwnerRefToObject(dep, asOwner(d))
return dep
}
-// persistentVolumeClaimForDrupalSiteRequest returns a PVC object
-func persistentVolumeClaimForDrupalSiteRequest(d *webservicesv1a1.DrupalSiteRequest) *corev1.PersistentVolumeClaim {
+// persistentVolumeClaimForDrupalSite returns a PVC object
+func persistentVolumeClaimForDrupalSite(d *webservicesv1a1.DrupalSite) *corev1.PersistentVolumeClaim {
// ls := labelsForDrupalSiterequest(d.Name)
pvc := &corev1.PersistentVolumeClaim{
@@ -421,15 +421,15 @@ func persistentVolumeClaimForDrupalSiteRequest(d *webservicesv1a1.DrupalSiteRequ
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, pvc, r.Scheme)
// Add owner reference
addOwnerRefToObject(pvc, asOwner(d))
return pvc
}
-// serviceForDrupalSiteRequestPHP returns a service object for PHP
-func serviceForDrupalSiteRequestPHP(d *webservicesv1a1.DrupalSiteRequest) *corev1.Service {
+// serviceForDrupalSitePHP returns a service object for PHP
+func serviceForDrupalSitePHP(d *webservicesv1a1.DrupalSite) *corev1.Service {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "php"
@@ -448,15 +448,15 @@ func serviceForDrupalSiteRequestPHP(d *webservicesv1a1.DrupalSiteRequest) *corev
}},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, svc, r.Scheme)
// Add owner reference
addOwnerRefToObject(svc, asOwner(d))
return svc
}
-// serviceForDrupalSiteRequestNginx returns a service object for Nginx
-func serviceForDrupalSiteRequestNginx(d *webservicesv1a1.DrupalSiteRequest) *corev1.Service {
+// serviceForDrupalSiteNginx returns a service object for Nginx
+func serviceForDrupalSiteNginx(d *webservicesv1a1.DrupalSite) *corev1.Service {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "nginx"
@@ -475,15 +475,15 @@ func serviceForDrupalSiteRequestNginx(d *webservicesv1a1.DrupalSiteRequest) *cor
}},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, svc, r.Scheme)
// Add owner reference
addOwnerRefToObject(svc, asOwner(d))
return svc
}
-// serviceForDrupalSiteRequestMySQL returns a service object for MySQL
-func serviceForDrupalSiteRequestMySQL(d *webservicesv1a1.DrupalSiteRequest) *corev1.Service {
+// serviceForDrupalSiteMySQL returns a service object for MySQL
+func serviceForDrupalSiteMySQL(d *webservicesv1a1.DrupalSite) *corev1.Service {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "mysql"
@@ -502,15 +502,15 @@ func serviceForDrupalSiteRequestMySQL(d *webservicesv1a1.DrupalSiteRequest) *cor
}},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, svc, r.Scheme)
// Add owner reference
addOwnerRefToObject(svc, asOwner(d))
return svc
}
-// routeForDrupalSiteRequest returns a route object
-func routeForDrupalSiteRequest(d *webservicesv1a1.DrupalSiteRequest) *routev1.Route {
+// routeForDrupalSite returns a route object
+func routeForDrupalSite(d *webservicesv1a1.DrupalSite) *routev1.Route {
// ls := labelsForDrupalSiterequest(d.Name)
route := &routev1.Route{
@@ -530,15 +530,15 @@ func routeForDrupalSiteRequest(d *webservicesv1a1.DrupalSiteRequest) *routev1.Ro
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, svc, r.Scheme)
// Add owner reference
addOwnerRefToObject(route, asOwner(d))
return route
}
-// jobForDrupalSiteRequestDrush returns a job object thats runs drush
-func jobForDrupalSiteRequestDrush(d *webservicesv1a1.DrupalSiteRequest) *batchv1.Job {
+// jobForDrupalSiteDrush returns a job object thats runs drush
+func jobForDrupalSiteDrush(d *webservicesv1a1.DrupalSite) *batchv1.Job {
ls := labelsForDrupalSiterequest(d.Name)
ls["job"] = "drush"
@@ -607,7 +607,7 @@ func jobForDrupalSiteRequestDrush(d *webservicesv1a1.DrupalSiteRequest) *batchv1
},
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, dep, r.Scheme)
// Add owner reference
addOwnerRefToObject(job, asOwner(d))
@@ -615,7 +615,7 @@ func jobForDrupalSiteRequestDrush(d *webservicesv1a1.DrupalSiteRequest) *batchv1
}
// configMapForPHPFPM returns a job object thats runs drush
-func configMapForPHPFPM(d *webservicesv1a1.DrupalSiteRequest) *corev1.ConfigMap {
+func configMapForPHPFPM(d *webservicesv1a1.DrupalSite) *corev1.ConfigMap {
ls := labelsForDrupalSiterequest(d.Name)
ls["app"] = "php"
@@ -634,7 +634,7 @@ func configMapForPHPFPM(d *webservicesv1a1.DrupalSiteRequest) *corev1.ConfigMap
"www.conf": string(content),
},
}
- // Set DrupalSiteRequest instance as the owner and controller
+ // Set DrupalSite instance as the owner and controller
// ctrl.SetControllerReference(d, dep, r.Scheme)
// Add owner reference
addOwnerRefToObject(cm, asOwner(d))
@@ -642,7 +642,7 @@ func configMapForPHPFPM(d *webservicesv1a1.DrupalSiteRequest) *corev1.ConfigMap
}
// createResource creates a given resource passed as an argument
-func createResource(ctx context.Context, res runtime.Object, name string, namespace string, r *DrupalSiteRequestReconciler) (transientErr reconcileError) {
+func createResource(ctx context.Context, res client.Object, name string, namespace string, r *DrupalSiteReconciler) (transientErr reconcileError) {
deleteRecreate := func() error {
err := r.Delete(ctx, res)
if err != nil {
@@ -683,34 +683,34 @@ ensureResourceX ensure the requested resource is created, with the following val
- fpm_cm: ConfigMap for PHP-FPM
- route: Route for the drupalsite
*/
-func (r *DrupalSiteRequestReconciler) ensureResourceX(ctx context.Context, d *webservicesv1a1.DrupalSiteRequest, resType string) (transientErr reconcileError) {
+func (r *DrupalSiteReconciler) ensureResourceX(ctx context.Context, d *webservicesv1a1.DrupalSite, resType string) (transientErr reconcileError) {
switch resType {
case "dc_mysql":
- res := deploymentConfigForDrupalSiteRequestMySQL(d)
+ res := deploymentConfigForDrupalSiteMySQL(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "dc_php":
- res := deploymentConfigForDrupalSiteRequestPHP(d)
+ res := deploymentConfigForDrupalSitePHP(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "dc_nginx":
- res := deploymentConfigForDrupalSiteRequestNginx(d)
+ res := deploymentConfigForDrupalSiteNginx(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "svc_mysql":
- res := serviceForDrupalSiteRequestMySQL(d)
+ res := serviceForDrupalSiteMySQL(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "svc_php":
- res := serviceForDrupalSiteRequestPHP(d)
+ res := serviceForDrupalSitePHP(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "svc_nginx":
- res := serviceForDrupalSiteRequestNginx(d)
+ res := serviceForDrupalSiteNginx(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "pvc":
- res := persistentVolumeClaimForDrupalSiteRequest(d)
+ res := persistentVolumeClaimForDrupalSite(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "route":
- res := routeForDrupalSiteRequest(d)
+ res := routeForDrupalSite(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "site_install_job":
- res := jobForDrupalSiteRequestDrush(d)
+ res := jobForDrupalSiteDrush(d)
return createResource(ctx, res, res.Name, res.Namespace, r)
case "fpm_cm":
res := configMapForPHPFPM(d)
@@ -724,7 +724,7 @@ func (r *DrupalSiteRequestReconciler) ensureResourceX(ctx context.Context, d *we
}
// updateCRorFailReconcile tries to update the Custom Resource and logs any error
-func (r *DrupalSiteRequestReconciler) updateCRorFailReconcile(ctx context.Context, log logr.Logger, drp *webservicesv1a1.DrupalSiteRequest) (
+func (r *DrupalSiteReconciler) updateCRorFailReconcile(ctx context.Context, log logr.Logger, drp *webservicesv1a1.DrupalSite) (
reconcile.Result, error) {
if err := r.Update(ctx, drp); err != nil {
log.Error(err, fmt.Sprintf("%v failed to update the application", ErrClientK8s))
@@ -734,7 +734,7 @@ func (r *DrupalSiteRequestReconciler) updateCRorFailReconcile(ctx context.Contex
}
// updateCRStatusorFailReconcile tries to update the Custom Resource Status and logs any error
-func (r *DrupalSiteRequestReconciler) updateCRStatusorFailReconcile(ctx context.Context, log logr.Logger, drp *webservicesv1a1.DrupalSiteRequest) (
+func (r *DrupalSiteReconciler) updateCRStatusorFailReconcile(ctx context.Context, log logr.Logger, drp *webservicesv1a1.DrupalSite) (
reconcile.Result, error) {
if err := r.Status().Update(ctx, drp); err != nil {
log.Error(err, fmt.Sprintf("%v failed to update the application status", ErrClientK8s))
@@ -749,7 +749,7 @@ func addOwnerRefToObject(obj metav1.Object, ownerRef metav1.OwnerReference) {
}
// asOwner returns an OwnerReference set as the memcached CR
-func asOwner(d *webservicesv1a1.DrupalSiteRequest) metav1.OwnerReference {
+func asOwner(d *webservicesv1a1.DrupalSite) metav1.OwnerReference {
trueVar := true
return metav1.OwnerReference{
APIVersion: d.APIVersion,
@@ -761,9 +761,9 @@ func asOwner(d *webservicesv1a1.DrupalSiteRequest) metav1.OwnerReference {
}
// isDrushJobCompleted checks if the drush job is successfully completed
-func (r *DrupalSiteRequestReconciler) isDrushJobCompleted(ctx context.Context, d *webservicesv1a1.DrupalSiteRequest) bool {
+func (r *DrupalSiteReconciler) isDrushJobCompleted(ctx context.Context, d *webservicesv1a1.DrupalSite) bool {
found := &batchv1.Job{}
- jobObject := jobForDrupalSiteRequestDrush(d)
+ jobObject := jobForDrupalSiteDrush(d)
err := r.Get(ctx, types.NamespacedName{Name: jobObject.Name, Namespace: jobObject.Namespace}, found)
if err == nil {
if found.Status.Succeeded != 0 {
@@ -773,7 +773,7 @@ func (r *DrupalSiteRequestReconciler) isDrushJobCompleted(ctx context.Context, d
return false
}
-// siteInstallJobForDrupalSite outputs the command needed for jobForDrupalSiteRequestDrush
+// siteInstallJobForDrupalSite outputs the command needed for jobForDrupalSiteDrush
func siteInstallJobForDrupalSite() []string {
return []string{"sh", "-c", "drush site-install -y --config-dir=../config/sync --account-name=admin --account-pass=pass --account-mail=admin@example.com"}
}
diff --git a/controllers/suite_test.go b/controllers/suite_test.go
index b439d7d9b647d3c26f4d6155c43b2a66463879bc..4b39bfa326d1bc4f3c6f89906f038a55b26d7ff0 100644
--- a/controllers/suite_test.go
+++ b/controllers/suite_test.go
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -24,14 +24,13 @@ import (
. "github.com/onsi/gomega"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
- ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
- webservicescernchv1alpha1 "gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
+ drupalwebservicesv1alpha1 "gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
// +kubebuilder:scaffold:imports
)
@@ -50,52 +49,31 @@ func TestAPIs(t *testing.T) {
[]Reporter{printer.NewlineReporter{}})
}
-var _ = BeforeSuite(func(done Done) {
- logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+var _ = BeforeSuite(func() {
+ logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
By("bootstrapping test environment")
testEnv = &envtest.Environment{
CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases")},
}
- var err error
- cfg, err = testEnv.Start()
- Expect(err).ToNot(HaveOccurred())
- Expect(cfg).ToNot(BeNil())
+ cfg, err := testEnv.Start()
+ Expect(err).NotTo(HaveOccurred())
+ Expect(cfg).NotTo(BeNil())
- err = webservicescernchv1alpha1.AddToScheme(scheme.Scheme)
+ err = drupalwebservicesv1alpha1.AddToScheme(scheme.Scheme)
Expect(err).NotTo(HaveOccurred())
// +kubebuilder:scaffold:scheme
- // k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
- // Expect(err).ToNot(HaveOccurred())
- // Expect(k8sClient).ToNot(BeNil())
-
- k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
- Scheme: scheme.Scheme,
- })
- Expect(err).ToNot(HaveOccurred())
-
- err = (&DrupalSiteRequestReconciler{
- Client: k8sManager.GetClient(),
- Log: ctrl.Log.WithName("controllers").WithName("DrupalSiteRequest"),
- }).SetupWithManager(k8sManager)
- Expect(err).ToNot(HaveOccurred())
-
- go func() {
- err = k8sManager.Start(ctrl.SetupSignalHandler())
- Expect(err).ToNot(HaveOccurred())
- }()
-
- k8sClient = k8sManager.GetClient()
- Expect(k8sClient).ToNot(BeNil())
+ k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
+ Expect(err).NotTo(HaveOccurred())
+ Expect(k8sClient).NotTo(BeNil())
- close(done)
}, 60)
var _ = AfterSuite(func() {
By("tearing down the test environment")
err := testEnv.Stop()
- Expect(err).ToNot(HaveOccurred())
+ Expect(err).NotTo(HaveOccurred())
})
diff --git a/go.mod b/go.mod
index 37ac12d6735e02aeebd67a95003bd89952112c8e..e188d4204971d068b050061a57f253ca597a4a8f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,15 +5,14 @@ go 1.15
require (
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
github.com/go-logr/logr v0.3.0
- github.com/go-logr/zapr v0.2.0 // indirect
- github.com/onsi/ginkgo v1.12.1
- github.com/onsi/gomega v1.10.1
+ github.com/onsi/ginkgo v1.14.1
+ github.com/onsi/gomega v1.10.2
github.com/openshift/api v0.0.0-20201126092428-04abbec6c099
github.com/operator-framework/operator-lib v0.1.0
- github.com/prometheus/common v0.4.1
- k8s.io/api v0.19.4
- k8s.io/apimachinery v0.19.4
+ github.com/prometheus/common v0.10.0
+ k8s.io/api v0.19.2
+ k8s.io/apimachinery v0.19.2
k8s.io/client-go v0.19.2
- k8s.io/utils v0.0.0-20200729134348-d5654de09c73
- sigs.k8s.io/controller-runtime v0.6.3
+ k8s.io/utils v0.0.0-20200912215256-4140de9c8800
+ sigs.k8s.io/controller-runtime v0.7.0
)
diff --git a/go.sum b/go.sum
index 7b24899a2e38d3260279481d71ca9a96e63bfb6f..c415c48c4c26abfb7886228edaf988e1b64fb95e 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,5 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
@@ -15,48 +14,61 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
+github.com/Azure/go-autorest/autorest v0.9.6 h1:5YWtOnckcudzIw8lPPBcWOnmIFWMtHci1ZWAZulMSx0=
github.com/Azure/go-autorest/autorest v0.9.6/go.mod h1:/FALq9T/kS7b5J5qsQ+RSTUdAmGFqi0vUdVNNx8q630=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
+github.com/Azure/go-autorest/autorest/adal v0.8.2 h1:O1X4oexUxnZCaEUGsvMnr8ZGj8HI37tNezwY4npRqA0=
github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
+github.com/Azure/go-autorest/autorest/date v0.2.0 h1:yW+Zlqf26583pE43KhfnhFcdmSWlm5Ew6bxipnr/tbM=
github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
+github.com/Azure/go-autorest/autorest/mocks v0.3.0 h1:qJumjCaCudz+OcqE9/XtEPfvtOjOmKaui4EOpFI6zZc=
github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
+github.com/Azure/go-autorest/logger v0.1.0 h1:ruG4BSDXONFRrZZJ2GUXDiUyVpayPmb1GnWeHDdaNKY=
github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
+github.com/Azure/go-autorest/tracing v0.5.0 h1:TRn4WjSnkcSy5AEG3pnbtFSwNtwzjr4VYyQflFE619k=
github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA=
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0 h1:HWo1m869IqiPhD389kmkxeTalrjNbbJTC8LXupb+sl0=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
+github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
@@ -66,12 +78,16 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
+github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -98,14 +114,13 @@ github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0
github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY=
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/zapr v0.1.0 h1:h+WVe9j6HAA01niTJPA/kKH0i7e0rLZBCwauQFcRE54=
github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
@@ -159,7 +174,6 @@ github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA=
@@ -185,8 +199,9 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -202,19 +217,20 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
-github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJhYk=
github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
-github.com/googleapis/gnostic v0.4.1 h1:DLJCy1n/vrD4HPjOvYcT8aYQXpPIzoRZONaYwyycI+I=
github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
+github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM=
+github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
+github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
@@ -222,8 +238,9 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg=
github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
+github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -237,10 +254,10 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -258,10 +275,12 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
+github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -274,17 +293,20 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1 h1:mFwc4LvZ0xpSvDZ3E+k8Yte0hLOMxXUlP+yXtJqkYfQ=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4=
+github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
+github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/openshift/api v0.0.0-20201126092428-04abbec6c099 h1:eYQ1Q974bnkOegqZu3IaWQeVA3btAPcDmlfPcHvb7u0=
github.com/openshift/api v0.0.0-20201126092428-04abbec6c099/go.mod h1:RDvBcRQMGLa3aNuDuejVBbTEQj/2i14NXdpOLqbNBvM=
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
@@ -301,32 +323,45 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0 h1:vrDKnkGzuGvhNAL56c7DBz29ZL+KxnoR0x7enabFceM=
+github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1 h1:K0MGApIoQvMw27RTdJkPbr3JZ7DNbtxQNyi5STVM6Kw=
+github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.11 h1:DhHlBtkHWPYi8O2y31JkK0TF+DGM+51OopZjH/Ia5qI=
github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -334,6 +369,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
+github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
@@ -344,14 +381,19 @@ github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
+go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -359,13 +401,20 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
+go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
+go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -393,6 +442,8 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f h1:J5lckAjkw6qYlOZNj90mLYNTEKDvWeuc1yieZ8qUzUE=
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
@@ -400,6 +451,7 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -415,6 +467,7 @@ golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -464,7 +517,11 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4 h1:5/PjkGUjvEU5Gl6BxmvKRPpqo2uNMv4rcHBMwzk/st8=
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -476,8 +533,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
+golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -495,21 +553,27 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200616133436-c1934b75d054 h1:HHeAlu5H9b71C+Fx0K+1dGgVFN1DM1/wz4aoGOA5qS8=
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gomodules.xyz/jsonpatch/v2 v2.0.1 h1:xyiBuvkD2g5n7cYzx6u2sxQvsAy4QJsZFCzGVdzOXZ0=
gomodules.xyz/jsonpatch/v2 v2.0.1/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
+gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
+gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -519,8 +583,9 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -533,6 +598,7 @@ google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvx
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
@@ -568,41 +634,39 @@ gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bl
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4=
-k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
k8s.io/api v0.19.2 h1:q+/krnHWKsL7OBZg/rxnycsl9569Pud76UJ77MvKXms=
k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI=
-k8s.io/api v0.19.4 h1:I+1I4cgJYuCDgiLNjKx7SLmIbwgj9w7N7Zr5vSIdwpo=
-k8s.io/api v0.19.4/go.mod h1:SbtJ2aHCItirzdJ36YslycFNzWADYH3tgOhvBEFtZAk=
k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio=
-k8s.io/apiextensions-apiserver v0.18.6 h1:vDlk7cyFsDyfwn2rNAO2DbmUbvXy5yT5GE3rrqOzaMo=
-k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M=
+k8s.io/apiextensions-apiserver v0.19.2 h1:oG84UwiDsVDu7dlsGQs5GySmQHCzMhknfhFExJMz9tA=
+k8s.io/apiextensions-apiserver v0.19.2/go.mod h1:EYNjpqIAvNZe+svXVx9j4uBaVhTB4C94HkY3w058qcg=
k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
-k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko=
k8s.io/apimachinery v0.19.2 h1:5Gy9vQpAGTKHPVOh5c4plE274X8D/6cuEiTO2zve7tc=
k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
-k8s.io/apimachinery v0.19.4 h1:+ZoddM7nbzrDCp0T3SWnyxqf8cbWPT2fkZImoyvHUG0=
-k8s.io/apimachinery v0.19.4/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8=
-k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg=
+k8s.io/apiserver v0.19.2/go.mod h1:FreAq0bJ2vtZFj9Ago/X0oNGC51GfubKK/ViOKfVAOA=
k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g=
-k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
k8s.io/client-go v0.19.2 h1:gMJuU3xJZs86L1oQ99R4EViAADUPMHHtS9jFshasHSc=
k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA=
k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
-k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk=
k8s.io/component-base v0.18.4/go.mod h1:7jr/Ef5PGmKwQhyAz/pjByxJbC58mhKAhiaDu0vXfPk=
-k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14=
+k8s.io/component-base v0.19.2 h1:jW5Y9RcZTb79liEhW3XDVTW7MuvEGP0tQZnfSX6/+gs=
+k8s.io/component-base v0.19.2/go.mod h1:g5LrsiTiabMLZ40AR6Hl45f088DevyGY+cCE2agEIVo=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -619,13 +683,15 @@ k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg=
k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20200912215256-4140de9c8800 h1:9ZNvfPvVIEsp/T1ez4GQuzCcCTEQWhovSofhqR73A6g=
+k8s.io/utils v0.0.0-20200912215256-4140de9c8800/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0=
sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A=
-sigs.k8s.io/controller-runtime v0.6.3 h1:SBbr+inLPEKhvlJtrvDcwIpm+uhDvp63Bl72xYJtoOE=
-sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
+sigs.k8s.io/controller-runtime v0.7.0 h1:bU20IBBEPccWz5+zXpLnpVsgBYxqclaHu1pVDl/gEt8=
+sigs.k8s.io/controller-runtime v0.7.0/go.mod h1:pJ3YBrJiAqMAZKi6UVGuE98ZrroV1p+pIhoHsMm9wdU=
sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA=
diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt
index 767efde981751841720293d1a34717fdc145d832..45dbbbbcf09864f52850d7f4e6a59b76b5d48136 100644
--- a/hack/boilerplate.go.txt
+++ b/hack/boilerplate.go.txt
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/main.go b/main.go
index f2d5ae5650c95c078cd1bb72d6be3c0374e501fa..eabeebdf3767a66805a4f8593752319cc0391c88 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,5 @@
/*
-
+Copyright 2021.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,14 +20,18 @@ import (
"flag"
"os"
+ // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+ // to ensure that exec-entrypoint and run can make use of them.
+ _ "k8s.io/client-go/plugin/pkg/client/auth"
+
"k8s.io/apimachinery/pkg/runtime"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
- _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
ctrl "sigs.k8s.io/controller-runtime"
+ "sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
- webservicescernchv1alpha1 "gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
+ drupalwebservicesv1alpha1 "gitlab.cern.ch/drupal/paas/drupalsite-operator/api/v1alpha1"
"gitlab.cern.ch/drupal/paas/drupalsite-operator/controllers"
// +kubebuilder:scaffold:imports
@@ -43,7 +47,7 @@ var (
func init() {
utilruntime.Must(clientgoscheme.AddToScheme(scheme))
- utilruntime.Must(webservicescernchv1alpha1.AddToScheme(scheme))
+ utilruntime.Must(drupalwebservicesv1alpha1.AddToScheme(scheme))
// +kubebuilder:scaffold:scheme
utilruntime.Must(appsv1.AddToScheme(scheme))
@@ -53,36 +57,52 @@ func init() {
func main() {
var metricsAddr string
var enableLeaderElection bool
- flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
- flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
+ var probeAddr string
+ flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
+ flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
+ flag.BoolVar(&enableLeaderElection, "leader-elect", false,
"Enable leader election for controller manager. "+
"Enabling this will ensure there is only one active controller manager.")
+ opts := zap.Options{
+ Development: true,
+ }
+ opts.BindFlags(flag.CommandLine)
flag.Parse()
- ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
+ ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
- Scheme: scheme,
- MetricsBindAddress: metricsAddr,
- Port: 9443,
- LeaderElection: enableLeaderElection,
- LeaderElectionID: "78d40201.webservices.cern.ch",
+ Scheme: scheme,
+ MetricsBindAddress: metricsAddr,
+ Port: 9443,
+ HealthProbeBindAddress: probeAddr,
+ LeaderElection: enableLeaderElection,
+ LeaderElectionID: "78d40201.cern.ch",
})
if err != nil {
setupLog.Error(err, "unable to start manager")
os.Exit(1)
}
- if err = (&controllers.DrupalSiteRequestReconciler{
+ if err = (&controllers.DrupalSiteReconciler{
Client: mgr.GetClient(),
- Log: ctrl.Log.WithName("controllers").WithName("DrupalSiteRequest"),
+ Log: ctrl.Log.WithName("controllers").WithName("DrupalSite"),
Scheme: mgr.GetScheme(),
}).SetupWithManager(mgr); err != nil {
- setupLog.Error(err, "unable to create controller", "controller", "DrupalSiteRequest")
+ setupLog.Error(err, "unable to create controller", "controller", "DrupalSite")
os.Exit(1)
}
// +kubebuilder:scaffold:builder
+ if err := mgr.AddHealthzCheck("health", healthz.Ping); err != nil {
+ setupLog.Error(err, "unable to set up health check")
+ os.Exit(1)
+ }
+ if err := mgr.AddReadyzCheck("check", healthz.Ping); err != nil {
+ setupLog.Error(err, "unable to set up ready check")
+ os.Exit(1)
+ }
+
setupLog.Info("starting manager")
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
setupLog.Error(err, "problem running manager")
diff --git a/testbin/setup-envtest.sh b/testbin/setup-envtest.sh
new file mode 100644
index 0000000000000000000000000000000000000000..783f930d447d38e4e384b22c6d4ed634cf82a83b
--- /dev/null
+++ b/testbin/setup-envtest.sh
@@ -0,0 +1,96 @@
+#!/usr/bin/env bash
+
+# Copyright 2020 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o pipefail
+
+# Turn colors in this script off by setting the NO_COLOR variable in your
+# environment to any value:
+#
+# $ NO_COLOR=1 test.sh
+NO_COLOR=${NO_COLOR:-""}
+if [ -z "$NO_COLOR" ]; then
+ header=$'\e[1;33m'
+ reset=$'\e[0m'
+else
+ header=''
+ reset=''
+fi
+
+function header_text {
+ echo "$header$*$reset"
+}
+
+function setup_envtest_env {
+ header_text "setting up env vars"
+
+ # Setup env vars
+ KUBEBUILDER_ASSETS=${KUBEBUILDER_ASSETS:-""}
+ if [[ -z "${KUBEBUILDER_ASSETS}" ]]; then
+ export KUBEBUILDER_ASSETS=$1/bin
+ fi
+}
+
+# fetch k8s API gen tools and make it available under envtest_root_dir/bin.
+#
+# Skip fetching and untaring the tools by setting the SKIP_FETCH_TOOLS variable
+# in your environment to any value:
+#
+# $ SKIP_FETCH_TOOLS=1 ./check-everything.sh
+#
+# If you skip fetching tools, this script will use the tools already on your
+# machine.
+function fetch_envtest_tools {
+ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
+ if [ -n "$SKIP_FETCH_TOOLS" ]; then
+ return 0
+ fi
+
+ tmp_root=/tmp
+ envtest_root_dir=$tmp_root/envtest
+
+ k8s_version="${ENVTEST_K8S_VERSION:-1.19.2}"
+ goarch="$(go env GOARCH)"
+ goos="$(go env GOOS)"
+
+ if [[ "$goos" != "linux" && "$goos" != "darwin" ]]; then
+ echo "OS '$goos' not supported. Aborting." >&2
+ return 1
+ fi
+
+ local dest_dir="${1}"
+
+ # use the pre-existing version in the temporary folder if it matches our k8s version
+ if [[ -x "${dest_dir}/bin/kube-apiserver" ]]; then
+ version=$("${dest_dir}"/bin/kube-apiserver --version)
+ if [[ $version == *"${k8s_version}"* ]]; then
+ header_text "Using cached envtest tools from ${dest_dir}"
+ return 0
+ fi
+ fi
+
+ header_text "fetching envtest tools@${k8s_version} (into '${dest_dir}')"
+ envtest_tools_archive_name="kubebuilder-tools-$k8s_version-$goos-$goarch.tar.gz"
+ envtest_tools_download_url="https://storage.googleapis.com/kubebuilder-tools/$envtest_tools_archive_name"
+
+ envtest_tools_archive_path="$tmp_root/$envtest_tools_archive_name"
+ if [ ! -f $envtest_tools_archive_path ]; then
+ curl -sL ${envtest_tools_download_url} -o "$envtest_tools_archive_path"
+ fi
+
+ mkdir -p "${dest_dir}"
+ tar -C "${dest_dir}" --strip-components=1 -zvxf "$envtest_tools_archive_path"
+}