diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..243f81a5 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file +# Ignore all files which are not go type +!**/*.go +!**/*.mod +!**/*.sum diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 685ad4db..39718f72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,11 +41,11 @@ jobs: with: go-version: ${{ env.GO_VERSION }} - name: Build Binary - run: make binary + run: make build - name: Cache Artifacts uses: actions/cache@v2.1.5 with: - path: ${{ github.workspace }}/build/_output/bin/nginx-ingress-operator + path: ${{ github.workspace }}/bin/manager key: nginx-ingress-operator-${{ github.run_id }}-${{ github.run_number }} unit-tests: @@ -71,7 +71,7 @@ jobs: - name: Fetch Cached Artifacts uses: actions/cache@v2.1.5 with: - path: ${{ github.workspace }}/build/_output/bin/nginx-ingress-operator + path: ${{ github.workspace }}/bin/manager key: nginx-ingress-operator-${{ github.run_id }}-${{ github.run_number }} - name: Docker Buildx uses: docker/setup-buildx-action@v1 @@ -87,7 +87,6 @@ jobs: - name: Build Image uses: docker/build-push-action@v2 with: - file: build/Dockerfile context: '.' cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/.gitignore b/.gitignore index d1ece321..c0a7a54c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,80 +1,25 @@ -# Temporary Build Files -build/_output -build/_test -bundle.zip -# Created by https://www.gitignore.io/api/go,vim,emacs,visualstudiocode -### Emacs ### -# -*- mode: gitignore; -*- -*~ -\#*\# -/.emacs.desktop -/.emacs.desktop.lock -*.elc -auto-save-list -tramp -.\#* -# Org-mode -.org-id-locations -*_archive -# flymake-mode -*_flymake.* -# eshell files -/eshell/history -/eshell/lastdir -# elpa packages -/elpa/ -# reftex files -*.rel -# AUCTeX auto folder -/auto/ -# cask packages -.cask/ -dist/ -# Flycheck -flycheck_*.el -# server auth directory -/server/ -# projectiles files -.projectile -projectile-bookmarks.eld -# directory configuration -.dir-locals.el -# saveplace -places -# url cache -url/cache/ -# cedet -ede-projects.el -# smex -smex-items -# company-statistics -company-statistics-cache.el -# anaconda-mode -anaconda-mode/ -### Go ### + # Binaries for programs and plugins *.exe *.exe~ *.dll *.so *.dylib -# Test binary, build with 'go test -c' +bin +testbin/* + +# Test binary, build with `go test -c` *.test + # Output of the go coverage tool, specifically when used with LiteIDE *.out -### Vim ### -# swap -.sw[a-p] -.*.sw[a-p] -# session -Session.vim -# temporary -.netrwhist -# auto-generated tag files -tags -### VisualStudioCode ### -.vscode/* -.history -# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode -.DS_Store + +# Kubernetes Generated files - skip generated files, except for vendored files + +!vendor/**/zz_generated.* + +# editor and IDE paraphernalia .idea +*.swp +*.swo +*~ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..1a92752b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,29 @@ +# Build the manager binary +FROM golang:1.16 as builder +ARG VERSION + +WORKDIR /workspace +# Copy the Go Modules manifests +COPY go.mod go.mod +COPY go.sum go.sum +# cache deps before building and copying source so that we don't need to re-download as much +# and so that source changes don't invalidate our downloaded layer +RUN go mod download + +# Copy the go source +COPY main.go main.go +COPY api/ api/ +COPY controllers/ controllers/ + +# Build +RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s -w -X main.version=${VERSION}" -a -o manager main.go + +# Use distroless as minimal base image to package the manager binary +# Refer to https://github.com/GoogleContainerTools/distroless for more details +FROM gcr.io/distroless/static:nonroot +WORKDIR / +COPY --from=builder --chown=65532:65532 /workspace/manager . +COPY config/crd/kic ./config/crd/kic +USER 65532:65532 + +ENTRYPOINT ["/manager"] diff --git a/Makefile b/Makefile index dd2e0c63..e22e6190 100644 --- a/Makefile +++ b/Makefile @@ -1,39 +1,200 @@ -OLD_TAG = 0.1.0 -TAG = 0.2.0 +# VERSION defines the project version for the bundle. +# Update this value when you upgrade the version of your project. +# To re-generate a bundle for another specific version without changing the standard setup, you can: +# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) +# - use environment variables to overwrite this value (e.g export VERSION=0.0.2) +VERSION ?= 0.3.0 -IMAGE = nginx/nginx-ingress-operator +# CHANNELS define the bundle channels used in the bundle. +# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable") +# To re-generate a bundle for other specific channels without changing the standard setup, you can: +# - use the CHANNELS as arg of the bundle target (e.g make bundle CHANNELS=preview,fast,stable) +# - use environment variables to overwrite this value (e.g export CHANNELS="preview,fast,stable") +ifneq ($(origin CHANNELS), undefined) +BUNDLE_CHANNELS := --channels=$(CHANNELS) +endif -test: - GO111MODULE=on go test ./... +# DEFAULT_CHANNEL defines the default channel used in the bundle. +# Add a new line here if you would like to change its default config. (E.g DEFAULT_CHANNEL = "stable") +# To re-generate a bundle for any other default channel without changing the default setup, you can: +# - use the DEFAULT_CHANNEL as arg of the bundle target (e.g make bundle DEFAULT_CHANNEL=stable) +# - use environment variables to overwrite this value (e.g export DEFAULT_CHANNEL="stable") +ifneq ($(origin DEFAULT_CHANNEL), undefined) +BUNDLE_DEFAULT_CHANNEL := --default-channel=$(DEFAULT_CHANNEL) +endif +BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) -binary: - $(eval GOPATH=$(shell go env GOPATH)) - CGO_ENABLED=0 GO111MODULE=on GOFLAGS="-gcflags=-trimpath=${GOPATH} -asmflags=-trimpath=${GOPATH}" GOOS=linux go build -trimpath -ldflags "-s -w" -o build/_output/bin/nginx-ingress-operator github.com/nginxinc/nginx-ingress-operator/cmd/manager +# IMAGE_TAG_BASE defines the docker.io namespace and part of the image name for remote images. +# This variable is used to construct full image tags for bundle and catalog images. +# +# For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both +# nginx/nginx-ingress-operator-bundle:$VERSION and nginx/nginx-ingress-operator-catalog:$VERSION. +IMAGE_TAG_BASE ?= nginx/nginx-ingress-operator -build: binary - docker build -f build/Dockerfile -t $(IMAGE):$(TAG) . +# BUNDLE_IMG defines the image:tag used for the bundle. +# You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) +BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION) -run-local: - go run github.com/operator-framework/operator-sdk/cmd/operator-sdk run local +# Image URL to use all building/pushing image targets +IMG ?= $(IMAGE_TAG_BASE):$(VERSION) +# Produce CRDs that work back to Kubernetes 1.11 (no version conversion) +CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false" -generate-crds: - go run github.com/operator-framework/operator-sdk/cmd/operator-sdk generate k8s && operator-sdk generate crds --crd-version v1beta1 +# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) +ifeq (,$(shell go env GOBIN)) +GOBIN=$(shell go env GOPATH)/bin +else +GOBIN=$(shell go env GOBIN) +endif -lint: - go run github.com/golangci/golangci-lint/cmd/golangci-lint run +# Setting SHELL to bash allows bash commands to be executed by recipes. +# This is a requirement for 'setup-envtest.sh' in the test target. +# Options are set to exit when a recipe line exits non-zero or a piped command fails. +SHELL = /usr/bin/env bash -o pipefail +.SHELLFLAGS = -ec -generate-metadata: generate-crds - go run github.com/operator-framework/operator-sdk/cmd/operator-sdk generate csv --csv-version=$(TAG) --from-version=$(OLD_TAG) --make-manifests=false - echo "Metadata generated, please make sure you add/update fields in nginx-ingress-operator.v$(TAG).clusterserviceversion.yaml" +all: build -generate-bundle: - @mkdir bundle/$(TAG) - @cp deploy/crds/* bundle/$(TAG) - @cp deploy/olm-catalog/nginx-ingress-operator/nginx-ingress-operator.package.yaml bundle/ - @cp -R deploy/olm-catalog/nginx-ingress-operator/$(TAG)/ bundle/$(TAG)/ - cd bundle && opm alpha bundle generate -d ./$(TAG)/ -u ./$(TAG)/ - @mv bundle/bundle.Dockerfile bundle/bundle-$(TAG).Dockerfile - @echo '\nLABEL com.redhat.openshift.versions="v4.5,v4.6"\nLABEL com.redhat.delivery.operator.bundle=true\nLABEL com.redhat.delivery.backport=true' >> bundle/bundle-$(TAG).Dockerfile - docker build -t bundle:$(TAG) -f bundle/bundle-$(TAG).Dockerfile ./bundle +##@ General -.PHONY: build +# The help target prints out all targets with their descriptions organized +# beneath their categories. The categories are represented by '##@' and the +# target descriptions by '##'. The awk commands is responsible for reading the +# entire set of makefiles included in this invocation, looking for lines of the +# file as xyz: ## something, and then pretty-format the target and help. Then, +# if there's a line with ##@ something, that gets pretty-printed as a category. +# More info on the usage of ANSI control characters for terminal formatting: +# https://en.wikipedia.org/wiki/ANSI_escape_code#SGR_parameters +# More info on the awk command: +# http://linuxcommand.org/lc3_adv_awk.php + +help: ## Display this help. + @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) + +##@ Development + +manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. + $(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases + +generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. + $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..." + +fmt: ## Run go fmt against code. + go fmt ./... + +vet: ## Run go vet against code. + go vet ./... + +ENVTEST_ASSETS_DIR=$(shell pwd)/testbin +test: manifests generate fmt vet ## Run tests. + 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/v0.8.3/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 + +build: generate fmt vet ## Build manager binary. + go build -ldflags "-X main.version=${VERSION}" -o bin/manager main.go + +run: manifests generate fmt vet ## Run a controller from your host. + go run -ldflags "-X main.version=${VERSION}" ./main.go $(ARGS) + +docker-build: test ## Build docker image with the manager. + docker build -t ${IMG} . --build-arg VERSION=${VERSION} + +docker-push: ## Push docker image with the manager. + docker push ${IMG} + +##@ Deployment + +install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/crd | kubectl apply -f - + +uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/crd | kubectl delete -f - + +deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default | kubectl apply -f - + +undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. + $(KUSTOMIZE) build config/default | kubectl delete -f - + + +CONTROLLER_GEN = $(shell pwd)/bin/controller-gen +controller-gen: ## Download controller-gen locally if necessary. + $(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1) + +KUSTOMIZE = $(shell pwd)/bin/kustomize +kustomize: ## Download kustomize locally if necessary. + $(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 + +.PHONY: bundle +bundle: manifests kustomize ## Generate bundle manifests and metadata, then validate generated files. + operator-sdk generate kustomize manifests -q + cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG) + $(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) + operator-sdk bundle validate ./bundle + +.PHONY: bundle-build +bundle-build: ## Build the bundle image. + docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) . + +.PHONY: bundle-push +bundle-push: ## Push the bundle image. + $(MAKE) docker-push IMG=$(BUNDLE_IMG) + +.PHONY: opm +OPM = ./bin/opm +opm: ## Download opm locally if necessary. +ifeq (,$(wildcard $(OPM))) +ifeq (,$(shell which opm 2>/dev/null)) + @{ \ + set -e ;\ + mkdir -p $(dir $(OPM)) ;\ + OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \ + curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.17.2/$${OS}-$${ARCH}-opm ;\ + chmod +x $(OPM) ;\ + } +else +OPM = $(shell which opm) +endif +endif + +# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v0.2.0). +# These images MUST exist in a registry and be pull-able. +BUNDLE_IMGS ?= $(BUNDLE_IMG) + +# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v0.2.0). +CATALOG_IMG ?= $(IMAGE_TAG_BASE)-catalog:v$(VERSION) + +# Set CATALOG_BASE_IMG to an existing catalog image tag to add $BUNDLE_IMGS to that image. +ifneq ($(origin CATALOG_BASE_IMG), undefined) +FROM_INDEX_OPT := --from-index $(CATALOG_BASE_IMG) +endif + +# Build a catalog image by adding bundle images to an empty catalog using the operator package manager tool, 'opm'. +# This recipe invokes 'opm' in 'semver' bundle add mode. For more information on add modes, see: +# https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator +.PHONY: catalog-build +catalog-build: opm ## Build a catalog image. + $(OPM) index add --container-tool docker --mode semver --tag $(CATALOG_IMG) --bundles $(BUNDLE_IMGS) $(FROM_INDEX_OPT) + +# Push the catalog image. +.PHONY: catalog-push +catalog-push: ## Push a catalog image. + $(MAKE) docker-push IMG=$(CATALOG_IMG) diff --git a/PROJECT b/PROJECT new file mode 100644 index 00000000..018a202a --- /dev/null +++ b/PROJECT @@ -0,0 +1,19 @@ +domain: nginx.org +layout: +- go.kubebuilder.io/v3 +plugins: + manifests.sdk.operatorframework.io/v2: {} + scorecard.sdk.operatorframework.io/v2: {} +projectName: nginx-ingress-operator +repo: github.com/nginxinc/nginx-ingress-operator +resources: +- api: + crdVersion: v1 + namespaced: true + controller: true + domain: nginx.org + group: k8s + kind: NginxIngressController + path: github.com/nginxinc/nginx-ingress-operator/api/v1alpha1 + version: v1alpha1 +version: "3" diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go new file mode 100644 index 00000000..e86c00ac --- /dev/null +++ b/api/v1alpha1/groupversion_info.go @@ -0,0 +1,36 @@ +/* +Copyright 2021. + +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. +*/ + +// Package v1alpha1 contains API Schema definitions for the k8s v1alpha1 API group +//+kubebuilder:object:generate=true +//+groupName=k8s.nginx.org +package v1alpha1 + +import ( + "k8s.io/apimachinery/pkg/runtime/schema" + "sigs.k8s.io/controller-runtime/pkg/scheme" +) + +var ( + // GroupVersion is group version used to register these objects + GroupVersion = schema.GroupVersion{Group: "k8s.nginx.org", Version: "v1alpha1"} + + // SchemeBuilder is used to add go types to the GroupVersionKind scheme + SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion} + + // AddToScheme adds the types in this group-version to the given scheme. + AddToScheme = SchemeBuilder.AddToScheme +) diff --git a/pkg/apis/k8s/v1alpha1/nginxingresscontroller_types.go b/api/v1alpha1/nginxingresscontroller_types.go similarity index 80% rename from pkg/apis/k8s/v1alpha1/nginxingresscontroller_types.go rename to api/v1alpha1/nginxingresscontroller_types.go index edf0df43..ee0b8cf1 100644 --- a/pkg/apis/k8s/v1alpha1/nginxingresscontroller_types.go +++ b/api/v1alpha1/nginxingresscontroller_types.go @@ -1,3 +1,19 @@ +/* +Copyright 2021. + +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. +*/ + package v1alpha1 import ( @@ -5,102 +21,101 @@ import ( ) // NginxIngressControllerSpec defines the desired state of NginxIngressController -// +operator-sdk:gen-csv:customresourcedefinitions.resources=`Deployment,v1,"nginx-ingress-operator"` type NginxIngressControllerSpec struct { // The type of the Ingress Controller installation - deployment or daemonset. // +kubebuilder:validation:Enum=deployment;daemonset - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec Type string `json:"type"` // Deploys the Ingress Controller for NGINX Plus. The default is false meaning the Ingress Controller will be deployed for NGINX OSS. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec NginxPlus bool `json:"nginxPlus"` // The image of the Ingress Controller. - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec Image Image `json:"image"` // The number of replicas of the Ingress Controller pod. The default is 1. Only applies if the type is set to deployment. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec Replicas *int32 `json:"replicas"` // The TLS Secret for TLS termination of the default server. The format is namespace/name. // The secret must be of the type kubernetes.io/tls. // If not specified, the operator will generate and deploy a TLS Secret with a self-signed certificate and key. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec DefaultSecret string `json:"defaultSecret"` // The type of the Service for the Ingress Controller. Valid Service types are: NodePort and LoadBalancer. // +kubebuilder:validation:Enum=NodePort;LoadBalancer - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec ServiceType string `json:"serviceType"` // Enables the use of NGINX Ingress Resource Definitions (VirtualServer and VirtualServerRoute). Default is true. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnableCRDs *bool `json:"enableCRDs"` // Enable custom NGINX configuration snippets in VirtualServer, VirtualServerRoute and TransportServer resources. // Requires enableCRDs set to true. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnableSnippets bool `json:"enableSnippets"` // Enables preview policies. // Requires enableCRDs set to true. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnablePreviewPolicies bool `json:"enablePreviewPolicies"` // A class of the Ingress controller. The Ingress controller only processes Ingress resources that belong to its // class (in other words, have the annotation “kubernetes.io/ingress.class”). // Additionally, the Ingress controller processes Ingress resources that do not have that annotation, // which can be disabled by setting UseIngressClassOnly to true. Default is `nginx`. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec IngressClass string `json:"ingressClass"` // The service of the Ingress controller. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec Service *Service `json:"service"` // Ignore Ingress resources without the “kubernetes.io/ingress.class” annotation. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec UseIngressClassOnly bool `json:"useIngressClassOnly"` // Namespace to watch for Ingress resources. By default the Ingress controller watches all namespaces. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec WatchNamespace string `json:"watchNamespace"` // Adds a new location to the default server. The location responds with the 200 status code for any request. // Useful for external health-checking of the Ingress controller. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec HealthStatus *HealthStatus `json:"healthStatus,omitempty"` // Enable debugging for NGINX. Uses the nginx-debug binary. Requires ‘error-log-level: debug’ in the ConfigMapData. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec NginxDebug bool `json:"nginxDebug"` // Log level for V logs. // Format is 0 - 3 // +kubebuilder:validation:Optional // +kubebuilder:validation:Minimum=0 // +kubebuilder:validation:Maximum=3 - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec LogLevel uint8 `json:"logLevel"` // NGINX stub_status, or the NGINX Plus API. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec NginxStatus *NginxStatus `json:"nginxStatus,omitempty"` // Update the address field in the status of Ingresses resources. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec ReportIngressStatus *ReportIngressStatus `json:"reportIngressStatus,omitempty"` // Enables Leader election to avoid multiple replicas of the controller reporting the status of Ingress resources // – only one replica will report status. // Default is true. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnableLeaderElection *bool `json:"enableLeaderElection"` // A Secret with a TLS certificate and key for TLS termination of every Ingress host for which TLS termination is enabled but the Secret is not specified. // The secret must be of the type kubernetes.io/tls. @@ -108,49 +123,79 @@ type NginxIngressControllerSpec struct { // If the argument is set, but the Ingress controller is not able to fetch the Secret from Kubernetes API, the Ingress Controller will fail to start. // Format is namespace/name. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec WildcardTLS string `json:"wildcardTLS"` // NGINX or NGINX Plus metrics in the Prometheus format. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec Prometheus *Prometheus `json:"prometheus,omitempty"` // Bucketed response times from when NGINX establishes a connection to an upstream server to when the last byte of the response body is received by NGINX. // **Note** The metric for the upstream isn't available until traffic is sent to the upstream. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnableLatencyMetrics bool `json:"enableLatencyMetrics"` // Initial values of the Ingress Controller ConfigMap. // Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ for // more information about possible values. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec ConfigMapData map[string]string `json:"configMapData,omitempty"` // The GlobalConfiguration resource for global configuration of the Ingress Controller. // Format is namespace/name. // Requires enableCRDs set to true. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec GlobalConfiguration string `json:"globalConfiguration"` // Enable TLS Passthrough on port 443. // Requires enableCRDs set to true. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec EnableTLSPassthrough bool `json:"enableTLSPassthrough"` // App Protect support configuration. // Requires enableCRDs set to true. // +kubebuilder:validation:Optional // +nullable - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec AppProtect *AppProtect `json:"appProtect"` // Timeout in milliseconds which the Ingress Controller will wait for a successful NGINX reload after a change or at the initial start. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec NginxReloadTimeout int `json:"nginxReloadTimeout"` } +// NginxIngressControllerStatus defines the observed state of NginxIngressController +type NginxIngressControllerStatus struct { + // Deployed is true if the Operator has finished the deployment of the NginxIngressController. + // +operator-sdk:csv:customresourcedefinitions:type=spec + // +operator-sdk:csv:customresourcedefinitions:type=status + Deployed bool `json:"deployed"` +} + +//+kubebuilder:object:root=true +//+kubebuilder:subresource:status + +// NginxIngressController is the Schema for the nginxingresscontrollers API +// +operator-sdk:csv:customresourcedefinitions:displayName="Nginx Ingress Controller",resources={{Pod,v1,nic-runner},{Deployment,v1,nic-deployment},{ReplicaSet,v1beta2,nic-replicaset}} +type NginxIngressController struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + + Spec NginxIngressControllerSpec `json:"spec,omitempty"` + Status NginxIngressControllerStatus `json:"status,omitempty"` +} + +//+kubebuilder:object:root=true + +// NginxIngressControllerList contains a list of NginxIngressController +type NginxIngressControllerList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []NginxIngressController `json:"items"` +} + // Image defines the Repository, Tag and ImagePullPolicy of the Ingress Controller Image. type Image struct { // The repository of the image. @@ -203,7 +248,7 @@ type ReportIngressStatus struct { // Note: If serviceType is LoadBalancer or reportIngressStatus.externalService is set, the value of this field // will be ignored. // +kubebuilder:validation:Optional - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true + // +operator-sdk:csv:customresourcedefinitions:type=spec IngressLink string `json:"ingressLink,omitempty"` } @@ -233,36 +278,6 @@ type Service struct { ExtraLabels map[string]string `json:"extraLabels,omitempty"` } -// NginxIngressControllerStatus defines the observed state of NginxIngressController -type NginxIngressControllerStatus struct { - // Deployed is true if the Operator has finished the deployment of the NginxIngressController. - // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true - // +operator-sdk:gen-csv:customresourcedefinitions.statusDescriptors=true - Deployed bool `json:"deployed"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// NginxIngressController is the Schema for the nginxingresscontrollers API -// +kubebuilder:subresource:status -// +kubebuilder:resource:path=nginxingresscontrollers,scope=Namespaced -type NginxIngressController struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` - - Spec NginxIngressControllerSpec `json:"spec,omitempty"` - Status NginxIngressControllerStatus `json:"status,omitempty"` -} - -// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object - -// NginxIngressControllerList contains a list of NginxIngressController -type NginxIngressControllerList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []NginxIngressController `json:"items"` -} - func init() { SchemeBuilder.Register(&NginxIngressController{}, &NginxIngressControllerList{}) } diff --git a/pkg/apis/k8s/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go similarity index 92% rename from pkg/apis/k8s/v1alpha1/zz_generated.deepcopy.go rename to api/v1alpha1/zz_generated.deepcopy.go index f4bd5b8c..daace5a4 100644 --- a/pkg/apis/k8s/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,6 +1,22 @@ // +build !ignore_autogenerated -// Code generated by operator-sdk. DO NOT EDIT. +/* +Copyright 2021. + +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. +*/ + +// Code generated by controller-gen. DO NOT EDIT. package v1alpha1 @@ -11,7 +27,6 @@ import ( // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AppProtect) DeepCopyInto(out *AppProtect) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AppProtect. @@ -27,7 +42,6 @@ func (in *AppProtect) DeepCopy() *AppProtect { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HealthStatus) DeepCopyInto(out *HealthStatus) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HealthStatus. @@ -43,7 +57,6 @@ func (in *HealthStatus) DeepCopy() *HealthStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Image) DeepCopyInto(out *Image) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Image. @@ -63,7 +76,6 @@ func (in *NginxIngressController) DeepCopyInto(out *NginxIngressController) { in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.Spec.DeepCopyInto(&out.Spec) out.Status = in.Status - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NginxIngressController. @@ -96,7 +108,6 @@ func (in *NginxIngressControllerList) DeepCopyInto(out *NginxIngressControllerLi (*in)[i].DeepCopyInto(&(*out)[i]) } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NginxIngressControllerList. @@ -173,7 +184,6 @@ func (in *NginxIngressControllerSpec) DeepCopyInto(out *NginxIngressControllerSp *out = new(AppProtect) **out = **in } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NginxIngressControllerSpec. @@ -189,7 +199,6 @@ func (in *NginxIngressControllerSpec) DeepCopy() *NginxIngressControllerSpec { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NginxIngressControllerStatus) DeepCopyInto(out *NginxIngressControllerStatus) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NginxIngressControllerStatus. @@ -210,7 +219,6 @@ func (in *NginxStatus) DeepCopyInto(out *NginxStatus) { *out = new(uint16) **out = **in } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NginxStatus. @@ -231,7 +239,6 @@ func (in *Prometheus) DeepCopyInto(out *Prometheus) { *out = new(uint16) **out = **in } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Prometheus. @@ -247,7 +254,6 @@ func (in *Prometheus) DeepCopy() *Prometheus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ReportIngressStatus) DeepCopyInto(out *ReportIngressStatus) { *out = *in - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReportIngressStatus. @@ -270,7 +276,6 @@ func (in *Service) DeepCopyInto(out *Service) { (*out)[key] = val } } - return } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Service. diff --git a/build/Dockerfile b/build/Dockerfile deleted file mode 100644 index 85ed63dc..00000000 --- a/build/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest - -ENV OPERATOR=/usr/local/bin/nginx-ingress-operator \ - USER_UID=1001 \ - USER_NAME=nginx-ingress-operator - -# install operator binary -COPY build/_output/bin/nginx-ingress-operator ${OPERATOR} - -COPY build/bin /usr/local/bin -RUN /usr/local/bin/user_setup - -COPY LICENSE /licenses/ -COPY build/kic_crds /kic_crds - -ENTRYPOINT ["/usr/local/bin/entrypoint"] - -USER ${USER_UID} -LABEL name="NGINX Ingress Operator" \ - description="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \ - summary="The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers" \ - io.openshift.tags="nginx,ingress-controller,ingress,controller,kubernetes,openshift" \ - maintainer="NGINX Inc " \ - vendor="NGINX Inc " \ No newline at end of file diff --git a/build/bin/entrypoint b/build/bin/entrypoint deleted file mode 100755 index abf516de..00000000 --- a/build/bin/entrypoint +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -e - -# This is documented here: -# https://docs.openshift.com/container-platform/3.11/creating_images/guidelines.html#openshift-specific-guidelines - -if ! whoami &>/dev/null; then - if [ -w /etc/passwd ]; then - echo "${USER_NAME:-nginx-ingress-operator}:x:$(id -u):$(id -g):${USER_NAME:-nginx-ingress-operator} user:${HOME}:/sbin/nologin" >> /etc/passwd - fi -fi - -exec ${OPERATOR} $@ diff --git a/build/bin/user_setup b/build/bin/user_setup deleted file mode 100755 index 1e36064c..00000000 --- a/build/bin/user_setup +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -set -x - -# ensure $HOME exists and is accessible by group 0 (we don't know what the runtime UID will be) -mkdir -p ${HOME} -chown ${USER_UID}:0 ${HOME} -chmod ug+rwx ${HOME} - -# runtime user will need to be able to self-insert in /etc/passwd -chmod g+rw /etc/passwd - -# no need for this script to remain in the image after running -rm $0 diff --git a/bundle.Dockerfile b/bundle.Dockerfile new file mode 100644 index 00000000..234b524f --- /dev/null +++ b/bundle.Dockerfile @@ -0,0 +1,20 @@ +FROM scratch + +# Core bundle labels. +LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 +LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ +LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ +LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator +LABEL operators.operatorframework.io.bundle.channels.v1=alpha +LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.8.0 +LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 +LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 + +# Labels for testing. +LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 +LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ + +# Copy files to locations specified by labels. +COPY bundle/manifests /manifests/ +COPY bundle/metadata /metadata/ +COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/0.0.4/manifests/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml b/bundle/0.0.4/manifests/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml deleted file mode 100644 index 3b03650a..00000000 --- a/bundle/0.0.4/manifests/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml +++ /dev/null @@ -1,335 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: '[{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", - "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" - }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": - "docker.io/nginx/nginx-ingress", "tag": "1.6.3-ubi" }, "nginxPlus": false, "replicas": - 1, "serviceType": "NodePort", "type": "deployment" } }]' - capabilities: Basic Install - categories: Networking - certified: 'true' - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - createdAt: 2020-03-03 12:59:59+00:00 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.4 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - displayName: NginxIngressController - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: "Enables Leader election to avoid multiple replicas of the controller\ - \ reporting the status of Ingress resources \u2013 only one replica will\ - \ report status." - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: "A class of the Ingress controller. The Ingress controller only\ - \ processes Ingress resources that belong to its class (in other words,\ - \ have the annotation \u201Ckubernetes.io/ingress.class\u201D). Additionally,\ - \ the Ingress controller processes Ingress resources that do not have that\ - \ annotation, which can be disabled by setting UseIngressClassOnly to true.\ - \ Default is `nginx`." - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: "Enable debugging for NGINX. Uses the nginx-debug binary. Requires\ - \ \u2018error-log-level: debug\u2019 in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - '' - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - '' - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.3 - version: 0.0.4 diff --git a/bundle/0.0.4/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml b/bundle/0.0.4/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml deleted file mode 100644 index 17b89ba3..00000000 --- a/bundle/0.0.4/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml +++ /dev/null @@ -1,259 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLeaderElection: - description: "Enables Leader election to avoid multiple replicas of\ - \ the controller reporting the status of Ingress resources \u2013\ - \ only one replica will report status." - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: "A class of the Ingress controller. The Ingress controller\ - \ only processes Ingress resources that belong to its class (in other\ - \ words, have the annotation \u201Ckubernetes.io/ingress.class\u201D\ - ). Additionally, the Ingress controller processes Ingress resources\ - \ that do not have that annotation, which can be disabled by setting\ - \ UseIngressClassOnly to true. Default is `nginx`." - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: "Enable debugging for NGINX. Uses the nginx-debug binary.\ - \ Requires \u2018error-log-level: debug\u2019 in the ConfigMapData." - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: "Whitelist IPv4 IP/CIDR blocks to allow access to NGINX\ - \ stub_status or the NGINX Plus API. Separate multiple IP/CIDR\ - \ by commas. (default \u201C127.0.0.1\u201D)" - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.4/metadata/annotations.yaml b/bundle/0.0.4/metadata/annotations.yaml deleted file mode 100644 index 4e0fdde4..00000000 --- a/bundle/0.0.4/metadata/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -annotations: - operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator diff --git a/bundle/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml b/bundle/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml deleted file mode 100644 index 3b03650a..00000000 --- a/bundle/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml +++ /dev/null @@ -1,335 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: '[{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", - "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" - }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": - "docker.io/nginx/nginx-ingress", "tag": "1.6.3-ubi" }, "nginxPlus": false, "replicas": - 1, "serviceType": "NodePort", "type": "deployment" } }]' - capabilities: Basic Install - categories: Networking - certified: 'true' - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - createdAt: 2020-03-03 12:59:59+00:00 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.4 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - displayName: NginxIngressController - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: "Enables Leader election to avoid multiple replicas of the controller\ - \ reporting the status of Ingress resources \u2013 only one replica will\ - \ report status." - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: "A class of the Ingress controller. The Ingress controller only\ - \ processes Ingress resources that belong to its class (in other words,\ - \ have the annotation \u201Ckubernetes.io/ingress.class\u201D). Additionally,\ - \ the Ingress controller processes Ingress resources that do not have that\ - \ annotation, which can be disabled by setting UseIngressClassOnly to true.\ - \ Default is `nginx`." - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: "Enable debugging for NGINX. Uses the nginx-debug binary. Requires\ - \ \u2018error-log-level: debug\u2019 in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - '' - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - '' - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.3 - version: 0.0.4 diff --git a/bundle/0.0.4/nginxingresscontrollers.k8s.nginx.org.crd.yaml b/bundle/0.0.4/nginxingresscontrollers.k8s.nginx.org.crd.yaml deleted file mode 100644 index 17b89ba3..00000000 --- a/bundle/0.0.4/nginxingresscontrollers.k8s.nginx.org.crd.yaml +++ /dev/null @@ -1,259 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLeaderElection: - description: "Enables Leader election to avoid multiple replicas of\ - \ the controller reporting the status of Ingress resources \u2013\ - \ only one replica will report status." - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: "A class of the Ingress controller. The Ingress controller\ - \ only processes Ingress resources that belong to its class (in other\ - \ words, have the annotation \u201Ckubernetes.io/ingress.class\u201D\ - ). Additionally, the Ingress controller processes Ingress resources\ - \ that do not have that annotation, which can be disabled by setting\ - \ UseIngressClassOnly to true. Default is `nginx`." - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: "Enable debugging for NGINX. Uses the nginx-debug binary.\ - \ Requires \u2018error-log-level: debug\u2019 in the ConfigMapData." - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: "Whitelist IPv4 IP/CIDR blocks to allow access to NGINX\ - \ stub_status or the NGINX Plus API. Separate multiple IP/CIDR\ - \ by commas. (default \u201C127.0.0.1\u201D)" - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.6/manifests/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml b/bundle/0.0.6/manifests/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml deleted file mode 100644 index bfc25d54..00000000 --- a/bundle/0.0.6/manifests/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml +++ /dev/null @@ -1,349 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: '[{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", - "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" - }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": - "docker.io/nginx/nginx-ingress", "tag": "1.8.0-ubi" }, "nginxPlus": false, "replicas": - 1, "serviceType": "NodePort", "type": "deployment" } }]' - capabilities: Basic Install - categories: Networking - certified: 'true' - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - createdAt: '2020-03-03T12:59:59Z' - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.6 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - displayName: NginxIngressController - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: "Enables Leader election to avoid multiple replicas of the controller\ - \ reporting the status of Ingress resources \u2013 only one replica will\ - \ report status." - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: "A class of the Ingress controller. The Ingress controller only\ - \ processes Ingress resources that belong to its class (in other words,\ - \ have the annotation \u201Ckubernetes.io/ingress.class\u201D). Additionally,\ - \ the Ingress controller processes Ingress resources that do not have that\ - \ annotation, which can be disabled by setting UseIngressClassOnly to true.\ - \ Default is `nginx`." - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: "Enable debugging for NGINX. Uses the nginx-debug binary. Requires\ - \ \u2018error-log-level: debug\u2019 in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - '' - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - '' - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.4 - version: 0.0.6 diff --git a/bundle/0.0.6/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml b/bundle/0.0.6/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml deleted file mode 100644 index 17b89ba3..00000000 --- a/bundle/0.0.6/manifests/nginxingresscontrollers.k8s.nginx.org.crd.yaml +++ /dev/null @@ -1,259 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLeaderElection: - description: "Enables Leader election to avoid multiple replicas of\ - \ the controller reporting the status of Ingress resources \u2013\ - \ only one replica will report status." - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: "A class of the Ingress controller. The Ingress controller\ - \ only processes Ingress resources that belong to its class (in other\ - \ words, have the annotation \u201Ckubernetes.io/ingress.class\u201D\ - ). Additionally, the Ingress controller processes Ingress resources\ - \ that do not have that annotation, which can be disabled by setting\ - \ UseIngressClassOnly to true. Default is `nginx`." - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: "Enable debugging for NGINX. Uses the nginx-debug binary.\ - \ Requires \u2018error-log-level: debug\u2019 in the ConfigMapData." - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: "Whitelist IPv4 IP/CIDR blocks to allow access to NGINX\ - \ stub_status or the NGINX Plus API. Separate multiple IP/CIDR\ - \ by commas. (default \u201C127.0.0.1\u201D)" - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.6/metadata/annotations.yaml b/bundle/0.0.6/metadata/annotations.yaml deleted file mode 100644 index 4e0fdde4..00000000 --- a/bundle/0.0.6/metadata/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -annotations: - operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator diff --git a/bundle/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml b/bundle/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml deleted file mode 100644 index bfc25d54..00000000 --- a/bundle/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml +++ /dev/null @@ -1,349 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: '[{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", - "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" - }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": - "docker.io/nginx/nginx-ingress", "tag": "1.8.0-ubi" }, "nginxPlus": false, "replicas": - 1, "serviceType": "NodePort", "type": "deployment" } }]' - capabilities: Basic Install - categories: Networking - certified: 'true' - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - createdAt: '2020-03-03T12:59:59Z' - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.6 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - displayName: NginxIngressController - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: "Enables Leader election to avoid multiple replicas of the controller\ - \ reporting the status of Ingress resources \u2013 only one replica will\ - \ report status." - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: "A class of the Ingress controller. The Ingress controller only\ - \ processes Ingress resources that belong to its class (in other words,\ - \ have the annotation \u201Ckubernetes.io/ingress.class\u201D). Additionally,\ - \ the Ingress controller processes Ingress resources that do not have that\ - \ annotation, which can be disabled by setting UseIngressClassOnly to true.\ - \ Default is `nginx`." - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: "Enable debugging for NGINX. Uses the nginx-debug binary. Requires\ - \ \u2018error-log-level: debug\u2019 in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - '' - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - '' - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.4 - version: 0.0.6 diff --git a/bundle/0.0.6/nginxingresscontrollers.k8s.nginx.org.crd.yaml b/bundle/0.0.6/nginxingresscontrollers.k8s.nginx.org.crd.yaml deleted file mode 100644 index 17b89ba3..00000000 --- a/bundle/0.0.6/nginxingresscontrollers.k8s.nginx.org.crd.yaml +++ /dev/null @@ -1,259 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLeaderElection: - description: "Enables Leader election to avoid multiple replicas of\ - \ the controller reporting the status of Ingress resources \u2013\ - \ only one replica will report status." - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: "A class of the Ingress controller. The Ingress controller\ - \ only processes Ingress resources that belong to its class (in other\ - \ words, have the annotation \u201Ckubernetes.io/ingress.class\u201D\ - ). Additionally, the Ingress controller processes Ingress resources\ - \ that do not have that annotation, which can be disabled by setting\ - \ UseIngressClassOnly to true. Default is `nginx`." - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: "Enable debugging for NGINX. Uses the nginx-debug binary.\ - \ Requires \u2018error-log-level: debug\u2019 in the ConfigMapData." - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: "Whitelist IPv4 IP/CIDR blocks to allow access to NGINX\ - \ stub_status or the NGINX Plus API. Separate multiple IP/CIDR\ - \ by commas. (default \u201C127.0.0.1\u201D)" - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: "Ignore Ingress resources without the \u201Ckubernetes.io/ingress.class\u201D\ - \ annotation." - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.7/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.0.7/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index b23b7057..00000000 --- a/bundle/0.0.7/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,266 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.7/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.0.7/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index b23b7057..00000000 --- a/bundle/0.0.7/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,266 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. If not specified, the operator will - generate and deploy a TLS Secret with a self-signed certificate and - key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if ServiceType is different - than LoadBalancer.' - type: string - required: - - enable - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. If the argument is not set, for such Ingress - hosts NGINX will break any attempt to establish a TLS connection. - If the argument is set, but the Ingress controller is not able to - fetch the Secret from Kubernetes API, the Ingress Controller will - fail to start. Format is namespace/name. - type: string - required: - - enableCRDs - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.0.7/manifests/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml b/bundle/0.0.7/manifests/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml deleted file mode 100644 index 20c3ee84..00000000 --- a/bundle/0.0.7/manifests/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml +++ /dev/null @@ -1,383 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.9.1-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - createdAt: "2020-03-03T12:59:59Z" - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.7 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: - NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: - App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: - Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: - The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: - Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: - Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: - Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: - Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: - Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: - The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: - Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: - A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: - "Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: - Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: - Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: - The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: - "The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer." - displayName: Service Type - path: serviceType - - description: - The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: - Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: - Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: - A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: - Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - "*" - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.6 - version: 0.0.7 diff --git a/bundle/0.0.7/metadata/annotations.yaml b/bundle/0.0.7/metadata/annotations.yaml deleted file mode 100644 index 4e0fdde4..00000000 --- a/bundle/0.0.7/metadata/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -annotations: - operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator diff --git a/bundle/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml b/bundle/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml deleted file mode 100644 index 20c3ee84..00000000 --- a/bundle/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml +++ /dev/null @@ -1,383 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.9.1-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - createdAt: "2020-03-03T12:59:59Z" - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.7 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: - NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: - App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: - Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: - The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: - Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: - Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: - Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: - Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: - Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: - The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: - Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: - A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: - "Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: - Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: - Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: - The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: - "The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer." - displayName: Service Type - path: serviceType - - description: - The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: - Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: - Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: - A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: - Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - "*" - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.6 - version: 0.0.7 diff --git a/bundle/0.1.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.1.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index 511f903f..00000000 --- a/bundle/0.1.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,287 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret - with a self-signed certificate and key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - nullable: true - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. - type: boolean - enablePreviewPolicies: - description: Enables preview policies. Requires enableCRDs set to true. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - nullable: true - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if serviceType is NodePort.' - type: string - ingressLink: - description: 'Specifies the name of the IngressLink resource, which - exposes the Ingress Controller pods via a BIG-IP system. The IP - of the BIG-IP system is used when reporting the status of Ingress, - VirtualServer and VirtualServerRoute resources. Requires reportIngressStatus.enable - set to true. Note: Only if serviceType is NodePort and reportIngressStatus.externalService - is not set.' - type: string - required: - - enable - type: object - service: - description: The service of the Ingress controller. - nullable: true - properties: - extraLabels: - additionalProperties: - type: string - description: Specifies extra labels of the service. - type: object - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. The secret must be of the type kubernetes.io/tls. - If the argument is not set, for such Ingress hosts NGINX will break - any attempt to establish a TLS connection. If the argument is set, - but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - type: string - required: - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.1.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.1.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index 511f903f..00000000 --- a/bundle/0.1.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,287 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret - with a self-signed certificate and key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - nullable: true - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. - type: boolean - enablePreviewPolicies: - description: Enables preview policies. Requires enableCRDs set to true. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer - and VirtualServerRoute resources. Requires enableCRDs set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - nullable: true - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: Only if serviceType is NodePort.' - type: string - ingressLink: - description: 'Specifies the name of the IngressLink resource, which - exposes the Ingress Controller pods via a BIG-IP system. The IP - of the BIG-IP system is used when reporting the status of Ingress, - VirtualServer and VirtualServerRoute resources. Requires reportIngressStatus.enable - set to true. Note: Only if serviceType is NodePort and reportIngressStatus.externalService - is not set.' - type: string - required: - - enable - type: object - service: - description: The service of the Ingress controller. - nullable: true - properties: - extraLabels: - additionalProperties: - type: string - description: Specifies extra labels of the service. - type: object - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. The secret must be of the type kubernetes.io/tls. - If the argument is not set, for such Ingress hosts NGINX will break - any attempt to establish a TLS connection. If the argument is set, - but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - type: string - required: - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.1.0/manifests/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml b/bundle/0.1.0/manifests/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml deleted file mode 100644 index 9b6fb079..00000000 --- a/bundle/0.1.0/manifests/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml +++ /dev/null @@ -1,374 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.10.0-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.1.0 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret with - a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - displayName: Enable CRDs - path: enableCRDs - - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enables preview policies. Requires enableCRDs set to true. - displayName: Enable Preview Policies - path: enablePreviewPolicies - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'Specifies the name of the IngressLink resource, which exposes - the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system - is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute - resources. Requires reportIngressStatus.enable set to true. Note: Only if - serviceType is NodePort and reportIngressStatus.externalService is not set.' - displayName: Ingress Link - path: reportIngressStatus.ingressLink - - description: The service of the Ingress controller. - displayName: Service - path: service - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. The secret must be of the type kubernetes.io/tls. If the - argument is not set, for such Ingress hosts NGINX will break any attempt - to establish a TLS connection. If the argument is set, but the Ingress controller - is not able to fetch the Secret from Kubernetes API, the Ingress Controller - will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.7 - version: 0.1.0 diff --git a/bundle/0.1.0/metadata/annotations.yaml b/bundle/0.1.0/metadata/annotations.yaml deleted file mode 100644 index 4e0fdde4..00000000 --- a/bundle/0.1.0/metadata/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -annotations: - operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator diff --git a/bundle/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml b/bundle/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml deleted file mode 100644 index 9b6fb079..00000000 --- a/bundle/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml +++ /dev/null @@ -1,374 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.10.0-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.1.0 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret with - a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - displayName: Enable CRDs - path: enableCRDs - - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enables preview policies. Requires enableCRDs set to true. - displayName: Enable Preview Policies - path: enablePreviewPolicies - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'Specifies the name of the IngressLink resource, which exposes - the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system - is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute - resources. Requires reportIngressStatus.enable set to true. Note: Only if - serviceType is NodePort and reportIngressStatus.externalService is not set.' - displayName: Ingress Link - path: reportIngressStatus.ingressLink - - description: The service of the Ingress controller. - displayName: Service - path: service - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. The secret must be of the type kubernetes.io/tls. If the - argument is not set, for such Ingress hosts NGINX will break any attempt - to establish a TLS connection. If the argument is set, but the Ingress controller - is not able to fetch the Secret from Kubernetes API, the Ingress Controller - will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.7 - version: 0.1.0 diff --git a/bundle/0.2.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.2.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index 651d0d73..00000000 --- a/bundle/0.2.0/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,291 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret - with a self-signed certificate and key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - nullable: true - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. Default is true. - nullable: true - type: boolean - enablePreviewPolicies: - description: Enables preview policies. Requires enableCRDs set to true. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer, - VirtualServerRoute and TransportServer resources. Requires enableCRDs - set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - nullable: true - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: if serviceType is LoadBalancer, - the value of this field will be ignored, and the operator will - use the name of the created LoadBalancer service instead.' - type: string - ingressLink: - description: 'Specifies the name of the IngressLink resource, which - exposes the Ingress Controller pods via a BIG-IP system. The IP - of the BIG-IP system is used when reporting the status of Ingress, - VirtualServer and VirtualServerRoute resources. Requires reportIngressStatus.enable - set to true. Note: If serviceType is LoadBalancer or reportIngressStatus.externalService - is set, the value of this field will be ignored.' - type: string - required: - - enable - type: object - service: - description: The service of the Ingress controller. - nullable: true - properties: - extraLabels: - additionalProperties: - type: string - description: Specifies extra labels of the service. - type: object - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. The secret must be of the type kubernetes.io/tls. - If the argument is not set, for such Ingress hosts NGINX will break - any attempt to establish a TLS connection. If the argument is set, - but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - type: string - required: - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.2.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/bundle/0.2.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index 651d0d73..00000000 --- a/bundle/0.2.0/manifests/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,291 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret - with a self-signed certificate and key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - nullable: true - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. Default is true. - nullable: true - type: boolean - enablePreviewPolicies: - description: Enables preview policies. Requires enableCRDs set to true. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer, - VirtualServerRoute and TransportServer resources. Requires enableCRDs - set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - nullable: true - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: if serviceType is LoadBalancer, - the value of this field will be ignored, and the operator will - use the name of the created LoadBalancer service instead.' - type: string - ingressLink: - description: 'Specifies the name of the IngressLink resource, which - exposes the Ingress Controller pods via a BIG-IP system. The IP - of the BIG-IP system is used when reporting the status of Ingress, - VirtualServer and VirtualServerRoute resources. Requires reportIngressStatus.enable - set to true. Note: If serviceType is LoadBalancer or reportIngressStatus.externalService - is set, the value of this field will be ignored.' - type: string - required: - - enable - type: object - service: - description: The service of the Ingress controller. - nullable: true - properties: - extraLabels: - additionalProperties: - type: string - description: Specifies extra labels of the service. - type: object - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. The secret must be of the type kubernetes.io/tls. - If the argument is not set, for such Ingress hosts NGINX will break - any attempt to establish a TLS connection. If the argument is set, - but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - type: string - required: - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/bundle/0.2.0/metadata/annotations.yaml b/bundle/0.2.0/metadata/annotations.yaml deleted file mode 100644 index 4e0fdde4..00000000 --- a/bundle/0.2.0/metadata/annotations.yaml +++ /dev/null @@ -1,7 +0,0 @@ -annotations: - operators.operatorframework.io.bundle.channel.default.v1: alpha - operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.manifests.v1: manifests/ - operators.operatorframework.io.bundle.mediatype.v1: registry+v1 - operators.operatorframework.io.bundle.metadata.v1: metadata/ - operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator diff --git a/bundle/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml b/bundle/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml deleted file mode 100644 index 496361bd..00000000 --- a/bundle/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml +++ /dev/null @@ -1,376 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.11.1-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.2.0 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret with - a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - displayName: Enable CRDs - path: enableCRDs - - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. Default is true. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enables preview policies. Requires enableCRDs set to true. - displayName: Enable Preview Policies - path: enablePreviewPolicies - - description: Enable custom NGINX configuration snippets in VirtualServer, - VirtualServerRoute and TransportServer resources. Requires enableCRDs set - to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'Specifies the name of the IngressLink resource, which exposes - the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system - is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute - resources. Requires reportIngressStatus.enable set to true. Note: If serviceType - is LoadBalancer or reportIngressStatus.externalService is set, the value - of this field will be ignored.' - displayName: Ingress Link - path: reportIngressStatus.ingressLink - - description: The service of the Ingress controller. - displayName: Service - path: service - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. The secret must be of the type kubernetes.io/tls. If the - argument is not set, for such Ingress hosts NGINX will break any attempt - to establish a TLS connection. If the argument is set, but the Ingress controller - is not able to fetch the Secret from Kubernetes API, the Ingress Controller - will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.1.0 - version: 0.2.0 diff --git a/bundle/bundle-0.0.4.Dockerfile b/bundle/bundle-0.0.4.Dockerfile deleted file mode 100644 index bffa846c..00000000 --- a/bundle/bundle-0.0.4.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha - -COPY 0.0.4/manifests /manifests/ -COPY 0.0.4/metadata /metadata/ - -LABEL com.redhat.openshift.versions="v4.5,v4.6" -LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.delivery.backport=true diff --git a/bundle/bundle-0.0.6.Dockerfile b/bundle/bundle-0.0.6.Dockerfile deleted file mode 100644 index 7cf6656b..00000000 --- a/bundle/bundle-0.0.6.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha - -COPY 0.0.6/manifests /manifests/ -COPY 0.0.6/metadata /metadata/ - -LABEL com.redhat.openshift.versions="v4.5,v4.6" -LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.delivery.backport=true diff --git a/bundle/bundle-0.0.7.Dockerfile b/bundle/bundle-0.0.7.Dockerfile deleted file mode 100644 index 018a3ab7..00000000 --- a/bundle/bundle-0.0.7.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha - -COPY 0.0.7/manifests /manifests/ -COPY 0.0.7/metadata /metadata/ - -LABEL com.redhat.openshift.versions="v4.5,v4.6" -LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.delivery.backport=true diff --git a/bundle/bundle-0.1.0.Dockerfile b/bundle/bundle-0.1.0.Dockerfile deleted file mode 100644 index 7e21d96a..00000000 --- a/bundle/bundle-0.1.0.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha - -COPY 0.1.0/manifests /manifests/ -COPY 0.1.0/metadata /metadata/ - -LABEL com.redhat.openshift.versions="v4.5,v4.6" -LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.delivery.backport=true diff --git a/bundle/bundle-0.2.0.Dockerfile b/bundle/bundle-0.2.0.Dockerfile deleted file mode 100644 index 4c4f6193..00000000 --- a/bundle/bundle-0.2.0.Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM scratch - -LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1 -LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ -LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ -LABEL operators.operatorframework.io.bundle.package.v1=nginx-ingress-operator -LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha - -COPY 0.2.0/manifests /manifests/ -COPY 0.2.0/metadata /metadata/ - -LABEL com.redhat.openshift.versions="v4.5,v4.6" -LABEL com.redhat.delivery.operator.bundle=true -LABEL com.redhat.delivery.backport=true diff --git a/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml b/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml new file mode 100644 index 00000000..0309aae6 --- /dev/null +++ b/bundle/manifests/k8s.nginx.org_nginxingresscontrollers.yaml @@ -0,0 +1,303 @@ +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.4.1 + creationTimestamp: null + name: nginxingresscontrollers.k8s.nginx.org +spec: + group: k8s.nginx.org + names: + kind: NginxIngressController + listKind: NginxIngressControllerList + plural: nginxingresscontrollers + singular: nginxingresscontroller + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: NginxIngressController is the Schema for the nginxingresscontrollers + 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: NginxIngressControllerSpec defines the desired state of NginxIngressController + properties: + appProtect: + description: App Protect support configuration. Requires enableCRDs + set to true. + nullable: true + properties: + enable: + description: Enable App Protect. + type: boolean + required: + - enable + type: object + configMapData: + additionalProperties: + type: string + description: Initial values of the Ingress Controller ConfigMap. Check + https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ + for more information about possible values. + nullable: true + type: object + defaultSecret: + description: The TLS Secret for TLS termination of the default server. + The format is namespace/name. The secret must be of the type kubernetes.io/tls. + If not specified, the operator will generate and deploy a TLS Secret + with a self-signed certificate and key. + type: string + enableCRDs: + description: Enables the use of NGINX Ingress Resource Definitions + (VirtualServer and VirtualServerRoute). Default is true. + nullable: true + type: boolean + enableLatencyMetrics: + description: Bucketed response times from when NGINX establishes a + connection to an upstream server to when the last byte of the response + body is received by NGINX. **Note** The metric for the upstream + isn't available until traffic is sent to the upstream. + nullable: true + type: boolean + enableLeaderElection: + description: Enables Leader election to avoid multiple replicas of + the controller reporting the status of Ingress resources – only + one replica will report status. Default is true. + nullable: true + type: boolean + enablePreviewPolicies: + description: Enables preview policies. Requires enableCRDs set to + true. + type: boolean + enableSnippets: + description: Enable custom NGINX configuration snippets in VirtualServer, + VirtualServerRoute and TransportServer resources. Requires enableCRDs + set to true. + type: boolean + enableTLSPassthrough: + description: Enable TLS Passthrough on port 443. Requires enableCRDs + set to true. + type: boolean + globalConfiguration: + description: The GlobalConfiguration resource for global configuration + of the Ingress Controller. Format is namespace/name. Requires enableCRDs + set to true. + type: string + healthStatus: + description: Adds a new location to the default server. The location + responds with the 200 status code for any request. Useful for external + health-checking of the Ingress controller. + nullable: true + properties: + enable: + description: Enable the HealthStatus. + type: boolean + uri: + description: URI of the location. Default is `/nginx-health`. + type: string + required: + - enable + type: object + image: + description: The image of the Ingress Controller. + properties: + pullPolicy: + description: The ImagePullPolicy of the image. + enum: + - Never + - Always + - IfNotPresent + type: string + repository: + description: The repository of the image. + type: string + tag: + description: The tag (version) of the image. + type: string + required: + - pullPolicy + - repository + - tag + type: object + ingressClass: + description: A class of the Ingress controller. The Ingress controller + only processes Ingress resources that belong to its class (in other + words, have the annotation “kubernetes.io/ingress.class”). Additionally, + the Ingress controller processes Ingress resources that do not have + that annotation, which can be disabled by setting UseIngressClassOnly + to true. Default is `nginx`. + type: string + logLevel: + description: Log level for V logs. Format is 0 - 3 + maximum: 3 + minimum: 0 + type: integer + nginxDebug: + description: 'Enable debugging for NGINX. Uses the nginx-debug binary. + Requires ‘error-log-level: debug’ in the ConfigMapData.' + type: boolean + nginxPlus: + description: Deploys the Ingress Controller for NGINX Plus. The default + is false meaning the Ingress Controller will be deployed for NGINX + OSS. + type: boolean + nginxReloadTimeout: + description: Timeout in milliseconds which the Ingress Controller + will wait for a successful NGINX reload after a change or at the + initial start. + type: integer + nginxStatus: + description: NGINX stub_status, or the NGINX Plus API. + nullable: true + properties: + allowCidrs: + description: Whitelist IPv4 IP/CIDR blocks to allow access to + NGINX stub_status or the NGINX Plus API. Separate multiple IP/CIDR + by commas. (default “127.0.0.1”) + type: string + enable: + description: Enable the NginxStatus. + type: boolean + port: + description: Set the port where the NGINX stub_status or the NGINX + Plus API is exposed. Default is 8080. Format is 1023 - 65535 + maximum: 65535 + minimum: 1023 + nullable: true + type: integer + required: + - enable + type: object + prometheus: + description: NGINX or NGINX Plus metrics in the Prometheus format. + nullable: true + properties: + enable: + description: Enable Prometheus metrics. + type: boolean + port: + description: Sets the port where the Prometheus metrics are exposed. + Default is 9113. Format is 1023 - 65535 + maximum: 65535 + minimum: 1023 + nullable: true + type: integer + required: + - enable + type: object + replicas: + description: The number of replicas of the Ingress Controller pod. + The default is 1. Only applies if the type is set to deployment. + format: int32 + nullable: true + type: integer + reportIngressStatus: + description: Update the address field in the status of Ingresses resources. + nullable: true + properties: + enable: + description: Enable the ReportIngressStatus. + type: boolean + externalService: + description: 'Specifies the name of the service with the type + LoadBalancer through which the Ingress controller pods are exposed + externally. The external address of the service is used when + reporting the status of Ingress resources. Note: if serviceType + is LoadBalancer, the value of this field will be ignored, and + the operator will use the name of the created LoadBalancer service + instead.' + type: string + ingressLink: + description: 'Specifies the name of the IngressLink resource, + which exposes the Ingress Controller pods via a BIG-IP system. + The IP of the BIG-IP system is used when reporting the status + of Ingress, VirtualServer and VirtualServerRoute resources. + Requires reportIngressStatus.enable set to true. Note: If serviceType + is LoadBalancer or reportIngressStatus.externalService is set, + the value of this field will be ignored.' + type: string + required: + - enable + type: object + service: + description: The service of the Ingress controller. + nullable: true + properties: + extraLabels: + additionalProperties: + type: string + description: Specifies extra labels of the service. + type: object + type: object + serviceType: + description: 'The type of the Service for the Ingress Controller. + Valid Service types are: NodePort and LoadBalancer.' + enum: + - NodePort + - LoadBalancer + type: string + type: + description: The type of the Ingress Controller installation - deployment + or daemonset. + enum: + - deployment + - daemonset + type: string + useIngressClassOnly: + description: Ignore Ingress resources without the “kubernetes.io/ingress.class” + annotation. + type: boolean + watchNamespace: + description: Namespace to watch for Ingress resources. By default + the Ingress controller watches all namespaces. + type: string + wildcardTLS: + description: A Secret with a TLS certificate and key for TLS termination + of every Ingress host for which TLS termination is enabled but the + Secret is not specified. The secret must be of the type kubernetes.io/tls. + If the argument is not set, for such Ingress hosts NGINX will break + any attempt to establish a TLS connection. If the argument is set, + but the Ingress controller is not able to fetch the Secret from + Kubernetes API, the Ingress Controller will fail to start. Format + is namespace/name. + type: string + required: + - image + - serviceType + - type + type: object + status: + description: NginxIngressControllerStatus defines the observed state of + NginxIngressController + properties: + deployed: + description: Deployed is true if the Operator has finished the deployment + of the NginxIngressController. + type: boolean + required: + - deployed + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/bundle/manifests/nginx-ingress-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/nginx-ingress-operator-controller-manager-metrics-service_v1_service.yaml new file mode 100644 index 00000000..22578128 --- /dev/null +++ b/bundle/manifests/nginx-ingress-operator-controller-manager-metrics-service_v1_service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + creationTimestamp: null + labels: + control-plane: controller-manager + name: nginx-ingress-operator-controller-manager-metrics-service +spec: + ports: + - name: https + port: 8443 + targetPort: https + selector: + control-plane: controller-manager +status: + loadBalancer: {} diff --git a/bundle/manifests/nginx-ingress-operator-controller-manager_v1_serviceaccount.yaml b/bundle/manifests/nginx-ingress-operator-controller-manager_v1_serviceaccount.yaml new file mode 100644 index 00000000..a20686ba --- /dev/null +++ b/bundle/manifests/nginx-ingress-operator-controller-manager_v1_serviceaccount.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + creationTimestamp: null + name: nginx-ingress-operator-controller-manager diff --git a/bundle/manifests/nginx-ingress-operator-manager-config_v1_configmap.yaml b/bundle/manifests/nginx-ingress-operator-manager-config_v1_configmap.yaml new file mode 100644 index 00000000..6de5b2d6 --- /dev/null +++ b/bundle/manifests/nginx-ingress-operator-manager-config_v1_configmap.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +data: + controller_manager_config.yaml: | + 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: ca5c10a7.nginx.org +kind: ConfigMap +metadata: + name: nginx-ingress-operator-manager-config diff --git a/bundle/manifests/nginx-ingress-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/nginx-ingress-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml new file mode 100644 index 00000000..3f572af6 --- /dev/null +++ b/bundle/manifests/nginx-ingress-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml @@ -0,0 +1,10 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + creationTimestamp: null + name: nginx-ingress-operator-metrics-reader +rules: +- nonResourceURLs: + - /metrics + verbs: + - get diff --git a/bundle/0.2.0/manifests/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml similarity index 76% rename from bundle/0.2.0/manifests/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml rename to bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml index 496361bd..03fdea79 100644 --- a/bundle/0.2.0/manifests/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml +++ b/bundle/manifests/nginx-ingress-operator.clusterserviceversion.yaml @@ -2,18 +2,31 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.11.1-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] + alm-examples: |- + [ + { + "apiVersion": "k8s.nginx.org/v1alpha1", + "kind": "NginxIngressController", + "metadata": { + "name": "my-nginx-ingress-controller" + }, + "spec": { + "image": { + "pullPolicy": "Always", + "repository": "docker.io/nginx/nginx-ingress", + "tag": "1.11.3-ubi" + }, + "ingressClass": "nginx", + "nginxPlus": false, + "serviceType": "NodePort", + "type": "deployment" + } + } + ] capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.2.0 + operators.operatorframework.io/builder: operator-sdk-v1.8.0 + operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 + name: nginx-ingress-operator.v0.3.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -21,19 +34,19 @@ spec: owned: - description: NginxIngressController is the Schema for the nginxingresscontrollers API + displayName: Nginx Ingress Controller kind: NginxIngressController name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 + - kind: Deployment + name: nic-deployment + version: v1 + - kind: ReplicaSet + name: nic-replicaset + version: v1beta2 + - kind: Pod + name: nic-runner + version: v1 specDescriptors: - description: App Protect support configuration. Requires enableCRDs set to true. @@ -180,16 +193,16 @@ spec: - apiGroups: - "" resources: - - pods - - services - - services/finalizers + - configmaps - endpoints - - persistentvolumeclaims - events - - configmaps + - namespaces + - persistentvolumeclaims + - pods - secrets - serviceaccounts - - namespaces + - services + - services/finalizers verbs: - create - delete @@ -199,53 +212,46 @@ spec: - update - watch - apiGroups: - - apps + - apiextensions.k8s.io resources: - - deployments - - daemonsets - - replicasets - - statefulsets + - customresourcedefinitions verbs: - create - delete - get - - list - - patch - update - - watch - apiGroups: - - monitoring.coreos.com + - appprotect.f5.com + - k8s.nginx.org resources: - - servicemonitors + - '*' verbs: - - get - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: + - delete - get + - list + - patch + - update + - watch - apiGroups: - apps resources: - - replicasets + - daemonsets - deployments + - replicasets + - statefulsets verbs: + - create + - delete - get + - list + - patch + - update + - watch - apiGroups: - k8s.nginx.org - - appprotect.f5.com resources: - - '*' + - nginxingresscontrollers verbs: - create - delete @@ -255,102 +261,180 @@ spec: - update - watch - apiGroups: - - rbac.authorization.k8s.io + - k8s.nginx.org resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings + - nginxingresscontrollers/finalizers + verbs: + - update + - apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers/status verbs: - - create - - delete - get - - list - patch - update - - watch - apiGroups: - - apiextensions.k8s.io + - networking.k8s.io resources: - - customresourcedefinitions + - ingressclasses verbs: - create - delete - - update - get - apiGroups: - networking.k8s.io resources: - ingresses verbs: + - get - list - watch - - get - apiGroups: - networking.k8s.io resources: - ingresses/status verbs: - update + - apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + - clusterroles + - rolebindings + - roles + verbs: + - create + - delete + - get + - list + - patch + - update + - watch - apiGroups: - security.openshift.io resources: - securitycontextconstraints verbs: - create - - update - get - list + - update - watch - apiGroups: - - networking.k8s.io + - authentication.k8s.io resources: - - ingressclasses + - tokenreviews verbs: - - get - create - serviceAccountName: nginx-ingress-operator + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create + serviceAccountName: nginx-ingress-operator-controller-manager deployments: - - name: nginx-ingress-operator + - name: nginx-ingress-operator-controller-manager spec: replicas: 1 selector: matchLabels: - name: nginx-ingress-operator + control-plane: controller-manager strategy: {} template: metadata: labels: - name: nginx-ingress-operator + control-plane: controller-manager spec: containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator + - args: + - --secure-listen-address=0.0.0.0:8443 + - --upstream=http://127.0.0.1:8080/ + - --logtostderr=true + - --v=10 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 + name: kube-rbac-proxy + ports: + - containerPort: 8443 + name: https resources: {} - serviceAccountName: nginx-ingress-operator + - args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect + command: + - /manager + image: nginx/nginx-ingress-operator:0.3.0 + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + name: manager + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + resources: + limits: + cpu: 100m + memory: 30Mi + requests: + cpu: 100m + memory: 20Mi + securityContext: + allowPrivilegeEscalation: false + securityContext: + runAsNonRoot: true + serviceAccountName: nginx-ingress-operator-controller-manager + terminationGracePeriodSeconds: 10 + permissions: + - rules: + - apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch + serviceAccountName: nginx-ingress-operator-controller-manager strategy: deployment installModes: - - supported: true + - supported: false type: OwnNamespace - - supported: true + - supported: false type: SingleNamespace - - supported: true - type: MultiNamespace - supported: false + type: MultiNamespace + - supported: true type: AllNamespaces keywords: - nginx @@ -360,17 +444,13 @@ spec: - kubernetes - openshift links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md + - name: Nginx Ingress Operator + url: https://github.com/nginxinc/nginx-ingress-operator maintainers: - email: kubernetes@nginx.com name: NGINX Inc maturity: alpha provider: name: NGINX Inc - replaces: nginx-ingress-operator.v0.1.0 - version: 0.2.0 + replaces: nginx-ingress-operator.v0.2.0 + version: 0.3.0 diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml new file mode 100644 index 00000000..cb670903 --- /dev/null +++ b/bundle/metadata/annotations.yaml @@ -0,0 +1,14 @@ +annotations: + # Core bundle annotations. + operators.operatorframework.io.bundle.mediatype.v1: registry+v1 + operators.operatorframework.io.bundle.manifests.v1: manifests/ + operators.operatorframework.io.bundle.metadata.v1: metadata/ + operators.operatorframework.io.bundle.package.v1: nginx-ingress-operator + operators.operatorframework.io.bundle.channels.v1: alpha + operators.operatorframework.io.metrics.builder: operator-sdk-v1.8.0 + operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 + operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3 + + # Annotations for testing. + operators.operatorframework.io.test.mediatype.v1: scorecard+v1 + operators.operatorframework.io.test.config.v1: tests/scorecard/ diff --git a/bundle/nginx-ingress-operator.package.yaml b/bundle/nginx-ingress-operator.package.yaml deleted file mode 100644 index eb5bd8af..00000000 --- a/bundle/nginx-ingress-operator.package.yaml +++ /dev/null @@ -1,5 +0,0 @@ -channels: -- currentCSV: nginx-ingress-operator.v0.2.0 - name: alpha -defaultChannel: alpha -packageName: nginx-ingress-operator diff --git a/bundle/tests/scorecard/config.yaml b/bundle/tests/scorecard/config.yaml new file mode 100644 index 00000000..af09c69e --- /dev/null +++ b/bundle/tests/scorecard/config.yaml @@ -0,0 +1,49 @@ +apiVersion: scorecard.operatorframework.io/v1alpha3 +kind: Configuration +metadata: + name: config +stages: +- parallel: true + tests: + - entrypoint: + - scorecard-test + - basic-check-spec + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: basic + test: basic-check-spec-test + - entrypoint: + - scorecard-test + - olm-bundle-validation + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-bundle-validation-test + - entrypoint: + - scorecard-test + - olm-crds-have-validation + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-crds-have-validation-test + - entrypoint: + - scorecard-test + - olm-crds-have-resources + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-crds-have-resources-test + - entrypoint: + - scorecard-test + - olm-spec-descriptors + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-spec-descriptors-test + - entrypoint: + - scorecard-test + - olm-status-descriptors + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-status-descriptors-test diff --git a/cmd/manager/main.go b/cmd/manager/main.go deleted file mode 100644 index 6d8da0b3..00000000 --- a/cmd/manager/main.go +++ /dev/null @@ -1,222 +0,0 @@ -package main - -import ( - "context" - "errors" - "flag" - "fmt" - "os" - "runtime" - - "github.com/nginxinc/nginx-ingress-operator/pkg/controller/nginxingresscontroller" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime/schema" - - // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) - "k8s.io/client-go/kubernetes" - _ "k8s.io/client-go/plugin/pkg/client/auth" - "k8s.io/client-go/rest" - - "github.com/nginxinc/nginx-ingress-operator/pkg/apis" - "github.com/nginxinc/nginx-ingress-operator/pkg/controller" - "github.com/nginxinc/nginx-ingress-operator/version" - - secv1 "github.com/openshift/api/security/v1" - "github.com/operator-framework/operator-sdk/pkg/k8sutil" - kubemetrics "github.com/operator-framework/operator-sdk/pkg/kube-metrics" - "github.com/operator-framework/operator-sdk/pkg/leader" - "github.com/operator-framework/operator-sdk/pkg/log/zap" - "github.com/operator-framework/operator-sdk/pkg/metrics" - sdkVersion "github.com/operator-framework/operator-sdk/version" - "github.com/spf13/pflag" - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/intstr" - "sigs.k8s.io/controller-runtime/pkg/client/config" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/manager/signals" -) - -// Change below variables to serve metrics on different host or port. -var ( - metricsHost = "0.0.0.0" - metricsPort int32 = 8383 - operatorMetricsPort int32 = 8686 -) -var log = logf.Log.WithName("cmd") - -func printVersion() { - log.Info(fmt.Sprintf("Operator Version: %s", version.Version)) - log.Info(fmt.Sprintf("Go Version: %s", runtime.Version())) - log.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runtime.GOOS, runtime.GOARCH)) - log.Info(fmt.Sprintf("Version of operator-sdk: %v", sdkVersion.Version)) - log.Info(fmt.Sprintf("Version of kubernetes: %v", nginxingresscontroller.RunningK8sVersion)) -} - -func main() { - // Add the zap logger flag set to the CLI. The flag set must - // be added before calling pflag.Parse(). - pflag.CommandLine.AddFlagSet(zap.FlagSet()) - - // Add flags registered by imported packages (e.g. glog and - // controller-runtime) - pflag.CommandLine.AddGoFlagSet(flag.CommandLine) - - pflag.Parse() - - // Use a zap logr.Logger implementation. If none of the zap - // flags are configured (or if the zap flag set is not being - // used), this defaults to a production zap logger. - // - // The logger instantiated here can be changed to any logger - // implementing the logr.Logger interface. This logger will - // be propagated through the whole operator, generating - // uniform and structured logs. - logf.SetLogger(zap.Logger()) - - // Get a config to talk to the apiserver - cfg, err := config.GetConfig() - if err != nil { - log.Error(err, "") - os.Exit(1) - } - clientset, err := kubernetes.NewForConfig(cfg) - if err != nil { - log.Error(err, "") - os.Exit(1) - } - nginxingresscontroller.RunningK8sVersion, err = nginxingresscontroller.GetK8sVersion(clientset) - if err != nil { - log.Error(err, "") - os.Exit(1) - } - - printVersion() - - ctx := context.TODO() - // Become the leader before proceeding - err = leader.Become(ctx, "nginx-ingress-operator-lock") - if err != nil { - log.Error(err, "") - os.Exit(1) - } - - // Create a new Cmd to provide shared dependencies and start components - mgr, err := manager.New(cfg, manager.Options{ - Namespace: v1.NamespaceAll, - MetricsBindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort), - }) - if err != nil { - log.Error(err, "") - os.Exit(1) - } - - log.Info("Registering Components.") - - // Setup Scheme for all resources - if err := apis.AddToScheme(mgr.GetScheme()); err != nil { - log.Error(err, "") - os.Exit(1) - } - - // Setup Scheme for SCC if deployed in OpenShift - sccAPIExists, err := nginxingresscontroller.VerifySCCAPIExists() - if err != nil { - log.Error(err, "Could not check if SCC API exists") - os.Exit(1) - } - - if sccAPIExists { - gv := schema.GroupVersion{ - Group: secv1.GroupName, - Version: secv1.GroupVersion.Version, - } - - mgr.GetScheme().AddKnownTypes(gv, &secv1.SecurityContextConstraints{}) - mgr.GetScheme().AddKnownTypes(gv, &secv1.SecurityContextConstraintsList{}) - metav1.AddToGroupVersion(mgr.GetScheme(), gv) - } - - // Setup all Controllers - if err := controller.AddToManager(mgr); err != nil { - log.Error(err, "") - os.Exit(1) - } - - addMetrics(ctx, cfg) - - log.Info("Starting the Cmd.") - - // Start the Cmd - if err := mgr.Start(signals.SetupSignalHandler()); err != nil { - log.Error(err, "Manager exited non-zero") - os.Exit(1) - } -} - -// addMetrics will create the Services and Service Monitors to allow the operator export the metrics by using -// the Prometheus operator -func addMetrics(ctx context.Context, cfg *rest.Config) { - // Get the namespace the operator is currently deployed in. - operatorNs, err := k8sutil.GetOperatorNamespace() - if err != nil { - if errors.Is(err, k8sutil.ErrRunLocal) { - log.Info("Skipping CR metrics server creation; not running in a cluster.") - return - } - } - - if err := serveCRMetrics(cfg, operatorNs); err != nil { - log.Info("Could not generate and serve custom resource metrics", "error", err.Error()) - } - - // Add to the below struct any other metrics ports you want to expose. - servicePorts := []v1.ServicePort{ - {Port: metricsPort, Name: metrics.OperatorPortName, Protocol: v1.ProtocolTCP, TargetPort: intstr.IntOrString{Type: intstr.Int, IntVal: metricsPort}}, - {Port: operatorMetricsPort, Name: metrics.CRPortName, Protocol: v1.ProtocolTCP, TargetPort: intstr.IntOrString{Type: intstr.Int, IntVal: operatorMetricsPort}}, - } - - // Create Service object to expose the metrics port(s). - service, err := metrics.CreateMetricsService(ctx, cfg, servicePorts) - if err != nil { - log.Info("Could not create metrics Service", "error", err.Error()) - } - - // CreateServiceMonitors will automatically create the prometheus-operator ServiceMonitor resources - // necessary to configure Prometheus to scrape metrics from this operator. - services := []*v1.Service{service} - - // The ServiceMonitor is created in the same namespace where the operator is deployed - _, err = metrics.CreateServiceMonitors(cfg, operatorNs, services) - if err != nil { - log.Info("Could not create ServiceMonitor object", "error", err.Error()) - // If this operator is deployed to a cluster without the prometheus-operator running, it will return - // ErrServiceMonitorNotPresent, which can be used to safely skip ServiceMonitor creation. - if err == metrics.ErrServiceMonitorNotPresent { - log.Info("Install prometheus-operator in your cluster to create ServiceMonitor objects", "error", err.Error()) - } - } -} - -// serveCRMetrics gets the Operator/CustomResource GVKs and generates metrics based on those types. -// It serves those metrics on "http://metricsHost:operatorMetricsPort". -func serveCRMetrics(cfg *rest.Config, operatorNs string) error { - // The function below returns a list of filtered operator/CR specific GVKs. For more control, override the GVK list below - // with your own custom logic. Note that if you are adding third party API schemas, probably you will need to - // customize this implementation to avoid permissions issues. - filteredGVK, err := k8sutil.GetGVKsFromAddToScheme(apis.AddToScheme) - if err != nil { - return err - } - - // To generate metrics in other namespaces, add the values below. - ns := []string{operatorNs} - - // Generate and serve custom resource specific metrics. - err = kubemetrics.GenerateAndServeCRMetrics(cfg, ns, filteredGVK, metricsHost, operatorMetricsPort) - if err != nil { - return err - } - return nil -} diff --git a/config/crd/bases/k8s.nginx.org_nginxingresscontrollers.yaml b/config/crd/bases/k8s.nginx.org_nginxingresscontrollers.yaml new file mode 100644 index 00000000..92ffe8fc --- /dev/null +++ b/config/crd/bases/k8s.nginx.org_nginxingresscontrollers.yaml @@ -0,0 +1,305 @@ + +--- +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + controller-gen.kubebuilder.io/version: v0.4.1 + creationTimestamp: null + name: nginxingresscontrollers.k8s.nginx.org +spec: + group: k8s.nginx.org + names: + kind: NginxIngressController + listKind: NginxIngressControllerList + plural: nginxingresscontrollers + singular: nginxingresscontroller + scope: Namespaced + versions: + - name: v1alpha1 + schema: + openAPIV3Schema: + description: NginxIngressController is the Schema for the nginxingresscontrollers + 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: NginxIngressControllerSpec defines the desired state of NginxIngressController + properties: + appProtect: + description: App Protect support configuration. Requires enableCRDs + set to true. + nullable: true + properties: + enable: + description: Enable App Protect. + type: boolean + required: + - enable + type: object + configMapData: + additionalProperties: + type: string + description: Initial values of the Ingress Controller ConfigMap. Check + https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ + for more information about possible values. + nullable: true + type: object + defaultSecret: + description: The TLS Secret for TLS termination of the default server. + The format is namespace/name. The secret must be of the type kubernetes.io/tls. + If not specified, the operator will generate and deploy a TLS Secret + with a self-signed certificate and key. + type: string + enableCRDs: + description: Enables the use of NGINX Ingress Resource Definitions + (VirtualServer and VirtualServerRoute). Default is true. + nullable: true + type: boolean + enableLatencyMetrics: + description: Bucketed response times from when NGINX establishes a + connection to an upstream server to when the last byte of the response + body is received by NGINX. **Note** The metric for the upstream + isn't available until traffic is sent to the upstream. + nullable: true + type: boolean + enableLeaderElection: + description: Enables Leader election to avoid multiple replicas of + the controller reporting the status of Ingress resources – only + one replica will report status. Default is true. + nullable: true + type: boolean + enablePreviewPolicies: + description: Enables preview policies. Requires enableCRDs set to + true. + type: boolean + enableSnippets: + description: Enable custom NGINX configuration snippets in VirtualServer, + VirtualServerRoute and TransportServer resources. Requires enableCRDs + set to true. + type: boolean + enableTLSPassthrough: + description: Enable TLS Passthrough on port 443. Requires enableCRDs + set to true. + type: boolean + globalConfiguration: + description: The GlobalConfiguration resource for global configuration + of the Ingress Controller. Format is namespace/name. Requires enableCRDs + set to true. + type: string + healthStatus: + description: Adds a new location to the default server. The location + responds with the 200 status code for any request. Useful for external + health-checking of the Ingress controller. + nullable: true + properties: + enable: + description: Enable the HealthStatus. + type: boolean + uri: + description: URI of the location. Default is `/nginx-health`. + type: string + required: + - enable + type: object + image: + description: The image of the Ingress Controller. + properties: + pullPolicy: + description: The ImagePullPolicy of the image. + enum: + - Never + - Always + - IfNotPresent + type: string + repository: + description: The repository of the image. + type: string + tag: + description: The tag (version) of the image. + type: string + required: + - pullPolicy + - repository + - tag + type: object + ingressClass: + description: A class of the Ingress controller. The Ingress controller + only processes Ingress resources that belong to its class (in other + words, have the annotation “kubernetes.io/ingress.class”). Additionally, + the Ingress controller processes Ingress resources that do not have + that annotation, which can be disabled by setting UseIngressClassOnly + to true. Default is `nginx`. + type: string + logLevel: + description: Log level for V logs. Format is 0 - 3 + maximum: 3 + minimum: 0 + type: integer + nginxDebug: + description: 'Enable debugging for NGINX. Uses the nginx-debug binary. + Requires ‘error-log-level: debug’ in the ConfigMapData.' + type: boolean + nginxPlus: + description: Deploys the Ingress Controller for NGINX Plus. The default + is false meaning the Ingress Controller will be deployed for NGINX + OSS. + type: boolean + nginxReloadTimeout: + description: Timeout in milliseconds which the Ingress Controller + will wait for a successful NGINX reload after a change or at the + initial start. + type: integer + nginxStatus: + description: NGINX stub_status, or the NGINX Plus API. + nullable: true + properties: + allowCidrs: + description: Whitelist IPv4 IP/CIDR blocks to allow access to + NGINX stub_status or the NGINX Plus API. Separate multiple IP/CIDR + by commas. (default “127.0.0.1”) + type: string + enable: + description: Enable the NginxStatus. + type: boolean + port: + description: Set the port where the NGINX stub_status or the NGINX + Plus API is exposed. Default is 8080. Format is 1023 - 65535 + maximum: 65535 + minimum: 1023 + nullable: true + type: integer + required: + - enable + type: object + prometheus: + description: NGINX or NGINX Plus metrics in the Prometheus format. + nullable: true + properties: + enable: + description: Enable Prometheus metrics. + type: boolean + port: + description: Sets the port where the Prometheus metrics are exposed. + Default is 9113. Format is 1023 - 65535 + maximum: 65535 + minimum: 1023 + nullable: true + type: integer + required: + - enable + type: object + replicas: + description: The number of replicas of the Ingress Controller pod. + The default is 1. Only applies if the type is set to deployment. + format: int32 + nullable: true + type: integer + reportIngressStatus: + description: Update the address field in the status of Ingresses resources. + nullable: true + properties: + enable: + description: Enable the ReportIngressStatus. + type: boolean + externalService: + description: 'Specifies the name of the service with the type + LoadBalancer through which the Ingress controller pods are exposed + externally. The external address of the service is used when + reporting the status of Ingress resources. Note: if serviceType + is LoadBalancer, the value of this field will be ignored, and + the operator will use the name of the created LoadBalancer service + instead.' + type: string + ingressLink: + description: 'Specifies the name of the IngressLink resource, + which exposes the Ingress Controller pods via a BIG-IP system. + The IP of the BIG-IP system is used when reporting the status + of Ingress, VirtualServer and VirtualServerRoute resources. + Requires reportIngressStatus.enable set to true. Note: If serviceType + is LoadBalancer or reportIngressStatus.externalService is set, + the value of this field will be ignored.' + type: string + required: + - enable + type: object + service: + description: The service of the Ingress controller. + nullable: true + properties: + extraLabels: + additionalProperties: + type: string + description: Specifies extra labels of the service. + type: object + type: object + serviceType: + description: 'The type of the Service for the Ingress Controller. + Valid Service types are: NodePort and LoadBalancer.' + enum: + - NodePort + - LoadBalancer + type: string + type: + description: The type of the Ingress Controller installation - deployment + or daemonset. + enum: + - deployment + - daemonset + type: string + useIngressClassOnly: + description: Ignore Ingress resources without the “kubernetes.io/ingress.class” + annotation. + type: boolean + watchNamespace: + description: Namespace to watch for Ingress resources. By default + the Ingress controller watches all namespaces. + type: string + wildcardTLS: + description: A Secret with a TLS certificate and key for TLS termination + of every Ingress host for which TLS termination is enabled but the + Secret is not specified. The secret must be of the type kubernetes.io/tls. + If the argument is not set, for such Ingress hosts NGINX will break + any attempt to establish a TLS connection. If the argument is set, + but the Ingress controller is not able to fetch the Secret from + Kubernetes API, the Ingress Controller will fail to start. Format + is namespace/name. + type: string + required: + - image + - serviceType + - type + type: object + status: + description: NginxIngressControllerStatus defines the observed state of + NginxIngressController + properties: + deployed: + description: Deployed is true if the Operator has finished the deployment + of the NginxIngressController. + type: boolean + required: + - deployed + type: object + type: object + served: true + storage: true + subresources: + status: {} +status: + acceptedNames: + kind: "" + plural: "" + conditions: [] + storedVersions: [] diff --git a/build/kic_crds/appprotect.f5.com_aplogconfs.yaml b/config/crd/kic/appprotect.f5.com_aplogconfs.yaml similarity index 100% rename from build/kic_crds/appprotect.f5.com_aplogconfs.yaml rename to config/crd/kic/appprotect.f5.com_aplogconfs.yaml diff --git a/build/kic_crds/appprotect.f5.com_appolicies.yaml b/config/crd/kic/appprotect.f5.com_appolicies.yaml similarity index 100% rename from build/kic_crds/appprotect.f5.com_appolicies.yaml rename to config/crd/kic/appprotect.f5.com_appolicies.yaml diff --git a/build/kic_crds/appprotect.f5.com_apusersigs.yaml b/config/crd/kic/appprotect.f5.com_apusersigs.yaml similarity index 100% rename from build/kic_crds/appprotect.f5.com_apusersigs.yaml rename to config/crd/kic/appprotect.f5.com_apusersigs.yaml diff --git a/build/kic_crds/k8s.nginx.org_globalconfigurations.yaml b/config/crd/kic/k8s.nginx.org_globalconfigurations.yaml similarity index 100% rename from build/kic_crds/k8s.nginx.org_globalconfigurations.yaml rename to config/crd/kic/k8s.nginx.org_globalconfigurations.yaml diff --git a/build/kic_crds/k8s.nginx.org_policies.yaml b/config/crd/kic/k8s.nginx.org_policies.yaml similarity index 100% rename from build/kic_crds/k8s.nginx.org_policies.yaml rename to config/crd/kic/k8s.nginx.org_policies.yaml diff --git a/build/kic_crds/k8s.nginx.org_transportservers.yaml b/config/crd/kic/k8s.nginx.org_transportservers.yaml similarity index 100% rename from build/kic_crds/k8s.nginx.org_transportservers.yaml rename to config/crd/kic/k8s.nginx.org_transportservers.yaml diff --git a/build/kic_crds/k8s.nginx.org_virtualserverroutes.yaml b/config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml similarity index 100% rename from build/kic_crds/k8s.nginx.org_virtualserverroutes.yaml rename to config/crd/kic/k8s.nginx.org_virtualserverroutes.yaml diff --git a/build/kic_crds/k8s.nginx.org_virtualservers.yaml b/config/crd/kic/k8s.nginx.org_virtualservers.yaml similarity index 100% rename from build/kic_crds/k8s.nginx.org_virtualservers.yaml rename to config/crd/kic/k8s.nginx.org_virtualservers.yaml diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml new file mode 100644 index 00000000..4ca79fc2 --- /dev/null +++ b/config/crd/kustomization.yaml @@ -0,0 +1,21 @@ +# This kustomization.yaml is not intended to be run by itself, +# since it depends on service name and namespace that are out of this kustomize package. +# It should be run by config/default +resources: +- bases/k8s.nginx.org_nginxingresscontrollers.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_nginxingresscontrollers.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_nginxingresscontrollers.yaml +#+kubebuilder:scaffold:crdkustomizecainjectionpatch + +# the following config is for teaching kustomize how to do kustomization for CRDs. +configurations: +- kustomizeconfig.yaml diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml new file mode 100644 index 00000000..ec5c150a --- /dev/null +++ b/config/crd/kustomizeconfig.yaml @@ -0,0 +1,19 @@ +# This file is for teaching kustomize how to substitute name and namespace reference in CRD +nameReference: +- kind: Service + version: v1 + fieldSpecs: + - kind: CustomResourceDefinition + version: v1 + group: apiextensions.k8s.io + path: spec/conversion/webhook/clientConfig/service/name + +namespace: +- kind: CustomResourceDefinition + version: v1 + group: apiextensions.k8s.io + path: spec/conversion/webhook/clientConfig/service/namespace + create: false + +varReference: +- path: metadata/annotations diff --git a/config/crd/patches/cainjection_in_nginxingresscontrollers.yaml b/config/crd/patches/cainjection_in_nginxingresscontrollers.yaml new file mode 100644 index 00000000..0e935a5a --- /dev/null +++ b/config/crd/patches/cainjection_in_nginxingresscontrollers.yaml @@ -0,0 +1,7 @@ +# The following patch adds a directive for certmanager to inject CA into the CRD +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + annotations: + cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) + name: nginxingresscontrollers.k8s.nginx.org diff --git a/config/crd/patches/webhook_in_nginxingresscontrollers.yaml b/config/crd/patches/webhook_in_nginxingresscontrollers.yaml new file mode 100644 index 00000000..f27be082 --- /dev/null +++ b/config/crd/patches/webhook_in_nginxingresscontrollers.yaml @@ -0,0 +1,14 @@ +# The following patch enables a conversion webhook for the CRD +apiVersion: apiextensions.k8s.io/v1 +kind: CustomResourceDefinition +metadata: + name: nginxingresscontrollers.k8s.nginx.org +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 new file mode 100644 index 00000000..3c46c0f9 --- /dev/null +++ b/config/default/kustomization.yaml @@ -0,0 +1,74 @@ +# Adds namespace to all resources. +namespace: nginx-ingress-operator-system + +# Value of this field is prepended to the +# names of all resources, e.g. a deployment named +# "wordpress" becomes "alices-wordpress". +# Note that it should also match with the prefix (text before '-') of the namespace +# field above. +namePrefix: nginx-ingress-operator- + +# Labels to add to all resources and selectors. +#commonLabels: +# someName: someValue + +bases: +- ../crd +- ../rbac +- ../manager +# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in +# crd/kustomization.yaml +#- ../webhook +# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required. +#- ../certmanager +# [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. +#- ../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. +- 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 + +# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. +# Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks. +# 'CERTMANAGER' needs to be enabled to use ca injection +#- webhookcainjection_patch.yaml + +# the following config is for teaching kustomize how to do var substitution +vars: +# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER' prefix. +#- name: CERTIFICATE_NAMESPACE # namespace of the certificate CR +# objref: +# kind: Certificate +# group: cert-manager.io +# version: v1 +# name: serving-cert # this name should match the one in certificate.yaml +# fieldref: +# fieldpath: metadata.namespace +#- name: CERTIFICATE_NAME +# objref: +# kind: Certificate +# group: cert-manager.io +# version: v1 +# name: serving-cert # this name should match the one in certificate.yaml +#- name: SERVICE_NAMESPACE # namespace of the service +# objref: +# kind: Service +# version: v1 +# name: webhook-service +# fieldref: +# fieldpath: metadata.namespace +#- name: SERVICE_NAME +# objref: +# kind: Service +# version: v1 +# name: webhook-service diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml new file mode 100644 index 00000000..a224be19 --- /dev/null +++ b/config/default/manager_auth_proxy_patch.yaml @@ -0,0 +1,26 @@ +# 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 +metadata: + name: controller-manager + namespace: system +spec: + template: + spec: + containers: + - name: kube-rbac-proxy + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 + args: + - "--secure-listen-address=0.0.0.0:8443" + - "--upstream=http://127.0.0.1:8080/" + - "--logtostderr=true" + - "--v=10" + ports: + - containerPort: 8443 + name: https + - name: manager + args: + - "--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 00000000..6c400155 --- /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/manager/controller_manager_config.yaml b/config/manager/controller_manager_config.yaml new file mode 100644 index 00000000..904133ba --- /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: ca5c10a7.nginx.org diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml new file mode 100644 index 00000000..adcf55f0 --- /dev/null +++ b/config/manager/kustomization.yaml @@ -0,0 +1,16 @@ +resources: +- manager.yaml + +generatorOptions: + disableNameSuffixHash: true + +configMapGenerator: +- files: + - controller_manager_config.yaml + name: manager-config +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +images: +- name: controller + newName: nginx/nginx-ingress-operator + newTag: 0.3.0 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml new file mode 100644 index 00000000..79adfe72 --- /dev/null +++ b/config/manager/manager.yaml @@ -0,0 +1,56 @@ +apiVersion: v1 +kind: Namespace +metadata: + labels: + control-plane: controller-manager + name: system +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: controller-manager + namespace: system + labels: + control-plane: controller-manager +spec: + selector: + matchLabels: + control-plane: controller-manager + replicas: 1 + template: + metadata: + labels: + control-plane: controller-manager + spec: + securityContext: + runAsNonRoot: true + containers: + - command: + - /manager + args: + - --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 + memory: 30Mi + requests: + cpu: 100m + memory: 20Mi + serviceAccountName: controller-manager + terminationGracePeriodSeconds: 10 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml similarity index 65% rename from deploy/olm-catalog/nginx-ingress-operator/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml rename to config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml index 496361bd..d205e3f6 100644 --- a/deploy/olm-catalog/nginx-ingress-operator/0.2.0/nginx-ingress-operator.v0.2.0.clusterserviceversion.yaml +++ b/config/manifests/bases/nginx-ingress-operator.clusterserviceversion.yaml @@ -2,18 +2,9 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.11.1-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] + alm-examples: '[]' capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.2.0 + name: nginx-ingress-operator.v0.0.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -21,19 +12,19 @@ spec: owned: - description: NginxIngressController is the Schema for the nginxingresscontrollers API + displayName: Nginx Ingress Controller kind: NginxIngressController name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 + - kind: Deployment + name: nic-deployment + version: v1 + - kind: ReplicaSet + name: nic-replicaset + version: v1beta2 + - kind: Pod + name: nic-runner + version: v1 specDescriptors: - description: App Protect support configuration. Requires enableCRDs set to true. @@ -175,182 +166,16 @@ spec: mediatype: image/svg+xml install: spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.2.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment + deployments: null + strategy: "" installModes: - - supported: true + - supported: false type: OwnNamespace - - supported: true + - supported: false type: SingleNamespace - - supported: true - type: MultiNamespace - supported: false + type: MultiNamespace + - supported: true type: AllNamespaces keywords: - nginx @@ -360,17 +185,13 @@ spec: - kubernetes - openshift links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md + - name: Nginx Ingress Operator + url: https://github.com/nginxinc/nginx-ingress-operator maintainers: - email: kubernetes@nginx.com name: NGINX Inc maturity: alpha provider: name: NGINX Inc - replaces: nginx-ingress-operator.v0.1.0 - version: 0.2.0 + replaces: nginx-ingress-operator.v0.2.0 + version: 0.0.0 diff --git a/config/manifests/kustomization.yaml b/config/manifests/kustomization.yaml new file mode 100644 index 00000000..bf90c413 --- /dev/null +++ b/config/manifests/kustomization.yaml @@ -0,0 +1,27 @@ +# These resources constitute the fully configured set of manifests +# used to generate the 'manifests/' directory in a bundle. +resources: +- bases/nginx-ingress-operator.clusterserviceversion.yaml +- ../default +- ../samples +- ../scorecard + +# [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix. +# Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager. +# These patches remove the unnecessary "cert" volume and its manager container volumeMount. +#patchesJson6902: +#- target: +# group: apps +# version: v1 +# kind: Deployment +# name: controller-manager +# namespace: system +# patch: |- +# # Remove the manager container's "cert" volumeMount, since OLM will create and mount a set of certs. +# # Update the indices in this path if adding or removing containers/volumeMounts in the manager's Deployment. +# - op: remove +# path: /spec/template/spec/containers/1/volumeMounts/0 +# # Remove the "cert" volume, since OLM will create and mount a set of certs. +# # Update the indices in this path if adding or removing volumes in the manager's Deployment. +# - op: remove +# path: /spec/template/spec/volumes/0 diff --git a/config/prometheus/kustomization.yaml b/config/prometheus/kustomization.yaml new file mode 100644 index 00000000..ed137168 --- /dev/null +++ b/config/prometheus/kustomization.yaml @@ -0,0 +1,2 @@ +resources: +- monitor.yaml diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml new file mode 100644 index 00000000..d19136ae --- /dev/null +++ b/config/prometheus/monitor.yaml @@ -0,0 +1,20 @@ + +# Prometheus Monitor Service (Metrics) +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + control-plane: controller-manager + name: controller-manager-metrics-monitor + namespace: system +spec: + endpoints: + - path: /metrics + port: https + scheme: https + bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token + tlsConfig: + insecureSkipVerify: true + selector: + matchLabels: + control-plane: controller-manager diff --git a/config/rbac/auth_proxy_client_clusterrole.yaml b/config/rbac/auth_proxy_client_clusterrole.yaml new file mode 100644 index 00000000..bd4af137 --- /dev/null +++ b/config/rbac/auth_proxy_client_clusterrole.yaml @@ -0,0 +1,7 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: metrics-reader +rules: +- nonResourceURLs: ["/metrics"] + verbs: ["get"] diff --git a/config/rbac/auth_proxy_role.yaml b/config/rbac/auth_proxy_role.yaml new file mode 100644 index 00000000..618f5e41 --- /dev/null +++ b/config/rbac/auth_proxy_role.yaml @@ -0,0 +1,13 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: proxy-role +rules: +- apiGroups: ["authentication.k8s.io"] + resources: + - tokenreviews + verbs: ["create"] +- apiGroups: ["authorization.k8s.io"] + resources: + - subjectaccessreviews + verbs: ["create"] diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml new file mode 100644 index 00000000..ec7acc0a --- /dev/null +++ b/config/rbac/auth_proxy_role_binding.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: proxy-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: proxy-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml new file mode 100644 index 00000000..6cf656be --- /dev/null +++ b/config/rbac/auth_proxy_service.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + control-plane: controller-manager + name: controller-manager-metrics-service + namespace: system +spec: + ports: + - name: https + port: 8443 + targetPort: https + selector: + control-plane: controller-manager diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml new file mode 100644 index 00000000..731832a6 --- /dev/null +++ b/config/rbac/kustomization.yaml @@ -0,0 +1,18 @@ +resources: +# All RBAC will be applied under this service account in +# the deployment namespace. You may comment out this resource +# if your manager will use a service account that exists at +# runtime. Be sure to update RoleBinding and ClusterRoleBinding +# subjects if changing service account names. +- service_account.yaml +- role.yaml +- role_binding.yaml +- leader_election_role.yaml +- leader_election_role_binding.yaml +# Comment the following 4 lines if you want to disable +# the auth proxy (https://github.com/brancz/kube-rbac-proxy) +# which protects your /metrics endpoint. +- auth_proxy_service.yaml +- auth_proxy_role.yaml +- auth_proxy_role_binding.yaml +- auth_proxy_client_clusterrole.yaml diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml new file mode 100644 index 00000000..4190ec80 --- /dev/null +++ b/config/rbac/leader_election_role.yaml @@ -0,0 +1,37 @@ +# permissions to do leader election. +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: leader-election-role +rules: +- apiGroups: + - "" + resources: + - configmaps + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete +- apiGroups: + - "" + resources: + - events + verbs: + - create + - patch diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml new file mode 100644 index 00000000..1d1321ed --- /dev/null +++ b/config/rbac/leader_election_role_binding.yaml @@ -0,0 +1,12 @@ +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: leader-election-rolebinding +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: leader-election-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/config/rbac/nginxingresscontroller_editor_role.yaml b/config/rbac/nginxingresscontroller_editor_role.yaml new file mode 100644 index 00000000..536e4212 --- /dev/null +++ b/config/rbac/nginxingresscontroller_editor_role.yaml @@ -0,0 +1,24 @@ +# permissions for end users to edit nginxingresscontrollers. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: nginxingresscontroller-editor-role +rules: +- apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch +- apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers/status + verbs: + - get diff --git a/config/rbac/nginxingresscontroller_viewer_role.yaml b/config/rbac/nginxingresscontroller_viewer_role.yaml new file mode 100644 index 00000000..9dab412d --- /dev/null +++ b/config/rbac/nginxingresscontroller_viewer_role.yaml @@ -0,0 +1,20 @@ +# permissions for end users to view nginxingresscontrollers. +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: nginxingresscontroller-viewer-role +rules: +- apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers + verbs: + - get + - list + - watch +- apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers/status + verbs: + - get diff --git a/deploy/role.yaml b/config/rbac/role.yaml similarity index 85% rename from deploy/role.yaml rename to config/rbac/role.yaml index a724dac9..0fea5ec1 100644 --- a/deploy/role.yaml +++ b/config/rbac/role.yaml @@ -1,22 +1,24 @@ + +--- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null - name: nginx-ingress-operator + name: manager-role rules: - apiGroups: - "" resources: - - pods - - services - - services/finalizers + - configmaps - endpoints - - persistentvolumeclaims - events - - configmaps + - namespaces + - persistentvolumeclaims + - pods - secrets - serviceaccounts - - namespaces + - services + - services/finalizers verbs: - create - delete @@ -26,53 +28,46 @@ rules: - update - watch - apiGroups: - - apps + - apiextensions.k8s.io resources: - - deployments - - daemonsets - - replicasets - - statefulsets + - customresourcedefinitions verbs: - create - delete - get - - list - - patch - update - - watch - apiGroups: - - monitoring.coreos.com + - appprotect.f5.com + - k8s.nginx.org resources: - - servicemonitors + - '*' verbs: - - get - create -- apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update -- apiGroups: - - "" - resources: - - pods - verbs: + - delete - get + - list + - patch + - update + - watch - apiGroups: - apps resources: - - replicasets + - daemonsets - deployments + - replicasets + - statefulsets verbs: + - create + - delete - get + - list + - patch + - update + - watch - apiGroups: - k8s.nginx.org - - appprotect.f5.com resources: - - '*' + - nginxingresscontrollers verbs: - create - delete @@ -82,37 +77,35 @@ rules: - update - watch - apiGroups: - - rbac.authorization.k8s.io + - k8s.nginx.org resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings + - nginxingresscontrollers/finalizers + verbs: + - update +- apiGroups: + - k8s.nginx.org + resources: + - nginxingresscontrollers/status verbs: - - create - - delete - get - - list - patch - update - - watch - apiGroups: - - apiextensions.k8s.io + - networking.k8s.io resources: - - customresourcedefinitions + - ingressclasses verbs: - create - delete - - update - get - apiGroups: - networking.k8s.io resources: - ingresses verbs: + - get - list - watch - - get - apiGroups: - networking.k8s.io resources: @@ -120,19 +113,27 @@ rules: verbs: - update - apiGroups: - - security.openshift.io + - rbac.authorization.k8s.io resources: - - securitycontextconstraints + - clusterrolebindings + - clusterroles + - rolebindings + - roles verbs: - create - - update + - delete - get - list + - patch + - update - watch - apiGroups: - - networking.k8s.io + - security.openshift.io resources: - - ingressclasses + - securitycontextconstraints verbs: + - create - get - - create \ No newline at end of file + - list + - update + - watch diff --git a/deploy/role_binding.yaml b/config/rbac/role_binding.yaml similarity index 60% rename from deploy/role_binding.yaml rename to config/rbac/role_binding.yaml index 6c7442f0..2070ede4 100644 --- a/deploy/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -1,12 +1,12 @@ -kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding metadata: - name: nginx-ingress-operator -subjects: -- kind: ServiceAccount - name: nginx-ingress-operator - namespace: default + name: manager-rolebinding roleRef: - kind: ClusterRole - name: nginx-ingress-operator apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: manager-role +subjects: +- kind: ServiceAccount + name: controller-manager + namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml new file mode 100644 index 00000000..7cd6025b --- /dev/null +++ b/config/rbac/service_account.yaml @@ -0,0 +1,5 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: controller-manager + namespace: system diff --git a/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml b/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml new file mode 100644 index 00000000..10309c76 --- /dev/null +++ b/config/samples/k8s_v1alpha1_nginxingresscontroller.yaml @@ -0,0 +1,13 @@ +apiVersion: k8s.nginx.org/v1alpha1 +kind: NginxIngressController +metadata: + name: my-nginx-ingress-controller +spec: + type: deployment + nginxPlus: false + image: + repository: docker.io/nginx/nginx-ingress + tag: 1.11.3-ubi + pullPolicy: Always + serviceType: NodePort + ingressClass: nginx diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml new file mode 100644 index 00000000..d33359d8 --- /dev/null +++ b/config/samples/kustomization.yaml @@ -0,0 +1,4 @@ +## Append samples you want in your CSV to this file as resources ## +resources: +- k8s_v1alpha1_nginxingresscontroller.yaml +#+kubebuilder:scaffold:manifestskustomizesamples diff --git a/config/scorecard/bases/config.yaml b/config/scorecard/bases/config.yaml new file mode 100644 index 00000000..c7704784 --- /dev/null +++ b/config/scorecard/bases/config.yaml @@ -0,0 +1,7 @@ +apiVersion: scorecard.operatorframework.io/v1alpha3 +kind: Configuration +metadata: + name: config +stages: +- parallel: true + tests: [] diff --git a/config/scorecard/kustomization.yaml b/config/scorecard/kustomization.yaml new file mode 100644 index 00000000..50cd2d08 --- /dev/null +++ b/config/scorecard/kustomization.yaml @@ -0,0 +1,16 @@ +resources: +- bases/config.yaml +patchesJson6902: +- path: patches/basic.config.yaml + target: + group: scorecard.operatorframework.io + version: v1alpha3 + kind: Configuration + name: config +- path: patches/olm.config.yaml + target: + group: scorecard.operatorframework.io + version: v1alpha3 + kind: Configuration + name: config +#+kubebuilder:scaffold:patchesJson6902 diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml new file mode 100644 index 00000000..80e03d54 --- /dev/null +++ b/config/scorecard/patches/basic.config.yaml @@ -0,0 +1,10 @@ +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - basic-check-spec + image: quay.io/operator-framework/scorecard-test:v1.8.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 new file mode 100644 index 00000000..2bc9691c --- /dev/null +++ b/config/scorecard/patches/olm.config.yaml @@ -0,0 +1,50 @@ +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-bundle-validation + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-bundle-validation-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-crds-have-validation + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-crds-have-validation-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-crds-have-resources + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-crds-have-resources-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-spec-descriptors + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-spec-descriptors-test +- op: add + path: /stages/0/tests/- + value: + entrypoint: + - scorecard-test + - olm-status-descriptors + image: quay.io/operator-framework/scorecard-test:v1.8.0 + labels: + suite: olm + test: olm-status-descriptors-test diff --git a/controllers/configmap.go b/controllers/configmap.go new file mode 100644 index 00000000..9ffb2a1e --- /dev/null +++ b/controllers/configmap.go @@ -0,0 +1,32 @@ +package controllers + +import ( + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + + v1 "k8s.io/api/core/v1" +) + +func configMapForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*v1.ConfigMap, error) { + cm := &v1.ConfigMap{ + ObjectMeta: metav1.ObjectMeta{ + Name: instance.Name, + Namespace: instance.Namespace, + }, + Data: instance.Spec.ConfigMapData, + } + if err := ctrl.SetControllerReference(instance, cm, scheme); err != nil { + return nil, err + } + return cm, nil +} + +func configMapMutateFn(cm *v1.ConfigMap, configMapData map[string]string) controllerutil.MutateFn { + return func() error { + cm.Data = configMapData + return nil + } +} diff --git a/controllers/crds.go b/controllers/crds.go new file mode 100644 index 00000000..94996a99 --- /dev/null +++ b/controllers/crds.go @@ -0,0 +1,107 @@ +package controllers + +import ( + "context" + "fmt" + "io/ioutil" + "os" + + "github.com/go-logr/logr" + v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + apixv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/yaml" + "sigs.k8s.io/controller-runtime/pkg/manager" +) + +const ( + crdsPath = "./config/crd/kic" + decoderBufferSize = 100 +) + +func getCRDsManifests() ([]string, error) { + files, err := ioutil.ReadDir(crdsPath) + if err != nil { + return nil, err + } + + var manifests []string + for _, f := range files { + manifests = append(manifests, fmt.Sprintf("%v/%v", crdsPath, f.Name())) + } + + return manifests, nil +} + +func kicCRDs() ([]*v1.CustomResourceDefinition, error) { + manifests, err := getCRDsManifests() + if err != nil { + return nil, err + } + + var crds []*v1.CustomResourceDefinition + for _, path := range manifests { + f, err := os.Open(path) + if err != nil { + return nil, fmt.Errorf("failed to open the CRD manifest %v: %v", path, err) + } + + var crd v1.CustomResourceDefinition + + err = yaml.NewYAMLOrJSONDecoder(f, decoderBufferSize).Decode(&crd) + + if err != nil { + return nil, fmt.Errorf("failed to parse the CRD manifest %v: %v", path, err) + } + + err = f.Close() + if err != nil { + return nil, fmt.Errorf("failed to close the CRD manifest %v: %v", path, err) + } + + crds = append(crds, &crd) + } + + return crds, nil +} + +func createKICCustomResourceDefinitions(log logr.Logger, mgr manager.Manager) error { + // Create CRDs with a different client (apiextensions) + apixClient, err := apixv1client.NewForConfig(mgr.GetConfig()) + if err != nil { + log.Error(err, "unable to create client for CRD registration") + return err + } + + crds, err := kicCRDs() + if err != nil { + return err + } + + crdsClient := apixClient.CustomResourceDefinitions() + for _, crd := range crds { + oldCRD, err := crdsClient.Get(context.TODO(), crd.Name, metav1.GetOptions{}) + if err != nil { + if errors.IsNotFound(err) { + log.V(1).Info(fmt.Sprintf("no previous CRD %v found, creating a new one.", crd.Name)) + _, err = crdsClient.Create(context.TODO(), crd, metav1.CreateOptions{}) + if err != nil { + return fmt.Errorf("error creating CRD %v: %v", crd.Name, err) + } + } else { + return fmt.Errorf("error getting CRD %v: %v", crd.Name, err) + } + } else { + // Update CRDs if they already exist + log.V(1).Info(fmt.Sprintf("previous CRD %v found, updating.", crd.Name)) + oldCRD.Spec = crd.Spec + _, err = crdsClient.Update(context.TODO(), oldCRD, metav1.UpdateOptions{}) + if err != nil { + return fmt.Errorf("error updating CRD %v: %v", crd.Name, err) + } + } + } + + return nil +} diff --git a/pkg/controller/nginxingresscontroller/daemonset.go b/controllers/daemonset.go similarity index 88% rename from pkg/controller/nginxingresscontroller/daemonset.go rename to controllers/daemonset.go index c63213c3..3b57b627 100644 --- a/pkg/controller/nginxingresscontroller/daemonset.go +++ b/controllers/daemonset.go @@ -1,19 +1,21 @@ -package nginxingresscontroller +package controllers import ( - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" ) -func daemonSetForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *appsv1.DaemonSet { +func daemonSetForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*appsv1.DaemonSet, error) { runAsUser := new(int64) allowPrivilegeEscalation := new(bool) *runAsUser = 101 *allowPrivilegeEscalation = true - return &appsv1.DaemonSet{ + dep := &appsv1.DaemonSet{ ObjectMeta: v1.ObjectMeta{ Name: instance.Name, Namespace: instance.Namespace, @@ -78,6 +80,10 @@ func daemonSetForNginxIngressController(instance *k8sv1alpha1.NginxIngressContro }, }, } + if err := ctrl.SetControllerReference(instance, dep, scheme); err != nil { + return nil, err + } + return dep, nil } func hasDaemonSetChanged(ds *appsv1.DaemonSet, instance *k8sv1alpha1.NginxIngressController) bool { diff --git a/pkg/controller/nginxingresscontroller/daemonset_test.go b/controllers/daemonset_test.go similarity index 74% rename from pkg/controller/nginxingresscontroller/daemonset_test.go rename to controllers/daemonset_test.go index d048a313..397a2dcf 100644 --- a/pkg/controller/nginxingresscontroller/daemonset_test.go +++ b/controllers/daemonset_test.go @@ -1,17 +1,24 @@ -package nginxingresscontroller +package controllers import ( - "reflect" "testing" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + "github.com/google/go-cmp/cmp" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/scheme" ) func TestDaemonSetForNginxIngressController(t *testing.T) { + boolPointer := func(b bool) *bool { return &b } + s := scheme.Scheme + + if err := k8sv1alpha1.AddToScheme(s); err != nil { + t.Fatalf("Unable to add k8sv1alpha1 scheme: (%v)", err) + } runAsUser := new(int64) allowPrivilegeEscalation := new(bool) *runAsUser = 101 @@ -33,6 +40,15 @@ func TestDaemonSetForNginxIngressController(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "my-nginx-ingress-controller", Namespace: "my-nginx-ingress-controller", + OwnerReferences: []v1.OwnerReference{ + { + APIVersion: "k8s.nginx.org/v1alpha1", + Name: instance.Name, + Kind: "NginxIngressController", + Controller: boolPointer(true), + BlockOwnerDeletion: boolPointer(true), + }, + }, }, Spec: appsv1.DaemonSetSpec{ Selector: &v1.LabelSelector{ @@ -94,8 +110,8 @@ func TestDaemonSetForNginxIngressController(t *testing.T) { }, } - result := daemonSetForNginxIngressController(instance) - if !reflect.DeepEqual(result, expected) { - t.Errorf("daemonSetForNginxIngressController(%+v) returned %+v but expected %+v", instance, result, expected) + result, _ := daemonSetForNginxIngressController(instance, s) + if diff := cmp.Diff(expected, result); diff != "" { + t.Errorf("daemonSetForNginxIngressController() mismatch (-want +got):\n%s", diff) } } diff --git a/pkg/controller/nginxingresscontroller/deployment.go b/controllers/deployment.go similarity index 89% rename from pkg/controller/nginxingresscontroller/deployment.go rename to controllers/deployment.go index 9340f459..8208b54e 100644 --- a/pkg/controller/nginxingresscontroller/deployment.go +++ b/controllers/deployment.go @@ -1,19 +1,21 @@ -package nginxingresscontroller +package controllers import ( - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" ) -func deploymentForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *appsv1.Deployment { +func deploymentForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*appsv1.Deployment, error) { runAsUser := new(int64) allowPrivilegeEscalation := new(bool) *runAsUser = 101 *allowPrivilegeEscalation = true - return &appsv1.Deployment{ + dep := &appsv1.Deployment{ ObjectMeta: v1.ObjectMeta{ Name: instance.Name, Namespace: instance.Namespace, @@ -79,6 +81,10 @@ func deploymentForNginxIngressController(instance *k8sv1alpha1.NginxIngressContr }, }, } + if err := ctrl.SetControllerReference(instance, dep, scheme); err != nil { + return nil, err + } + return dep, nil } func hasDeploymentChanged(dep *appsv1.Deployment, instance *k8sv1alpha1.NginxIngressController) bool { diff --git a/pkg/controller/nginxingresscontroller/deployment_test.go b/controllers/deployment_test.go similarity index 91% rename from pkg/controller/nginxingresscontroller/deployment_test.go rename to controllers/deployment_test.go index c8d2d612..1771061a 100644 --- a/pkg/controller/nginxingresscontroller/deployment_test.go +++ b/controllers/deployment_test.go @@ -1,17 +1,24 @@ -package nginxingresscontroller +package controllers import ( "reflect" "testing" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/scheme" ) func TestDeploymentForNginxIngressController(t *testing.T) { + boolPointer := func(b bool) *bool { return &b } + s := scheme.Scheme + + if err := k8sv1alpha1.AddToScheme(s); err != nil { + t.Fatalf("Unable to add k8sv1alpha1 scheme: (%v)", err) + } runAsUser := new(int64) allowPrivilegeEscalation := new(bool) *runAsUser = 101 @@ -33,6 +40,15 @@ func TestDeploymentForNginxIngressController(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "my-nginx-ingress-controller", Namespace: "my-nginx-ingress-controller", + OwnerReferences: []v1.OwnerReference{ + { + APIVersion: "k8s.nginx.org/v1alpha1", + Name: instance.Name, + Kind: "NginxIngressController", + Controller: boolPointer(true), + BlockOwnerDeletion: boolPointer(true), + }, + }, }, Spec: appsv1.DeploymentSpec{ Selector: &v1.LabelSelector{ @@ -94,7 +110,7 @@ func TestDeploymentForNginxIngressController(t *testing.T) { }, } - result := deploymentForNginxIngressController(instance) + result, _ := deploymentForNginxIngressController(instance, s) if !reflect.DeepEqual(result, expected) { t.Errorf("deploymentForNginxIngressController(%+v) returned %+v but expected %+v", instance, result, expected) } diff --git a/pkg/controller/nginxingresscontroller/ingressclass.go b/controllers/ingressclass.go similarity index 72% rename from pkg/controller/nginxingresscontroller/ingressclass.go rename to controllers/ingressclass.go index 847191b7..4e55da5d 100644 --- a/pkg/controller/nginxingresscontroller/ingressclass.go +++ b/controllers/ingressclass.go @@ -1,13 +1,13 @@ -package nginxingresscontroller +package controllers import ( - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" networking "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func ingressClassForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *networking.IngressClass { - return &networking.IngressClass{ + ic := &networking.IngressClass{ ObjectMeta: metav1.ObjectMeta{ Name: instance.Spec.IngressClass, }, @@ -15,4 +15,5 @@ func ingressClassForNginxIngressController(instance *k8sv1alpha1.NginxIngressCon Controller: "nginx.org/ingress-controller", }, } + return ic } diff --git a/pkg/controller/nginxingresscontroller/ingressclass_test.go b/controllers/ingressclass_test.go similarity index 86% rename from pkg/controller/nginxingresscontroller/ingressclass_test.go rename to controllers/ingressclass_test.go index 78f519b2..8b018dc9 100644 --- a/pkg/controller/nginxingresscontroller/ingressclass_test.go +++ b/controllers/ingressclass_test.go @@ -1,10 +1,10 @@ -package nginxingresscontroller +package controllers import ( "testing" "github.com/google/go-cmp/cmp" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" networking "k8s.io/api/networking/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/controllers/nginxingresscontroller_controller.go b/controllers/nginxingresscontroller_controller.go new file mode 100644 index 00000000..f13835b3 --- /dev/null +++ b/controllers/nginxingresscontroller_controller.go @@ -0,0 +1,332 @@ +/* +Copyright 2021. + +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. +*/ + +package controllers + +import ( + "context" + "fmt" + "strings" + + appsv1 "k8s.io/api/apps/v1" + v1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/types" + + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" + ctrllog "sigs.k8s.io/controller-runtime/pkg/log" + + "github.com/go-logr/logr" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" +) + +const ( + clusterRoleName = "nginx-ingress-role" + sccName = "nginx-ingress-scc" + finalizer = "nginxingresscontroller.k8s.nginx.org/finalizer" +) + +// NginxIngressControllerReconciler reconciles a NginxIngressController object +type NginxIngressControllerReconciler struct { + client.Client + Scheme *runtime.Scheme + SccAPIExists bool + Mgr ctrl.Manager +} + +//+kubebuilder:rbac:groups=k8s.nginx.org,resources=nginxingresscontrollers,verbs=get;list;watch;create;update;patch;delete +//+kubebuilder:rbac:groups=k8s.nginx.org,resources=nginxingresscontrollers/status,verbs=get;update;patch +//+kubebuilder:rbac:groups=k8s.nginx.org,resources=nginxingresscontrollers/finalizers,verbs=update +//+kubebuilder:rbac:groups=k8s.nginx.org;appprotect.f5.com,resources=*,verbs=get;list;watch;create;update;patch;delete + +//+kubebuilder:rbac:groups=apps,resources=deployments;daemonsets;replicasets;statefulsets,verbs=get;list;watch;create;update;patch;delete + +//+kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses,verbs=list;watch;get +//+kubebuilder:rbac:groups=networking.k8s.io,resources=ingressclasses,verbs=get;create;delete +//+kubebuilder:rbac:groups=networking.k8s.io,resources=ingresses/status,verbs=update +//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;create;delete;update +//+kubebuilder:rbac:groups=rbac.authorization.k8s.io,resources=clusterroles;clusterrolebindings;roles;rolebindings,verbs=get;list;watch;create;update;patch;delete + +//+kubebuilder:rbac:groups=security.openshift.io,resources=securitycontextconstraints,verbs=create;update;get;list;watch + +//+kubebuilder:rbac:groups="",resources=pods;services;services/finalizers;endpoints;persistentvolumeclaims;events;configmaps;secrets;serviceaccounts;namespaces,verbs=create;update;get;list;watch;patch;delete + +// Reconcile is part of the main kubernetes reconciliation loop which aims to +// move the current state of the cluster closer to the desired state. +// TODO(user): Modify the Reconcile function to compare the state specified by +// the NginxIngressController object against the actual cluster state, and then +// perform operations to make the cluster state reflect the state specified by +// the user. +// +// For more details, check Reconcile and its Result here: +// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.8.3/pkg/reconcile +func (r *NginxIngressControllerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { + log := ctrllog.FromContext(ctx) + + instance := &k8sv1alpha1.NginxIngressController{} + err := r.Get(ctx, req.NamespacedName, instance) + if err != nil && 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("NginxIngressController resource not found. Ignoring since object must be deleted") + return ctrl.Result{}, nil + } else if err != nil { + // Error reading the object - requeue the request. + log.Error(err, "Failed to get NginxIngressController") + return ctrl.Result{}, err + } + + // Check if the NginxIngressController instance is marked to be deleted, which is + // indicated by the deletion timestamp being set. + isNginxIngressControllerMarkedToBeDeleted := instance.GetDeletionTimestamp() != nil + if isNginxIngressControllerMarkedToBeDeleted { + if controllerutil.ContainsFinalizer(instance, finalizer) { + // Run finalization logic for nginxingresscontrollerFinalizer. If the + // finalization logic fails, don't remove the finalizer so + // that we can retry during the next reconciliation. + if err := r.finalizeNginxIngressController(log, instance); err != nil { + return ctrl.Result{}, err + } + + // Remove nginxingresscontrollerFinalizer. Once all finalizers have been + // removed, the object will be deleted. + controllerutil.RemoveFinalizer(instance, finalizer) + err := r.Update(ctx, instance) + if err != nil { + return ctrl.Result{}, err + } + } + return ctrl.Result{}, nil + } + + // Add finalizer for this CR + if !controllerutil.ContainsFinalizer(instance, finalizer) { + controllerutil.AddFinalizer(instance, finalizer) + err = r.Update(ctx, instance) + if err != nil { + return ctrl.Result{}, err + } + } + + // Namespace could have been deleted in the middle of the reconcile + ns := &v1.Namespace{} + err = r.Get(ctx, types.NamespacedName{Name: instance.Namespace, Namespace: v1.NamespaceAll}, ns) + if (err != nil && errors.IsNotFound(err)) || (ns.Status.Phase == "Terminating") { + log.Info(fmt.Sprintf("The namespace '%v' does not exist or is in Terminating status, canceling Reconciling", instance.Namespace)) + return ctrl.Result{}, nil + } else if err != nil { + log.Error(err, "Failed to check if namespace exists") + return ctrl.Result{}, err + } + + if err := r.createCommonResources(log); err != nil { + return ctrl.Result{}, err + } + + err = r.checkPrerequisites(log, instance) + if err != nil { + return ctrl.Result{}, err + } + if strings.ToLower(instance.Spec.Type) == "deployment" { + found := &appsv1.Deployment{} + dep, err := deploymentForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + err = r.Get(ctx, types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, found) + if err != nil && errors.IsNotFound(err) { + log.Info("Creating a new Deployment for NGINX Ingress Controller", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name) + + err = r.Create(ctx, dep) + if err != nil { + log.Error(err, "Failed to create new Deployment", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name) + return ctrl.Result{}, err + } + } else if err != nil { + log.Error(err, "Failed to get Deployment") + return ctrl.Result{}, err + } else if hasDeploymentChanged(dep, instance) { + log.Info("NginxIngressController spec has changed, updating Deployment") + updated := updateDeployment(found, instance) + err = r.Update(ctx, updated) + if err != nil { + return ctrl.Result{}, err + } + } + + // Remove possible DaemonSet + ds, err := daemonSetForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + if err := r.Delete(ctx, ds); client.IgnoreNotFound(err) != nil { + return ctrl.Result{}, err + } + } else if strings.ToLower(instance.Spec.Type) == "daemonset" { + found := &appsv1.DaemonSet{} + ds, err := daemonSetForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + err = r.Get(ctx, types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, found) + if err != nil && errors.IsNotFound(err) { + log.Info("Creating a new DaemonSet for NGINX Ingress Controller", "DaemonSet.Namespace", ds.Namespace, "DaemonSet.Name", ds.Name) + + err = r.Create(ctx, ds) + if err != nil { + log.Error(err, "Failed to create new DaemonSet", "DaemonSet.Namespace", ds.Namespace, "DaemonSet.Name", ds.Name) + return ctrl.Result{}, err + } + } else if err != nil { + return ctrl.Result{}, err + } else if hasDaemonSetChanged(ds, instance) { + log.Info("NginxIngressController spec has changed, updating DaemonSet") + updated := updateDaemonSet(found, instance) + err = r.Update(ctx, updated) + if err != nil { + return ctrl.Result{}, err + } + } + + // Remove possible Deployment + dep, err := deploymentForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + if err := r.Delete(ctx, dep); client.IgnoreNotFound(err) != nil { + return ctrl.Result{}, err + } + + } + + svc, err := serviceForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + var extraLabels map[string]string + if instance.Spec.Service != nil { + extraLabels = instance.Spec.Service.ExtraLabels + } + res, err := controllerutil.CreateOrUpdate(ctx, r.Client, svc, serviceMutateFn(svc, instance.Spec.ServiceType, extraLabels)) + log.V(1).Info(fmt.Sprintf("Service %s %s", svc.Name, res)) + if err != nil { + return ctrl.Result{}, err + } + + cm, err := configMapForNginxIngressController(instance, r.Scheme) + if err != nil { + return ctrl.Result{}, err + } + res, err = controllerutil.CreateOrUpdate(ctx, r.Client, cm, configMapMutateFn(cm, instance.Spec.ConfigMapData)) + log.V(1).Info(fmt.Sprintf("ConfigMap %s %s", svc.Name, res)) + if err != nil { + return ctrl.Result{}, err + } + + if !instance.Status.Deployed { + instance.Status.Deployed = true + err := r.Status().Update(ctx, instance) + if err != nil { + return ctrl.Result{}, err + } + } + + log.Info("Finish reconcile for NginxIngressController") + + return ctrl.Result{}, nil +} + +// createIfNotExists creates a new object. If the object exists, does nothing. It returns whether the object existed before or not. +func (r *NginxIngressControllerReconciler) createIfNotExists(object client.Object) (error, bool) { + err := r.Create(context.TODO(), object) + if err != nil && errors.IsAlreadyExists(err) { + return nil, true + } + + return err, false +} + +func (r *NginxIngressControllerReconciler) finalizeNginxIngressController(log logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { + crb := clusterRoleBindingForNginxIngressController(clusterRoleName) + + err := r.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) + if err != nil { + return err + } + + var subjects []rbacv1.Subject + for _, s := range crb.Subjects { + if s.Name != instance.Name || s.Namespace != instance.Namespace { + subjects = append(subjects, s) + } + } + + crb.Subjects = subjects + + err = r.Update(context.TODO(), crb) + if err != nil { + return err + } + + if r.SccAPIExists { + scc := sccForNginxIngressController(sccName) + + err := r.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) + if err != nil { + return err + } + + var users []string + for _, u := range scc.Users { + if u != userForSCC(instance.Namespace, instance.Name) { + users = append(users, u) + } + } + + scc.Users = users + + err = r.Update(context.TODO(), scc) + if err != nil { + return err + } + } + + ic := ingressClassForNginxIngressController(instance) + if err := r.Delete(context.TODO(), ic); client.IgnoreNotFound(err) != nil { + return err + } + + log.Info("Successfully finalized NginxIngressController") + return nil +} + +// SetupWithManager sets up the controller with the Manager. +func (r *NginxIngressControllerReconciler) SetupWithManager(mgr ctrl.Manager) error { + return ctrl.NewControllerManagedBy(mgr). + For(&k8sv1alpha1.NginxIngressController{}). + Owns(&appsv1.Deployment{}). + Owns(&appsv1.DaemonSet{}). + Owns(&v1.ServiceAccount{}). + Owns(&v1.Service{}). + Owns(&v1.ConfigMap{}). + Owns(&v1.Secret{}). + Complete(r) +} diff --git a/controllers/prerequisites.go b/controllers/prerequisites.go new file mode 100644 index 00000000..46993088 --- /dev/null +++ b/controllers/prerequisites.go @@ -0,0 +1,192 @@ +package controllers + +import ( + "context" + "fmt" + + "github.com/go-logr/logr" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/version" +) + +// checkPrerequisites creates all necessary objects before the deployment of a new Ingress Controller. +func (r *NginxIngressControllerReconciler) checkPrerequisites(log logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { + sa, err := serviceAccountForNginxIngressController(instance, r.Scheme) + if err != nil { + return err + } + err, existed := r.createIfNotExists(sa) + if err != nil { + return err + } + + if !existed { + log.Info("ServiceAccount created", "ServiceAccount.Namespace", sa.Namespace, "ServiceAccount.Name", sa.Name) + } + + // Assign this new ServiceAccount to the ClusterRoleBinding (if is not present already) + crb := clusterRoleBindingForNginxIngressController(clusterRoleName) + + err = r.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) + if err != nil { + return err + } + + subject := subjectForServiceAccount(sa.Namespace, sa.Name) + found := false + for _, s := range crb.Subjects { + if s.Name == subject.Name && s.Namespace == subject.Namespace { + found = true + break + } + } + + if !found { + crb.Subjects = append(crb.Subjects, subject) + + err = r.Update(context.TODO(), crb) + if err != nil { + return err + } + } + + // IngressClass is available from k8s 1.18+ + minVersion, _ := version.ParseGeneric("v1.18.0") + if RunningK8sVersion.AtLeast(minVersion) { + if instance.Spec.IngressClass == "" { + instance.Spec.IngressClass = "nginx" + log.Info("Warning! IngressClass not set, using default", "IngressClass.Name", instance.Spec.IngressClass) + } + ic := ingressClassForNginxIngressController(instance) + + err, existed = r.createIfNotExists(ic) + if err != nil { + return err + } + + if !existed { + log.Info("IngressClass created", "IngressClass.Name", ic.Name) + } + } + + if instance.Spec.DefaultSecret == "" { + err = r.Get(context.TODO(), types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, &v1.Secret{}) + + if err != nil && errors.IsNotFound(err) { + secret, err := defaultSecretForNginxIngressController(instance, r.Scheme) + if err != nil { + return err + } + + err = r.Create(context.TODO(), secret) + if err != nil { + return err + } + + log.Info("Warning! A custom self-signed TLS Secret has been created for the default server. "+ + "Update your 'DefaultSecret' with your own Secret in Production", + "Secret.Namespace", secret.Namespace, "Secret.Name", secret.Name) + + } else if err != nil { + return err + } + } + + if r.SccAPIExists { + // Assign this new User to the SCC (if is not present already) + scc := sccForNginxIngressController(sccName) + + err = r.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) + if err != nil { + return err + } + + user := userForSCC(sa.Namespace, sa.Name) + found := false + for _, u := range scc.Users { + if u == user { + found = true + break + } + } + + if !found { + scc.Users = append(scc.Users, user) + + err = r.Update(context.TODO(), scc) + if err != nil { + return err + } + } + } + + return nil +} + +// create common resources shared by all the Ingress Controllers +func (r *NginxIngressControllerReconciler) createCommonResources(log logr.Logger) error { + // Create ClusterRole and ClusterRoleBinding for all the NginxIngressController resources. + var err error + + cr := clusterRoleForNginxIngressController(clusterRoleName) + + err = r.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, cr) + + if err != nil { + if errors.IsNotFound(err) { + log.Info("no previous ClusterRole found, creating a new one.") + err = r.Create(context.TODO(), cr) + if err != nil { + return fmt.Errorf("error creating ClusterRole: %v", err) + } + } else { + return fmt.Errorf("error getting ClusterRole: %v", err) + } + } else { + // For updates in the ClusterRole permissions (eg new CRDs of the Ingress Controller). + log.Info("previous ClusterRole found, updating.") + cr := clusterRoleForNginxIngressController(clusterRoleName) + err = r.Update(context.TODO(), cr) + if err != nil { + return fmt.Errorf("error updating ClusterRole: %v", err) + } + } + + crb := clusterRoleBindingForNginxIngressController(clusterRoleName) + + err = r.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) + if err != nil && errors.IsNotFound(err) { + log.Info("no previous ClusterRoleBinding found, creating a new one.") + err = r.Create(context.TODO(), crb) + } + + if err != nil { + return fmt.Errorf("error creating ClusterRoleBinding: %v", err) + } + + err = createKICCustomResourceDefinitions(log, r.Mgr) + if err != nil { + return fmt.Errorf("error creating KIC CRDs: %v", err) + } + + if r.SccAPIExists { + log.Info("OpenShift detected as platform.") + + scc := sccForNginxIngressController(sccName) + + err = r.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) + if err != nil && errors.IsNotFound(err) { + log.Info("no previous SecurityContextConstraints found, creating a new one.") + err = r.Create(context.TODO(), scc) + } + + if err != nil { + return fmt.Errorf("error creating SecurityContextConstraints: %v", err) + } + } + + return nil +} diff --git a/pkg/controller/nginxingresscontroller/rbac.go b/controllers/rbac.go similarity index 94% rename from pkg/controller/nginxingresscontroller/rbac.go rename to controllers/rbac.go index 9a2825d3..629cc033 100644 --- a/pkg/controller/nginxingresscontroller/rbac.go +++ b/controllers/rbac.go @@ -1,4 +1,4 @@ -package nginxingresscontroller +package controllers import ( rbacv1 "k8s.io/api/rbac/v1" @@ -63,24 +63,26 @@ func clusterRoleForNginxIngressController(name string) *rbacv1.ClusterRole { Resources: []string{"aplogconfs", "appolicies", "apusersigs"}, }, } - return &rbacv1.ClusterRole{ + rbac := &rbacv1.ClusterRole{ ObjectMeta: v1.ObjectMeta{ Name: name, }, Rules: rules, } + return rbac } func subjectForServiceAccount(namespace string, name string) rbacv1.Subject { - return rbacv1.Subject{ + sa := rbacv1.Subject{ Kind: "ServiceAccount", Name: name, Namespace: namespace, } + return sa } func clusterRoleBindingForNginxIngressController(name string) *rbacv1.ClusterRoleBinding { - return &rbacv1.ClusterRoleBinding{ + crb := &rbacv1.ClusterRoleBinding{ ObjectMeta: v1.ObjectMeta{ Name: name, }, @@ -90,4 +92,5 @@ func clusterRoleBindingForNginxIngressController(name string) *rbacv1.ClusterRol APIGroup: "rbac.authorization.k8s.io", }, } + return crb } diff --git a/pkg/controller/nginxingresscontroller/rbac_test.go b/controllers/rbac_test.go similarity index 99% rename from pkg/controller/nginxingresscontroller/rbac_test.go rename to controllers/rbac_test.go index 7c51817b..2055448f 100644 --- a/pkg/controller/nginxingresscontroller/rbac_test.go +++ b/controllers/rbac_test.go @@ -1,4 +1,4 @@ -package nginxingresscontroller +package controllers import ( "testing" diff --git a/pkg/controller/nginxingresscontroller/scc.go b/controllers/scc.go similarity index 94% rename from pkg/controller/nginxingresscontroller/scc.go rename to controllers/scc.go index 613c179d..08a5d1bf 100644 --- a/pkg/controller/nginxingresscontroller/scc.go +++ b/controllers/scc.go @@ -1,4 +1,4 @@ -package nginxingresscontroller +package controllers import ( "fmt" @@ -13,7 +13,7 @@ func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints allowPrivilegeEscalation := true - return &secv1.SecurityContextConstraints{ + scc := &secv1.SecurityContextConstraints{ ObjectMeta: v1.ObjectMeta{ Name: name, }, @@ -44,6 +44,7 @@ func sccForNginxIngressController(name string) *secv1.SecurityContextConstraints DefaultAddCapabilities: []corev1.Capability{"NET_BIND_SERVICE"}, AllowedCapabilities: nil, } + return scc } func userForSCC(namespace string, name string) string { diff --git a/pkg/controller/nginxingresscontroller/scc_test.go b/controllers/scc_test.go similarity index 98% rename from pkg/controller/nginxingresscontroller/scc_test.go rename to controllers/scc_test.go index fd68491b..fc74dbaa 100644 --- a/pkg/controller/nginxingresscontroller/scc_test.go +++ b/controllers/scc_test.go @@ -1,4 +1,4 @@ -package nginxingresscontroller +package controllers import ( "fmt" diff --git a/pkg/controller/nginxingresscontroller/secret.go b/controllers/secret.go similarity index 85% rename from pkg/controller/nginxingresscontroller/secret.go rename to controllers/secret.go index a820176a..4d488158 100644 --- a/pkg/controller/nginxingresscontroller/secret.go +++ b/controllers/secret.go @@ -1,4 +1,4 @@ -package nginxingresscontroller +package controllers import ( "crypto/rand" @@ -10,16 +10,17 @@ import ( "math/big" "time" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" ) const sslHost = "example.com" -func defaultSecretForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) (*corev1.Secret, error) { +func defaultSecretForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*corev1.Secret, error) { crt, key, err := generateFakeCertAndKey() - if err != nil { return nil, err } @@ -35,7 +36,10 @@ func defaultSecretForNginxIngressController(instance *k8sv1alpha1.NginxIngressCo }, Type: corev1.SecretTypeTLS, } - + err = ctrl.SetControllerReference(instance, secret, scheme) + if err != nil { + return nil, err + } return secret, nil } @@ -53,7 +57,6 @@ func generateFakeCertAndKey() ([]byte, []byte, error) { serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128) serialNumber, err := rand.Int(rand.Reader, serialNumberLimit) - if err != nil { return nil, nil, err } diff --git a/pkg/controller/nginxingresscontroller/secret_test.go b/controllers/secret_test.go similarity index 79% rename from pkg/controller/nginxingresscontroller/secret_test.go rename to controllers/secret_test.go index 66076466..9d1c61a9 100644 --- a/pkg/controller/nginxingresscontroller/secret_test.go +++ b/controllers/secret_test.go @@ -1,15 +1,21 @@ -package nginxingresscontroller +package controllers import ( "reflect" "testing" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/scheme" ) func TestDefaultSecretForNginxIngressController(t *testing.T) { + s := scheme.Scheme + + if err := k8sv1alpha1.AddToScheme(s); err != nil { + t.Fatalf("Unable to add k8sv1alpha1 scheme: (%v)", err) + } instance := &k8sv1alpha1.NginxIngressController{ ObjectMeta: metav1.ObjectMeta{ Name: "my-nginx-ingress-controller", @@ -23,7 +29,7 @@ func TestDefaultSecretForNginxIngressController(t *testing.T) { } expectedType := corev1.SecretTypeTLS - secret, err := defaultSecretForNginxIngressController(instance) + secret, err := defaultSecretForNginxIngressController(instance, s) if err != nil { t.Fatalf("defaultSecretForNginxIngressController() returned unexpected error %v", err) } diff --git a/pkg/controller/nginxingresscontroller/service.go b/controllers/service.go similarity index 53% rename from pkg/controller/nginxingresscontroller/service.go rename to controllers/service.go index e003f902..0be4bc75 100644 --- a/pkg/controller/nginxingresscontroller/service.go +++ b/controllers/service.go @@ -1,21 +1,22 @@ -package nginxingresscontroller +package controllers import ( - "reflect" - - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/intstr" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) -func serviceForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *corev1.Service { +func serviceForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*corev1.Service, error) { extraLabels := map[string]string{} if instance.Spec.Service != nil { extraLabels = instance.Spec.Service.ExtraLabels } - return &corev1.Service{ + svc := &corev1.Service{ ObjectMeta: v1.ObjectMeta{ Name: instance.Name, Namespace: instance.Namespace, @@ -46,24 +47,18 @@ func serviceForNginxIngressController(instance *k8sv1alpha1.NginxIngressControll Type: corev1.ServiceType(instance.Spec.ServiceType), }, } -} -func hasServiceChanged(svc *corev1.Service, instance *k8sv1alpha1.NginxIngressController) bool { - if svc.Spec.Type != corev1.ServiceType(instance.Spec.ServiceType) { - return true - } - if instance.Spec.Service != nil && !reflect.DeepEqual(svc.Labels, instance.Spec.Service.ExtraLabels) { - return true + if err := ctrl.SetControllerReference(instance, svc, scheme); err != nil { + return nil, err } - return svc.Labels != nil && instance.Spec.Service == nil + + return svc, nil } -func updateService(svc *corev1.Service, instance *k8sv1alpha1.NginxIngressController) *corev1.Service { - svc.Spec.Type = corev1.ServiceType(instance.Spec.ServiceType) - if instance.Spec.Service != nil { - svc.Labels = instance.Spec.Service.ExtraLabels - } else { - svc.Labels = nil +func serviceMutateFn(svc *corev1.Service, serviceType string, labels map[string]string) controllerutil.MutateFn { + return func() error { + svc.Spec.Type = corev1.ServiceType(serviceType) + svc.Labels = labels + return nil } - return svc } diff --git a/controllers/service_test.go b/controllers/service_test.go new file mode 100644 index 00000000..74f0c9c9 --- /dev/null +++ b/controllers/service_test.go @@ -0,0 +1,83 @@ +package controllers + +import ( + "testing" + + "github.com/google/go-cmp/cmp" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + corev1 "k8s.io/api/core/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + "k8s.io/client-go/kubernetes/scheme" +) + +func TestServiceForNginxIngressController(t *testing.T) { + boolPointer := func(b bool) *bool { return &b } + s := scheme.Scheme + + if err := k8sv1alpha1.AddToScheme(s); err != nil { + t.Fatalf("Unable to add k8sv1alpha1 scheme: (%v)", err) + } + name := "my-service" + namespace := "my-nginx-ingress" + extraLabels := map[string]string{"app": "my-nginx-ingress"} + + instance := &k8sv1alpha1.NginxIngressController{ + ObjectMeta: v1.ObjectMeta{ + Name: name, + Namespace: namespace, + Labels: extraLabels, + }, + Spec: k8sv1alpha1.NginxIngressControllerSpec{ + ServiceType: string(corev1.ServiceTypeLoadBalancer), + Service: &k8sv1alpha1.Service{ + ExtraLabels: extraLabels, + }, + }, + } + expected := &corev1.Service{ + ObjectMeta: v1.ObjectMeta{ + Name: name, + Namespace: namespace, + Labels: extraLabels, + OwnerReferences: []v1.OwnerReference{ + { + APIVersion: "k8s.nginx.org/v1alpha1", + Name: instance.Name, + Kind: "NginxIngressController", + Controller: boolPointer(true), + BlockOwnerDeletion: boolPointer(true), + }, + }, + }, + Spec: corev1.ServiceSpec{ + Ports: []corev1.ServicePort{ + { + Name: "http", + Protocol: "TCP", + Port: 80, + TargetPort: intstr.IntOrString{ + Type: 0, + IntVal: 80, + }, + }, + { + Name: "https", + Protocol: "TCP", + Port: 443, + TargetPort: intstr.IntOrString{ + Type: 0, + IntVal: 443, + }, + }, + }, + Selector: map[string]string{"app": instance.Name}, + Type: corev1.ServiceTypeLoadBalancer, + }, + } + + result, _ := serviceForNginxIngressController(instance, s) + if diff := cmp.Diff(expected, result); diff != "" { + t.Errorf("serviceForNginxIngressController() mismatch (-want +got):\n%s", diff) + } +} diff --git a/controllers/serviceaccount.go b/controllers/serviceaccount.go new file mode 100644 index 00000000..24a6a1ac --- /dev/null +++ b/controllers/serviceaccount.go @@ -0,0 +1,24 @@ +package controllers + +import ( + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + corev1 "k8s.io/api/core/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/runtime" + ctrl "sigs.k8s.io/controller-runtime" +) + +func serviceAccountForNginxIngressController(instance *k8sv1alpha1.NginxIngressController, scheme *runtime.Scheme) (*corev1.ServiceAccount, error) { + svca := &corev1.ServiceAccount{ + ObjectMeta: v1.ObjectMeta{ + Name: instance.Name, + Namespace: instance.Namespace, + }, + } + + if err := ctrl.SetControllerReference(instance, svca, scheme); err != nil { + return nil, err + } + + return svca, nil +} diff --git a/controllers/serviceaccount_test.go b/controllers/serviceaccount_test.go new file mode 100644 index 00000000..f5234330 --- /dev/null +++ b/controllers/serviceaccount_test.go @@ -0,0 +1,48 @@ +package controllers + +import ( + "testing" + + "github.com/google/go-cmp/cmp" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + corev1 "k8s.io/api/core/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/kubernetes/scheme" +) + +func TestServiceAccountForNginxIngressController(t *testing.T) { + boolPointer := func(b bool) *bool { return &b } + s := scheme.Scheme + + if err := k8sv1alpha1.AddToScheme(s); err != nil { + t.Fatalf("Unable to add k8sv1alpha1 scheme: (%v)", err) + } + namespace := "my-nginx-ingress" + name := "my-sa" + instance := &k8sv1alpha1.NginxIngressController{ + ObjectMeta: v1.ObjectMeta{ + Name: name, + Namespace: namespace, + }, + } + expected := &corev1.ServiceAccount{ + ObjectMeta: v1.ObjectMeta{ + Name: name, + Namespace: namespace, + OwnerReferences: []v1.OwnerReference{ + { + APIVersion: "k8s.nginx.org/v1alpha1", + Name: instance.Name, + Kind: "NginxIngressController", + Controller: boolPointer(true), + BlockOwnerDeletion: boolPointer(true), + }, + }, + }, + } + + result, _ := serviceAccountForNginxIngressController(instance, s) + if diff := cmp.Diff(expected, result); diff != "" { + t.Errorf("serviceAccountForNginxIngressController() mismatch (-want +got):\n%s", diff) + } +} diff --git a/controllers/suite_test.go b/controllers/suite_test.go new file mode 100644 index 00000000..00647f83 --- /dev/null +++ b/controllers/suite_test.go @@ -0,0 +1,81 @@ +/* +Copyright 2021. + +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. +*/ + +package controllers + +import ( + "path/filepath" + "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + "k8s.io/client-go/kubernetes/scheme" + "k8s.io/client-go/rest" + "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" + + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + //+kubebuilder:scaffold:imports +) + +// These tests use Ginkgo (BDD-style Go testing framework). Refer to +// http://onsi.github.io/ginkgo/ to learn more about Ginkgo. + +var ( + cfg *rest.Config + k8sClient client.Client + testEnv *envtest.Environment +) + +func TestAPIs(t *testing.T) { + RegisterFailHandler(Fail) + + RunSpecsWithDefaultAndCustomReporters(t, + "Controller Suite", + []Reporter{printer.NewlineReporter{}}) +} + +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")}, + ErrorIfCRDPathMissing: true, + } + + cfg, err := testEnv.Start() + Expect(err).NotTo(HaveOccurred()) + Expect(cfg).NotTo(BeNil()) + + err = k8sv1alpha1.AddToScheme(scheme.Scheme) + Expect(err).NotTo(HaveOccurred()) + + //+kubebuilder:scaffold:scheme + + k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) + Expect(err).NotTo(HaveOccurred()) + Expect(k8sClient).NotTo(BeNil()) +}, 60) + +var _ = AfterSuite(func() { + By("tearing down the test environment") + err := testEnv.Stop() + Expect(err).NotTo(HaveOccurred()) +}) diff --git a/pkg/controller/nginxingresscontroller/utils.go b/controllers/utils.go similarity index 98% rename from pkg/controller/nginxingresscontroller/utils.go rename to controllers/utils.go index 4c7eb982..fdf91a17 100644 --- a/pkg/controller/nginxingresscontroller/utils.go +++ b/controllers/utils.go @@ -1,11 +1,11 @@ -package nginxingresscontroller +package controllers import ( "fmt" "reflect" "strings" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" secv1 "github.com/openshift/api/security/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/controller/nginxingresscontroller/utils_test.go b/controllers/utils_test.go similarity index 98% rename from pkg/controller/nginxingresscontroller/utils_test.go rename to controllers/utils_test.go index fa5f153f..f7977179 100644 --- a/pkg/controller/nginxingresscontroller/utils_test.go +++ b/controllers/utils_test.go @@ -1,11 +1,11 @@ -package nginxingresscontroller +package controllers import ( "fmt" "testing" "github.com/google/go-cmp/cmp" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -345,8 +345,9 @@ func TestHasDifferentArguments(t *testing.T) { }, { container: corev1.Container{ - Args: []string{fmt.Sprintf( - "-nginx-configmaps=%v/%v", namespace, name), + Args: []string{ + fmt.Sprintf( + "-nginx-configmaps=%v/%v", namespace, name), "-default-server-tls-secret=default/mysecret", "-nginx-plus", "-leader-election-lock-name=my-nginx-ingress-lock", diff --git a/deploy/crds/k8s.nginx.org_nginxingresscontrollers_crd.yaml b/deploy/crds/k8s.nginx.org_nginxingresscontrollers_crd.yaml deleted file mode 100644 index 651d0d73..00000000 --- a/deploy/crds/k8s.nginx.org_nginxingresscontrollers_crd.yaml +++ /dev/null @@ -1,291 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - name: nginxingresscontrollers.k8s.nginx.org -spec: - group: k8s.nginx.org - names: - kind: NginxIngressController - listKind: NginxIngressControllerList - plural: nginxingresscontrollers - singular: nginxingresscontroller - scope: Namespaced - subresources: - status: {} - validation: - openAPIV3Schema: - description: NginxIngressController is the Schema for the nginxingresscontrollers - 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: NginxIngressControllerSpec defines the desired state of NginxIngressController - properties: - appProtect: - description: App Protect support configuration. Requires enableCRDs - set to true. - nullable: true - properties: - enable: - description: Enable App Protect. - type: boolean - required: - - enable - type: object - configMapData: - additionalProperties: - type: string - description: Initial values of the Ingress Controller ConfigMap. Check - https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - nullable: true - type: object - defaultSecret: - description: The TLS Secret for TLS termination of the default server. - The format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret - with a self-signed certificate and key. - type: string - enableCRDs: - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - nullable: true - type: boolean - enableLatencyMetrics: - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is - received by NGINX. **Note** The metric for the upstream isn't available - until traffic is sent to the upstream. - nullable: true - type: boolean - enableLeaderElection: - description: Enables Leader election to avoid multiple replicas of the - controller reporting the status of Ingress resources – only one replica - will report status. Default is true. - nullable: true - type: boolean - enablePreviewPolicies: - description: Enables preview policies. Requires enableCRDs set to true. - type: boolean - enableSnippets: - description: Enable custom NGINX configuration snippets in VirtualServer, - VirtualServerRoute and TransportServer resources. Requires enableCRDs - set to true. - type: boolean - enableTLSPassthrough: - description: Enable TLS Passthrough on port 443. Requires enableCRDs - set to true. - type: boolean - globalConfiguration: - description: The GlobalConfiguration resource for global configuration - of the Ingress Controller. Format is namespace/name. Requires enableCRDs - set to true. - type: string - healthStatus: - description: Adds a new location to the default server. The location - responds with the 200 status code for any request. Useful for external - health-checking of the Ingress controller. - nullable: true - properties: - enable: - description: Enable the HealthStatus. - type: boolean - uri: - description: URI of the location. Default is `/nginx-health`. - type: string - required: - - enable - type: object - image: - description: The image of the Ingress Controller. - properties: - pullPolicy: - description: The ImagePullPolicy of the image. - enum: - - Never - - Always - - IfNotPresent - type: string - repository: - description: The repository of the image. - type: string - tag: - description: The tag (version) of the image. - type: string - required: - - pullPolicy - - repository - - tag - type: object - ingressClass: - description: A class of the Ingress controller. The Ingress controller - only processes Ingress resources that belong to its class (in other - words, have the annotation “kubernetes.io/ingress.class”). Additionally, - the Ingress controller processes Ingress resources that do not have - that annotation, which can be disabled by setting UseIngressClassOnly - to true. Default is `nginx`. - type: string - logLevel: - description: Log level for V logs. Format is 0 - 3 - maximum: 3 - minimum: 0 - type: integer - nginxDebug: - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. - Requires ‘error-log-level: debug’ in the ConfigMapData.' - type: boolean - nginxPlus: - description: Deploys the Ingress Controller for NGINX Plus. The default - is false meaning the Ingress Controller will be deployed for NGINX - OSS. - type: boolean - nginxReloadTimeout: - description: Timeout in milliseconds which the Ingress Controller will - wait for a successful NGINX reload after a change or at the initial - start. - type: integer - nginxStatus: - description: NGINX stub_status, or the NGINX Plus API. - nullable: true - properties: - allowCidrs: - description: Whitelist IPv4 IP/CIDR blocks to allow access to NGINX - stub_status or the NGINX Plus API. Separate multiple IP/CIDR by - commas. (default “127.0.0.1”) - type: string - enable: - description: Enable the NginxStatus. - type: boolean - port: - description: Set the port where the NGINX stub_status or the NGINX - Plus API is exposed. Default is 8080. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - prometheus: - description: NGINX or NGINX Plus metrics in the Prometheus format. - nullable: true - properties: - enable: - description: Enable Prometheus metrics. - type: boolean - port: - description: Sets the port where the Prometheus metrics are exposed. - Default is 9113. Format is 1023 - 65535 - maximum: 65535 - minimum: 1023 - nullable: true - type: integer - required: - - enable - type: object - replicas: - description: The number of replicas of the Ingress Controller pod. The - default is 1. Only applies if the type is set to deployment. - format: int32 - nullable: true - type: integer - reportIngressStatus: - description: Update the address field in the status of Ingresses resources. - nullable: true - properties: - enable: - description: Enable the ReportIngressStatus. - type: boolean - externalService: - description: 'Specifies the name of the service with the type LoadBalancer - through which the Ingress controller pods are exposed externally. - The external address of the service is used when reporting the - status of Ingress resources. Note: if serviceType is LoadBalancer, - the value of this field will be ignored, and the operator will - use the name of the created LoadBalancer service instead.' - type: string - ingressLink: - description: 'Specifies the name of the IngressLink resource, which - exposes the Ingress Controller pods via a BIG-IP system. The IP - of the BIG-IP system is used when reporting the status of Ingress, - VirtualServer and VirtualServerRoute resources. Requires reportIngressStatus.enable - set to true. Note: If serviceType is LoadBalancer or reportIngressStatus.externalService - is set, the value of this field will be ignored.' - type: string - required: - - enable - type: object - service: - description: The service of the Ingress controller. - nullable: true - properties: - extraLabels: - additionalProperties: - type: string - description: Specifies extra labels of the service. - type: object - type: object - serviceType: - description: 'The type of the Service for the Ingress Controller. Valid - Service types are: NodePort and LoadBalancer.' - enum: - - NodePort - - LoadBalancer - type: string - type: - description: The type of the Ingress Controller installation - deployment - or daemonset. - enum: - - deployment - - daemonset - type: string - useIngressClassOnly: - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - type: boolean - watchNamespace: - description: Namespace to watch for Ingress resources. By default the - Ingress controller watches all namespaces. - type: string - wildcardTLS: - description: A Secret with a TLS certificate and key for TLS termination - of every Ingress host for which TLS termination is enabled but the - Secret is not specified. The secret must be of the type kubernetes.io/tls. - If the argument is not set, for such Ingress hosts NGINX will break - any attempt to establish a TLS connection. If the argument is set, - but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - type: string - required: - - image - - serviceType - - type - type: object - status: - description: NginxIngressControllerStatus defines the observed state of - NginxIngressController - properties: - deployed: - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - type: boolean - required: - - deployed - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 - served: true - storage: true diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.1/nginx-ingress-operator.v0.0.1.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.1/nginx-ingress-operator.v0.0.1.clusterserviceversion.yaml deleted file mode 100644 index 754f5394..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.1/nginx-ingress-operator.v0.0.1.clusterserviceversion.yaml +++ /dev/null @@ -1,325 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": "nginx/nginx-ingress", "tag": "edge-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - support: NGINX - createdAt: 2020-03-03T12:59:59Z - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.1 - certified: "true" - repository: "https://github.com/nginxinc/nginx-ingress-operator" - name: nginx-ingress-operator.v0.0.1 - namespace: placeholder -spec: - links: - - name: "Documentation for NGINX Plus" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min" - - name: "Documentation for NGINX Open Source" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min" - - name: "Documentation for NginxIngressController CR" - url: "https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md" - maintainers: - - name: NGINX Inc - email: "kubernetes@nginx.com" - apiservicedefinitions: {} - icon: - - mediatype: "image/svg+xml" - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - displayName: NginxIngressController - subresources: - status: {} - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - maintaners: - - email: kubernetes@nginx.com - name: NGINX Inc - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.1 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: true - type: AllNamespaces - maturity: alpha - provider: - name: NGINX Inc - version: 0.0.1 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.2/nginx-ingress-operator.v0.0.2.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.2/nginx-ingress-operator.v0.0.2.clusterserviceversion.yaml deleted file mode 100644 index 96e12c0a..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.2/nginx-ingress-operator.v0.0.2.clusterserviceversion.yaml +++ /dev/null @@ -1,331 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": "registry.hub.docker.com/nginx/nginx-ingress", "tag": "edge-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - support: NGINX - createdAt: 2020-03-03T12:59:59Z - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.2 - certified: "true" - repository: "https://github.com/nginxinc/nginx-ingress-operator" - name: nginx-ingress-operator.v0.0.2 - namespace: placeholder -spec: - links: - - name: "Documentation for NGINX Plus" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min" - - name: "Documentation for NGINX Open Source" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min" - - name: "Documentation for NginxIngressController CR" - url: "https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md" - maintainers: - - name: NGINX Inc - email: "kubernetes@nginx.com" - apiservicedefinitions: {} - icon: - - mediatype: "image/svg+xml" - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - displayName: NginxIngressController - subresources: - status: {} - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.2 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: false - type: AllNamespaces - maturity: alpha - provider: - name: NGINX Inc - version: 0.0.2 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.3/nginx-ingress-operator.v0.0.3.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.3/nginx-ingress-operator.v0.0.3.clusterserviceversion.yaml deleted file mode 100644 index 467f8a41..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.3/nginx-ingress-operator.v0.0.3.clusterserviceversion.yaml +++ /dev/null @@ -1,330 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": "registry.hub.docker.com/nginx/nginx-ingress", "tag": "1.6.3-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - support: NGINX - createdAt: 2020-03-03T12:59:59Z - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.3 - certified: "true" - repository: "https://github.com/nginxinc/nginx-ingress-operator" - name: nginx-ingress-operator.v0.0.3 - namespace: placeholder -spec: - links: - - name: "Documentation for NGINX Plus" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min" - - name: "Documentation for NGINX Open Source" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min" - - name: "Documentation for NginxIngressController CR" - url: "https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md" - maintainers: - - name: NGINX Inc - email: "kubernetes@nginx.com" - icon: - - mediatype: "image/svg+xml" - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - displayName: Nginx Ingress Operator - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.3 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.2 - version: 0.0.3 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml deleted file mode 100644 index 9824ca50..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.4/nginx-ingress-operator.v0.0.4.clusterserviceversion.yaml +++ /dev/null @@ -1,330 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.6.3-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - support: NGINX - createdAt: 2020-03-03T12:59:59Z - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - certified: "true" - repository: "https://github.com/nginxinc/nginx-ingress-operator" - name: nginx-ingress-operator.v0.0.4 - namespace: placeholder -spec: - links: - - name: "Documentation for NGINX Plus" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min" - - name: "Documentation for NGINX Open Source" - url: "https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min" - - name: "Documentation for NginxIngressController CR" - url: "https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md" - maintainers: - - name: NGINX Inc - email: "kubernetes@nginx.com" - icon: - - mediatype: "image/svg+xml" - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - displayName: Nginx Ingress Operator - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.4 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.3 - version: 0.0.4 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml deleted file mode 100644 index e053271d..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.6/nginx-ingress-operator.v0.0.6.clusterserviceversion.yaml +++ /dev/null @@ -1,346 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.8.0-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.6 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - extensions - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - extensions - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.6 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.4 - version: 0.0.6 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml deleted file mode 100644 index 20c3ee84..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.0.7/nginx-ingress-operator.v0.0.7.clusterserviceversion.yaml +++ /dev/null @@ -1,383 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "enableCRDs": true, "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.9.1-ubi" }, "nginxPlus": false, "replicas": 1, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - createdAt: "2020-03-03T12:59:59Z" - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.0.7 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: - NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: - App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: - Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: - The TLS Secret for TLS termination of the default server. The - format is namespace/name. If not specified, the operator will generate and - deploy a TLS Secret with a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: - Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). - displayName: Enable CRDs - path: enableCRDs - - description: - Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: - Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: - Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: - Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: - The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: - Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: - A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: - "Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData." - displayName: Nginx Debug - path: nginxDebug - - description: - Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: - Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: - The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: - "The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer." - displayName: Service Type - path: serviceType - - description: - The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: - Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: - Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: - A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. If the argument is not set, for such Ingress hosts NGINX - will break any attempt to establish a TLS connection. If the argument is - set, but the Ingress controller is not able to fetch the Secret from Kubernetes - API, the Ingress Controller will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: - Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: - The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - "*" - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.0.7 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/master/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/blob/master/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.6 - version: 0.0.7 diff --git a/deploy/olm-catalog/nginx-ingress-operator/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml b/deploy/olm-catalog/nginx-ingress-operator/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml deleted file mode 100644 index 9b6fb079..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/0.1.0/nginx-ingress-operator.v0.1.0.clusterserviceversion.yaml +++ /dev/null @@ -1,374 +0,0 @@ -apiVersion: operators.coreos.com/v1alpha1 -kind: ClusterServiceVersion -metadata: - annotations: - alm-examples: >- - [{ "apiVersion": "k8s.nginx.org/v1alpha1", "kind": "NginxIngressController", "metadata": { "name": "my-nginx-ingress-controller", "namespace": "my-nginx-ingress" }, "spec": { "ingressClass": "nginx", "image": { "pullPolicy": "Always", "repository": "docker.io/nginx/nginx-ingress", "tag": "1.10.0-ubi" }, "nginxPlus": false, "serviceType": "NodePort", "type": "deployment" } }] - capabilities: Basic Install - categories: Networking - certified: "true" - containerImage: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - createdAt: "2020-03-03T12:59:59Z" - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - repository: https://github.com/nginxinc/nginx-ingress-operator - support: NGINX - name: nginx-ingress-operator.v0.1.0 - namespace: placeholder -spec: - apiservicedefinitions: {} - customresourcedefinitions: - owned: - - description: NginxIngressController is the Schema for the nginxingresscontrollers - API - kind: NginxIngressController - name: nginxingresscontrollers.k8s.nginx.org - displayName: NginxIngressController - resources: - - kind: Deployment - name: A Kubernetes Deployment - version: v1 - - kind: ReplicaSet - name: A Kubernetes ReplicaSet - version: v1beta2 - - kind: Pod - name: A Kubernetes Pod - version: v1 - specDescriptors: - - description: App Protect support configuration. Requires enableCRDs set to - true. - displayName: App Protect - path: appProtect - - description: Initial values of the Ingress Controller ConfigMap. Check https://docs.nginx.com/nginx-ingress-controller/configuration/global-configuration/configmap-resource/ - for more information about possible values. - displayName: Config Map Data - path: configMapData - - description: The TLS Secret for TLS termination of the default server. The - format is namespace/name. The secret must be of the type kubernetes.io/tls. - If not specified, the operator will generate and deploy a TLS Secret with - a self-signed certificate and key. - displayName: Default Secret - path: defaultSecret - - description: Enables the use of NGINX Ingress Resource Definitions (VirtualServer - and VirtualServerRoute). Default is true. - displayName: Enable CRDs - path: enableCRDs - - description: Bucketed response times from when NGINX establishes a connection - to an upstream server to when the last byte of the response body is received - by NGINX. **Note** The metric for the upstream isn't available until traffic - is sent to the upstream. - displayName: Enable Latency Metrics - path: enableLatencyMetrics - - description: Enables Leader election to avoid multiple replicas of the controller - reporting the status of Ingress resources – only one replica will report - status. - displayName: Enable Leader Election - path: enableLeaderElection - - description: Enables preview policies. Requires enableCRDs set to true. - displayName: Enable Preview Policies - path: enablePreviewPolicies - - description: Enable custom NGINX configuration snippets in VirtualServer and - VirtualServerRoute resources. Requires enableCRDs set to true. - displayName: Enable Snippets - path: enableSnippets - - description: Enable TLS Passthrough on port 443. Requires enableCRDs set to - true. - displayName: Enable TLSPassthrough - path: enableTLSPassthrough - - description: The GlobalConfiguration resource for global configuration of - the Ingress Controller. Format is namespace/name. Requires enableCRDs set - to true. - displayName: Global Configuration - path: globalConfiguration - - description: Adds a new location to the default server. The location responds - with the 200 status code for any request. Useful for external health-checking - of the Ingress controller. - displayName: Health Status - path: healthStatus - - description: The image of the Ingress Controller. - displayName: Image - path: image - - description: A class of the Ingress controller. The Ingress controller only - processes Ingress resources that belong to its class (in other words, have - the annotation “kubernetes.io/ingress.class”). Additionally, the Ingress - controller processes Ingress resources that do not have that annotation, - which can be disabled by setting UseIngressClassOnly to true. Default is - `nginx`. - displayName: Ingress Class - path: ingressClass - - description: Log level for V logs. Format is 0 - 3 - displayName: Log Level - path: logLevel - - description: 'Enable debugging for NGINX. Uses the nginx-debug binary. Requires - ‘error-log-level: debug’ in the ConfigMapData.' - displayName: Nginx Debug - path: nginxDebug - - description: Deploys the Ingress Controller for NGINX Plus. The default is - false meaning the Ingress Controller will be deployed for NGINX OSS. - displayName: Nginx Plus - path: nginxPlus - - description: Timeout in milliseconds which the Ingress Controller will wait - for a successful NGINX reload after a change or at the initial start. - displayName: Nginx Reload Timeout - path: nginxReloadTimeout - - description: NGINX stub_status, or the NGINX Plus API. - displayName: Nginx Status - path: nginxStatus - - description: NGINX or NGINX Plus metrics in the Prometheus format. - displayName: Prometheus - path: prometheus - - description: The number of replicas of the Ingress Controller pod. The default - is 1. Only applies if the type is set to deployment. - displayName: Replicas - path: replicas - - description: Update the address field in the status of Ingresses resources. - displayName: Report Ingress Status - path: reportIngressStatus - - description: 'Specifies the name of the IngressLink resource, which exposes - the Ingress Controller pods via a BIG-IP system. The IP of the BIG-IP system - is used when reporting the status of Ingress, VirtualServer and VirtualServerRoute - resources. Requires reportIngressStatus.enable set to true. Note: Only if - serviceType is NodePort and reportIngressStatus.externalService is not set.' - displayName: Ingress Link - path: reportIngressStatus.ingressLink - - description: The service of the Ingress controller. - displayName: Service - path: service - - description: 'The type of the Service for the Ingress Controller. Valid Service - types are: NodePort and LoadBalancer.' - displayName: Service Type - path: serviceType - - description: The type of the Ingress Controller installation - deployment - or daemonset. - displayName: Type - path: type - - description: Ignore Ingress resources without the “kubernetes.io/ingress.class” - annotation. - displayName: Use Ingress Class Only - path: useIngressClassOnly - - description: Namespace to watch for Ingress resources. By default the Ingress - controller watches all namespaces. - displayName: Watch Namespace - path: watchNamespace - - description: A Secret with a TLS certificate and key for TLS termination of - every Ingress host for which TLS termination is enabled but the Secret is - not specified. The secret must be of the type kubernetes.io/tls. If the - argument is not set, for such Ingress hosts NGINX will break any attempt - to establish a TLS connection. If the argument is set, but the Ingress controller - is not able to fetch the Secret from Kubernetes API, the Ingress Controller - will fail to start. Format is namespace/name. - displayName: Wildcard TLS - path: wildcardTLS - statusDescriptors: - - description: Deployed is true if the Operator has finished the deployment - of the NginxIngressController. - displayName: Deployed - path: deployed - version: v1alpha1 - description: The NGINX Ingress Operator is a Kubernetes/OpenShift component which - deploys and manages one or more NGINX/NGINX Plus Ingress Controllers - displayName: Nginx Ingress Operator - icon: - - base64data: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2My4zNiA3My40NCI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiMwMDk2Mzk7fS5jbHMtMntmaWxsOiNmZmY7fS5jbHMtM3tmaWxsOiM5OTk7fTwvc3R5bGU+PC9kZWZzPjx0aXRsZT5OR0lOWC1oZXgtc291cmNlLVJHQi0wMjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNLjUwMjcyLDU0LjcyMWEzLjYzNywzLjYzNywwLDAsMCwxLjM2NjQxLDEuMzU1OTNMMjkuODIxOTIsNzIuMjE1NDlsLjAwMDg3LS4wMDA4N2EzLjY2NzkzLDMuNjY3OTMsMCwwLDAsMy43MTUyOSwwTDYxLjQ5MTc1LDU2LjA3NjA2YTMuNjY1NjgsMy42NjU2OCwwLDAsMCwxLjg1Njc3LTMuMjE2MTlWMjAuNTgyNzVsLS4wMDA4Ny0uMDAwODdBMy42NjY4NSwzLjY2Njg1LDAsMCwwLDYxLjQ5LDE3LjM2NDgxTDMzLjUzNjM0LDEuMjI2MjVWMS4yMjUzOGEzLjY2MzEzLDMuNjYzMTMsMCwwLDAtMy43MTI2OCwwdi4wMDA4N0wxLjg3MDg3LDE3LjM2NDgxQTMuNjY1MywzLjY2NTMsMCwwLDAsLjAxMjM1LDIwLjU4MTg4bC0uMDAwODcuMDAwODdWNTIuODU5ODdBMy42NDQyNiwzLjY0NDI2LDAsMCwwLC41MDE4NSw1NC43MjEiLz48cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0yMi43MzAxNSw0OS4wMDhhMy41OTQ4OCwzLjU5NDg4LDAsMCwxLTcuMTg5NzYsMGwuMDAwODguMDAwODguMDAzNDktMjQuNjc3MjdjMC0xLjkxMTc0LDEuNjg5MjQtMy40OTI3OSw0LjA4MTc1LTMuNDkyNzlhNi4zOTI4Miw2LjM5MjgyLDAsMCwxLDQuOTAwMjEsMi4xOTFMMjUuNjEzLDI0LjMyOTg5LDQwLjYzMTI0LDQyLjMwMjUzVjI0LjQzMkg0MC42Mjk1YTMuNTk0ODgsMy41OTQ4OCwwLDAsMSw3LjE4OTc1LDBoLS4wMDA4N2wtLjAwMzQ5LDI0LjY3NTUyYzAsMS45MTE3NS0xLjY5MDExLDMuNDkyNzktNC4wODE3NSwzLjQ5Mjc5YTYuMzg4NTcsNi4zODg1NywwLDAsMS00LjkwMDIxLTIuMTkxTDIyLjcyODQsMzEuMTM2NTlWNDkuMDA4OVoiLz48cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik01OS45NzQ3OCw2Ni4wMzQxaC40NTkzNFY2NS4wMTFoLjM2MzM1YTEuMDM2NzQsMS4wMzY3NCwwLDAsMSwuNTEwMzcuMDg1MjIuNjM5MTcuNjM5MTcsMCwwLDEsLjI0MjU1LjU5NTEzdi4yMDk3NmwuMDEwMjkuMDc4MmEuMTU3ODEuMTU3ODEsMCwwLDEsLjAwNy4wMzI3OGMuMDAyMzQuMDEyNjQuMDAzMjguMDE2MzguMDEwMy4wMjJoLjQyNTYzbC0uMDE1NDYtLjAyOWEuMjk4NjMuMjk4NjMsMCwwLDEtLjAyMDYtLjEzM2MtLjAwNjA5LS4wNzM1MS0uMDA2MDktLjEzNjI1LS4wMDYwOS0uMTk0MzF2LS4xOTM4NWEuNzQxOTQuNzQxOTQsMCwwLDAtLjE0MjM0LS40MDU0OS42NjEyOS42NjEyOSwwLDAsMC0uNDUzMjUtLjI1NDcyLDEuMTE4ODQsMS4xMTg4NCwwLDAsMCwuMzc3ODctLjEyMjY4LjU2NjczLjU2NjczLDAsMCwwLC4yNTM3OC0uNTE1MDUuNjQwMDguNjQwMDgsMCwwLDAtLjQwMTc0LS42NjA2OCwxLjk5OTA2LDEuOTk5MDYsMCwwLDAtLjcxMjE5LS4wOTMxOGgtLjkwODg0Wm0xLjMwNjM3LTEuNDAyODJhMS4xODgyLDEuMTg4MiwwLDAsMS0uNDM2ODYuMDU4MDZoLS40MTAxN1Y2My43NDIxaC4zOTE0NGExLjE1NTUsMS4xNTU1LDAsMCwxLC41NTIuMTAxNjEuMzk0MTMuMzk0MTMsMCwwLDEsLjE3Mjc4LjM3OTc0LjQwMDg3LjQwMDg3LDAsMCwxLS4yNjkyNC40MDc4M20xLjMzNC0xLjU2MzlhMi4zMDc5MiwyLjMwNzkyLDAsMCwwLTEuNjg3LS42ODk3MSwyLjM3MywyLjM3MywwLDAsMCwwLDQuNzQ2LDIuMzc3MjQsMi4zNzcyNCwwLDAsMCwxLjY4Ny00LjA1NjNtLS4yNDExNC4yMzU1MmExLjk0MzU5LDEuOTQzNTksMCwwLDEsLjU5NTU5LDEuNDQzNTYsMi4wMzkyMiwyLjAzOTIyLDAsMCwxLTMuNDg1NTIsMS40NTA1OSwyLjAxMzExLDIuMDEzMTEsMCwwLDEtLjU5Mjc5LTEuNDUwNTlBMi4wNDYyNywyLjA0NjI3LDAsMCwxLDYwLjkyODEsNjIuNjk3YTEuOTQ2LDEuOTQ2LDAsMCwxLDEuNDQ1OTEuNjA1ODkiLz48L3N2Zz4= - mediatype: image/svg+xml - install: - spec: - clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - pods - - services - - services/finalizers - - endpoints - - persistentvolumeclaims - - events - - configmaps - - secrets - - serviceaccounts - - namespaces - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apps - resources: - - deployments - - daemonsets - - replicasets - - statefulsets - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - monitoring.coreos.com - resources: - - servicemonitors - verbs: - - get - - create - - apiGroups: - - apps - resourceNames: - - nginx-ingress-operator - resources: - - deployments/finalizers - verbs: - - update - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - apiGroups: - - apps - resources: - - replicasets - - deployments - verbs: - - get - - apiGroups: - - k8s.nginx.org - - appprotect.f5.com - resources: - - '*' - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - rbac.authorization.k8s.io - resources: - - clusterroles - - clusterrolebindings - - roles - - rolebindings - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - create - - delete - - update - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - list - - watch - - get - - apiGroups: - - networking.k8s.io - resources: - - ingresses/status - verbs: - - update - - apiGroups: - - security.openshift.io - resources: - - securitycontextconstraints - verbs: - - create - - update - - get - - list - - watch - - apiGroups: - - networking.k8s.io - resources: - - ingressclasses - verbs: - - get - - create - serviceAccountName: nginx-ingress-operator - deployments: - - name: nginx-ingress-operator - spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - strategy: {} - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - containers: - - command: - - nginx-ingress-operator - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: nginx-ingress-operator - image: registry.connect.redhat.com/nginx/nginx-ingress-operator:0.1.0 - imagePullPolicy: IfNotPresent - name: nginx-ingress-operator - resources: {} - serviceAccountName: nginx-ingress-operator - strategy: deployment - installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: true - type: MultiNamespace - - supported: false - type: AllNamespaces - keywords: - - nginx - - ingress-controller - - ingress - - controller - - kubernetes - - openshift - links: - - name: Documentation for NGINX Plus - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-plus-min - - name: Documentation for NGINX Open Source - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/examples/deployment-oss-min - - name: Documentation for NginxIngressController CR - url: https://github.com/nginxinc/nginx-ingress-operator/tree/release-0.1.0/docs/nginx-ingress-controller.md - maintainers: - - email: kubernetes@nginx.com - name: NGINX Inc - maturity: alpha - provider: - name: NGINX Inc - replaces: nginx-ingress-operator.v0.0.7 - version: 0.1.0 diff --git a/deploy/olm-catalog/nginx-ingress-operator/nginx-ingress-operator.package.yaml b/deploy/olm-catalog/nginx-ingress-operator/nginx-ingress-operator.package.yaml deleted file mode 100644 index eb5bd8af..00000000 --- a/deploy/olm-catalog/nginx-ingress-operator/nginx-ingress-operator.package.yaml +++ /dev/null @@ -1,5 +0,0 @@ -channels: -- currentCSV: nginx-ingress-operator.v0.2.0 - name: alpha -defaultChannel: alpha -packageName: nginx-ingress-operator diff --git a/deploy/operator.yaml b/deploy/operator.yaml deleted file mode 100644 index 7982a2ae..00000000 --- a/deploy/operator.yaml +++ /dev/null @@ -1,34 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx-ingress-operator -spec: - replicas: 1 - selector: - matchLabels: - name: nginx-ingress-operator - template: - metadata: - labels: - name: nginx-ingress-operator - spec: - serviceAccountName: nginx-ingress-operator - containers: - - name: nginx-ingress-operator - # Replace this with the built image name if necessary - # For Openshift, use: registry.connect.redhat.com/nginx/nginx-ingress-operator: - image: nginx/nginx-ingress-operator:latest - command: - - nginx-ingress-operator - imagePullPolicy: IfNotPresent - env: - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: OPERATOR_NAME - value: "nginx-ingress-operator" diff --git a/deploy/service_account.yaml b/deploy/service_account.yaml deleted file mode 100644 index 8a76164f..00000000 --- a/deploy/service_account.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: nginx-ingress-operator diff --git a/examples/deployment-plus-min/ns.yaml b/examples/deployment-plus-min/ns.yaml index e775af14..95b2e152 100644 --- a/examples/deployment-plus-min/ns.yaml +++ b/examples/deployment-plus-min/ns.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: my-nginx-ingress \ No newline at end of file + name: my-nginx-ingress diff --git a/go.mod b/go.mod index 05aceffb..c9e64feb 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,24 @@ module github.com/nginxinc/nginx-ingress-operator go 1.16 require ( - github.com/go-logr/logr v0.1.0 - github.com/golangci/golangci-lint v1.39.0 + github.com/go-logr/logr v0.3.0 github.com/google/go-cmp v0.5.5 - github.com/openshift/api v0.0.0-20200701144905-de5b010b2b38 - github.com/operator-framework/operator-sdk v0.18.2 - github.com/spf13/pflag v1.0.5 - k8s.io/api v0.18.9 - k8s.io/apiextensions-apiserver v0.18.9 - k8s.io/apimachinery v0.18.9 - k8s.io/client-go v12.0.0+incompatible - sigs.k8s.io/controller-runtime v0.6.3 -) - -replace ( - github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM - k8s.io/client-go => k8s.io/client-go v0.18.9 // Required by prometheus-operator + github.com/imdario/mergo v0.3.11 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/onsi/ginkgo v1.14.1 + github.com/onsi/gomega v1.10.2 + github.com/openshift/api v0.0.0-20201013121701-9d5ee23b507d + github.com/prometheus/client_golang v1.9.0 // indirect + golang.org/x/mod v0.4.0 // indirect + golang.org/x/net v0.0.0-20201216054612-986b41b23924 // indirect + golang.org/x/sys v0.0.0-20201218084310-7d0127a74742 // indirect + golang.org/x/tools v0.0.0-20201218024724-ae774e9781d2 // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/api v0.20.4 + k8s.io/apiextensions-apiserver v0.20.2 + k8s.io/apimachinery v0.20.4 + k8s.io/client-go v0.20.4 + sigs.k8s.io/controller-runtime v0.8.3 ) diff --git a/go.sum b/go.sum index d9f28b75..bce8e583 100644 --- a/go.sum +++ b/go.sum @@ -1,312 +1,113 @@ -4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a h1:wFEQiK85fRsEVF0CRrPAos5LoAryUsIX1kPW/WrIqFw= -4d63.com/gochecknoglobals v0.0.0-20201008074935-acfc0b28355a/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bitbucket.org/creachadair/shell v0.0.6/go.mod h1:8Qqi/cYk7vPnsOePHroKXDJYmb5x7ENhtiFtfZq8K+M= 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.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= 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= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.49.0/go.mod h1:hGvAdzcWNbyuxS3nWhD7H2cIJxjRRTRLQVB0bdputVY= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0= cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.60.0 h1:R+tDlceO7Ss+zyvtsdhTxacDyZ1k99xwskQ4FT7ruoM= -cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/pubsub v1.5.0/go.mod h1:ZEwJccE3z93Z2HWvstpri00jOg7oO4UZDtKhwDwqF0w= -cloud.google.com/go/spanner v1.7.0/go.mod h1:sd3K2gZ9Fd0vMPLXzeCrF6fq4i63Q7aTLW/lBIfBkIk= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.3.0/go.mod h1:9IAwXhoyBJ7z9LcAwkj0/7NnPzYaPeZxxVp3zm+5IqA= cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -contrib.go.opencensus.io/exporter/ocagent v0.6.0/go.mod h1:zmKjrJcdo0aYcVS7bmEeSEBLPA9YJp5bjrofdU3pIXs= -contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= -github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= -github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v23.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-sdk-for-go v36.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= -github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-autorest v13.3.2+incompatible h1:VxzPyuhtnlBOzc4IWCZHqpyH2d+QMLQEuy3wREyY4oc= -github.com/Azure/go-autorest v13.3.2+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503 h1:uUhdsDMg2GbFLF5GfQPtLMWd5vdDZSfqvqQp3waafxQ= -github.com/Azure/go-autorest/autorest v0.9.3-0.20191028180845-3492b2aff503/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= -github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0= -github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503 h1:Hxqlh1uAA8aGpa1dFhDNhll7U/rkWtG8ZItFvRMr7l0= -github.com/Azure/go-autorest/autorest/adal v0.8.1-0.20191028180845-3492b2aff503/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc= -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/autorest/to v0.3.1-0.20191028180845-3492b2aff503/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA= -github.com/Azure/go-autorest/autorest/validation v0.2.1-0.20191028180845-3492b2aff503/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI= -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/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= +github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= +github.com/Azure/go-autorest/autorest v0.11.1 h1:eVvIXUKiTgv++6YnWb42DUA1YL7qDugnKP0HljexdnQ= +github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest/adal v0.9.5 h1:Y3bBUV4rTuxenJJs41HU3qmqsb+auo+a3Lz+PlJPpL0= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= +github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= +github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= +github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk= +github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= +github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= +github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= +github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= 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/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= -github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU= -github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E= -github.com/Masterminds/goutils v1.1.0 h1:zukEsf/1JZwCMgHiK3GZftabmxiCw4apj3a28RPBiVg= -github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/Masterminds/sprig v2.15.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= -github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= -github.com/Masterminds/sprig/v3 v3.1.0 h1:j7GpgZ7PdFqNsmncycTHsLmVPf5/3wJtlgW9TNDYD9Y= -github.com/Masterminds/sprig/v3 v3.1.0/go.mod h1:ONGMf7UfYGAbMXCZmQLy8x3lCDIPrEZE/rU8pmrbihA= -github.com/Masterminds/squirrel v1.2.0 h1:K1NhbTO21BWG47IVR0OnIZuE0LZcXAYqywrC3Ko53KI= -github.com/Masterminds/squirrel v1.2.0/go.mod h1:yaPeOnPG5ZRwL9oKdTsO/prlkPbXWZlRVMQ/gGlzIuA= -github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5 h1:ygIc8M6trr62pF5DucadTWGdEB4mEyvzi0e2nbcmcyA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Microsoft/hcsshim v0.8.9 h1:VrfodqvztU8YSOvygU+DN1BGaSGxmrNfqOv5oOuX2Bk= -github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= +github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/OneOfOne/xxhash v1.2.6/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= -github.com/OpenPeeDeeP/depguard v1.0.1 h1:VlW4R6jmBIv3/u1JNlawEvJMM4J+dPORPaZasQee8Us= -github.com/OpenPeeDeeP/depguard v1.0.1/go.mod h1:xsIw86fROiiwelg+jB2uM9PiKihMMmUx/1V+TNhjQvM= 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 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= 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 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= -github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= +github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= +github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= 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/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= -github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/aliyun/aliyun-oss-go-sdk v2.0.4+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= -github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= -github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= -github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 h1:zV3ejI06GQ59hwDQAvmK1qxOQGB3WuVTRoY0okPTAv0= -github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/ashanbrown/forbidigo v1.1.0 h1:SJOPJyqsrVL3CvR0veFZFmIM0fXS/Kvyikqvfphd0Z4= -github.com/ashanbrown/forbidigo v1.1.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= -github.com/ashanbrown/makezero v0.0.0-20210308000810-4155955488a0 h1:27owMIbvO33XL56BKWPy+SCU69I9wPwPXuMf5mAbVGU= -github.com/ashanbrown/makezero v0.0.0-20210308000810-4155955488a0/go.mod h1:oG9Dnez7/ESBqc4EdrdNlryeo7d0KcW1ftXHm7nU/UU= -github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= -github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.23.20/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.36.30/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= -github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= +github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= +github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= 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/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= -github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bombsimon/wsl/v3 v3.2.0 h1:x3QUbwW7tPGcCNridvqmhSRthZMTALnkg5/1J+vaUas= -github.com/bombsimon/wsl/v3 v3.2.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= -github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= -github.com/brancz/gojsontoyaml v0.0.0-20191212081931-bf2969bbd742/go.mod h1:IyUJYN1gvWjtLF5ZuygmxbnsAyP3aJS6cHzIuZY50B0= -github.com/brancz/kube-rbac-proxy v0.5.0/go.mod h1:cL2VjiIFGS90Cjh5ZZ8+It6tMcBt8rwvuw2J6Mamnl0= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1 h1:pgAtgj+A31JBVtEHu2uHuEx0n+2ukqUJnS2vVe5pQNA= -github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= -github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= -github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= -github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= -github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= -github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8= -github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= +github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v0.0.0-20181017004759-096ff4a8a059/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= 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.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= 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/chai2010/gettext-go v0.0.0-20160711120539-c6fed771bfd5/go.mod h1:/iP1qXHoty45bqomnu2LM+VVyAEdWN+vtSHGlQgyxbw= -github.com/charithe/durationcheck v0.0.6 h1:Tsy7EppNow2pDC0jN7Hsmcb6mHd71ZbI1vFissRBtc0= -github.com/charithe/durationcheck v0.0.6/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= 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/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= +github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= -github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f h1:tSNMc+rJDfmYntojat8lljbt1mgKNpTxUZJsSzJ9Y1s= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/containerd v1.2.7/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2 h1:ForxmXkA6tPIvffbrDAcPUIB32QgXkt2XFj+F0UxetA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200107194136-26c1120b8d41/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb h1:nXPkFq8X1a9ycY3GYQpFNxHh3j2JgY7zDZfq2EXMIzk= -github.com/containerd/continuity v0.0.0-20200413184840-d3ef23f19fbb/go.mod h1:Dq467ZllaHgAtVp4p1xUQWBrFXR9s/wyoTpG8zOJGkY= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v1.0.1 h1:IfVOxKbjyBn9maoye2JN95pgGYOmPkQVqxtOu7rtNIc= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd h1:JNn81o/xG+8NEo3bC/vx9pbi/g2WI8mtP2/nXzu297Y= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= 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/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.15+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= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a/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/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc h1:nMbUjGuF7UzVluucix/vsy4973BNdEiT/aX6kFtskKM= -github.com/coreos/prometheus-operator v0.38.1-0.20200424145508-7e176fda06cc/go.mod h1:erio69w1R/aC14D5nfvAXSlE8FT8jt2Hnavc50Dp33A= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= 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/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8= -github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg= -github.com/cznic/golex v0.0.0-20170803123110-4ab7c5e190e4/go.mod h1:+bmmJDNmKlhWNG+gwWCkaBoTy39Fs+bzRxVBzoTQbIc= -github.com/cznic/internal v0.0.0-20180608152220-f44710a21d00/go.mod h1:olo7eAdKwJdXxb55TKGLiJ6xt1H0/tiiRCWKVLmtjY4= -github.com/cznic/lldb v1.1.0/go.mod h1:FIZVUmYUVhPwRiPzL8nD/mpFcJ/G7SSXjjXYG4uRI3A= -github.com/cznic/mathutil v0.0.0-20180504122225-ca4c9f2c1369/go.mod h1:e6NPNENfs9mPDVNRekM7lKScauxd5kXTr1Mfyig6TDM= -github.com/cznic/ql v1.2.0/go.mod h1:FbpzhyZrqr0PVlK6ury+PoW3T0ODUV22OeWIxcaOrSE= -github.com/cznic/sortutil v0.0.0-20150617083342-4c7342852e65/go.mod h1:q2w6Bg5jeox1B+QkJ6Wp/+Vn0G/bo3f1uY7Fn3vivIQ= -github.com/cznic/strutil v0.0.0-20171016134553-529a34b1c186/go.mod h1:AHHPPPXTw0h6pVabbcbyGRK1DckRn7r/STdZEeIDzZc= -github.com/cznic/zappy v0.0.0-20160723133515-2533cb5b45cc/go.mod h1:Y1SNZ4dRUOKXshKUbwUapqNncRrho4mkjQebgEHZLj8= -github.com/daixiang0/gci v0.2.8 h1:1mrIGMBQsBu0P7j7m1M8Lb+ZeZxsZL+jyGX4YoMJJpg= -github.com/daixiang0/gci v0.2.8/go.mod h1:+4dZ7TISfSmqfAGv59ePaHfNzgGtIkHAhhdKggP1JAc= -github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= -github.com/deislabs/oras v0.8.1 h1:If674KraJVpujYR00rzdi0QAmW4BxzMJPVAZJKuhQ0c= -github.com/deislabs/oras v0.8.1/go.mod h1:Mx0rMSbBNaNfY9hjpccEnxkOqJL6KGjtxNHPLC4G4As= -github.com/denis-tingajkin/go-header v0.4.2 h1:jEeSF4sdv8/3cT/WY8AgDHUoItNSoEZ7qg9dX7pc218= -github.com/denis-tingajkin/go-header v0.4.2/go.mod h1:eLRHAVXzE5atsKAnNRDB90WHCFFnBUn4RN0nRcs1LJA= -github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= -github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0= -github.com/dgrijalva/jwt-go v0.0.0-20170104182250-a601269ab70c/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -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/dgryski/go-sip13 v0.0.0-20190329191031-25c5027a8c7b/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dhui/dktest v0.3.0/go.mod h1:cyzIUfGsBEbZ6BT7tnXqAShHSXCZhSNmFl70sZ7c1yc= -github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= -github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492 h1:FwssHbCDJD025h+BchanCwE1Q8fyMgqDr2mOQAWOLGw= -github.com/docker/cli v0.0.0-20200130152716-5d0cf8839492/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= -github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= -github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v0.7.3-0.20190103212154-2b7e084dc98b/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v0.7.3-0.20190817195342-4760db040282/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce h1:KXS1Jg+ddGcWA8e1N7cupxaHHZhit5rB9tfDU+mfjyY= -github.com/docker/docker v1.4.2-0.20200203170920-46ec8731fbce/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 h1:yWHOI+vFjEsAakUTSrtqc/SAHrhSkmn48pqjidZX3QA= -github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= -github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96 h1:cenwrSVm+Z7QLSV/BsnenAOcDXdX4cMv4wP0B/5QbPg= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -314,203 +115,64 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/elastic/go-sysinfo v1.0.1/go.mod h1:O/D5m1VpYLwGjCYzEt63g3Z1uO3jXfwyzzjiW90t8cY= -github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= -github.com/elastic/go-windows v1.0.0/go.mod h1:TsU0Nrp7/y3+VwE82FoZF8gC/XFg/Elz6CcloAxnPgU= -github.com/elastic/go-windows v1.0.1/go.mod h1:FoVvqWSun28vaDQPbj2Elfc0JahhPB7WQEGa3c814Ss= -github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.0.14/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/esimonov/ifshort v1.0.2 h1:K5s1W2fGfkoWXsFlxBNqT6J0ZCncPaKrGM5qe0bni68= -github.com/esimonov/ifshort v1.0.2/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= -github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= -github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= -github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb/go.mod h1:bH6Xx7IW64qjjJq8M2u4dxNaBiDfKK+z/3eGDpXEQhc= -github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/structtag v1.1.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= -github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= +github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= +github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsouza/fake-gcs-server v1.7.0/go.mod h1:5XIRs4YvwNbNoz+1JF8j6KLAyDh7RHGAyAK3EP2EsNk= -github.com/fullstorydev/grpcurl v1.6.0/go.mod h1:ZQ+ayqbKMJNhzLmbpCiurTVlaK2M/3nqZCxaQ2Ze/sM= -github.com/fzipp/gocyclo v0.3.1 h1:A9UeX3HJSXTBzvHzhqoYVuE0eAhe+aM8XBCCwsPMZOc= -github.com/fzipp/gocyclo v0.3.1/go.mod h1:DJHO6AUmbdqj2ET4Z9iArSuwWgYDRryYt2wASxc7x3E= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7 h1:LofdAjjjqCSXMwLGgOgnE+rdPuvX9DxCqaHwKy7i/ko= -github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-bindata/go-bindata/v3 v3.1.3/go.mod h1:1/zrpXsLD8YDIbhZRqXzm1Ghc7NhEvIN9+Z6R5/xH4I= -github.com/go-critic/go-critic v0.5.5 h1:hqPHqQt/2l4Syc2VOIgcuy0FSytcbatOHWggu45vhw8= -github.com/go-critic/go-critic v0.5.5/go.mod h1:eMs1Oc/oIP+CYNVN09M+XZYffIPuRHawxzlggAPN9Kk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= 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-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logr/logr v0.1.0 h1:M1Tv3VzNlEHg6uyACnRdtrploV2P7wZqH8BoQMtz0cg= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/zapr v0.1.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= -github.com/go-logr/zapr v0.1.1 h1:qXBXPDdNncunGs7XeEpsJt8wCjYBygluzfdLO0G5baE= -github.com/go-logr/zapr v0.1.1/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= -github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.17.2/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.17.2/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= +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.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= +github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.17.2/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= -github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.17.2/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= -github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.17.2/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.4 h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY= -github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.18.0/go.mod h1:uI6pHuxWYTy94zZxgcwJkUWa9wbIlhteGfloI10GD4U= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4 h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.17.2/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= -github.com/go-openapi/spec v0.19.3 h1:0XRyw8kguri6Yw4SxhsQA/atC88yqrk0+G4YhI2wabc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.17.2/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/validate v0.17.2/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.5 h1:QhCBKRYqZR+SKo4gl1lPhPahope8/RLt6EVgY8X80w0= -github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-redis/redis v6.15.8+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= -github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0 h1:OMgl1b1MEpjFQ1m5ztEO06rz5CUd3oBv9RF7+DyvdG8= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astequal v1.0.0 h1:4zxD8j3JRFNyLN46lodQuqz3xdKSrur7U/sr0SDS/gQ= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= -github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.0 h1:4DFWWMXVfbcN5So1sBNW9+yeiMqLFGl1wFLTL5R0Tgg= -github.com/go-toolsmith/pkgload v1.0.0/go.mod h1:5eFArkbO80v7Z0kdngIxsRXRMTaX4Ilcwuh3clNrQJc= -github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= -github.com/gobuffalo/envy v1.6.5/go.mod h1:N+GkhhZ/93bGZc6ZKhJLP6+m+tCNPKwgSpH9kaifseQ= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= -github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= -github.com/gobuffalo/flect v0.1.5/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.2.0/go.mod h1:W3K3X9ksuZfir8f/LrfVtWmCDQFfayuylOJ7sz/Fj80= -github.com/gobuffalo/flect v0.2.1 h1:GPoRjEN0QObosV4XwuoWvSd5uSiL0N3e91/xqyY4crQ= -github.com/gobuffalo/flect v0.2.1/go.mod h1:vmkQwuZYhN5Pc4ljYQZzP+1sq+NEkK+lh20jmEmX3jc= -github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= -github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= -github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= -github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= -github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o= -github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/gocql/gocql v0.0.0-20190301043612-f6df8288f9b4/go.mod h1:4Fw1eo5iaEhDUs8XyuhSVCVy52Jq3L+/3GJgYkwc+/0= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY= -github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/golang-migrate/migrate/v4 v4.6.2 h1:LDDOHo/q1W5UDj6PbkxdCv7lv9yunyZHXvxuwDkGo3k= -github.com/golang-migrate/migrate/v4 v4.6.2/go.mod h1:JYi6reN3+Z734VZ0akNuyOJNcrg45ZL7LDBMW3WGJL0= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= 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/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-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -519,852 +181,339 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613 h1:9kfjN3AdxcbsZBf8NjltjWihK2QfBBBZuv91cMFfDHw= -github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod h1:SyvUF2NxV+sN8upjjeVYr5W7tyxaT1JVtvhKhOn2ii8= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.39.0 h1:aAUjdBxARwkGLd5PU0vKuym281f2rFOyqh3GB4nXcq8= -github.com/golangci/golangci-lint v1.39.0/go.mod h1:mzMK3FGyk8LKTOxpRDcDqxwHVudnYemESTt5rpUxqCM= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5 h1:c9Mqqrm/Clj5biNaG7rABrmwUq88nHh0uABo2b/WYmc= -github.com/golangci/revgrep v0.0.0-20210208091834-cd28932614b5/go.mod h1:LK+zW4MpyytAWQRz0M4xnzEk50lSvqDQKfx304apFkY= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= -github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= -github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995/go.mod h1:lJgMEyOkYFkPcDKwRXegd+iM6E7matEszMG5HhwytU8= -github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/certificate-transparency-go v1.0.21/go.mod h1:QeJfpSbVSfYc7RgB3gJFj9cbuQMMchQxrWXz8Ruopmg= -github.com/google/certificate-transparency-go v1.1.1/go.mod h1:FDKqPvSXawb2ecErVRrD+nfy23RCzyl7eqVCEmlT1Zs= 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/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= -github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= -github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= 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= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= -github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/trillian v1.3.11/go.mod h1:0tPraVHrSDkA3BO6vKX67zgLXs6SsOAbHEivX+9mPgw= -github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go v2.0.2+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY= +github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= -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/gookit/color v1.3.8/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= -github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gophercloud/gophercloud v0.2.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= -github.com/gophercloud/gophercloud v0.6.0 h1:Xb2lcqZtml1XjgYZxbeayEemq7ASbeTp09m36gQFpEU= -github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM= +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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU= -github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= -github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254 h1:Nb2aRlC404yz7gQIfRZxX9/MLvQiqXyiBTJtgAy6yrI= -github.com/gordonklaus/ineffassign v0.0.0-20210225214923-2e10b2664254/go.mod h1:M9mZEtGIsR1oDaZagNPNG9iq9n2HrhZ17dsXk73V3Lw= -github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75/go.mod h1:g2644b03hfBX9Ov0ZBDgXXens4rxSxmqFBbhvKv2yVA= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33 h1:893HsJqtxp9z1SF76gg6hY70hRY1wVlTSnC/h1yUDCo= -github.com/gorilla/handlers v0.0.0-20150720190736-60c7bfde3e33/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= 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/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= -github.com/gostaticanalysis/analysisutil v0.4.1 h1:/7clKqrVfiVwiBQLM0Uke4KvXnO6JcCTS7HwF2D6wG8= -github.com/gostaticanalysis/analysisutil v0.4.1/go.mod h1:18U/DLpRgIUd459wGxVHE0fRgmo1UgHDcbw7F5idXu0= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= -github.com/gostaticanalysis/comment v1.4.1 h1:xHopR5L2lRz6OsjH4R2HG5wRhW9ySl3FsHIvi5pcXwc= -github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= -github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5 h1:rx8127mFPqXXsfPSo8BwnIU97MKFZc89WHAHt8PwDVY= -github.com/gostaticanalysis/forcetypeassert v0.0.0-20200621232751-01d4955beaa5/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= -github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= -github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= -github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= -github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v0.0.0-20190222133341-cfaf5686ec79/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= 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-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.3.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.4/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= -github.com/grpc-ecosystem/grpc-health-probe v0.2.1-0.20181220223928-2bf0a5b182db/go.mod h1:uBKkC2RbarFsvS5jMJHpVhTLvGlGQj9JJwkaePE3FWI= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= -github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.3/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 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= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.4/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.1.5/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.8.5/go.mod h1:UpNcs7fFbpKIyZaUuSW6EPiH+eZC7OuyFD+wc1oal+k= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= -github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= -github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= -github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365 h1:ECW73yc9MY7935nNYXUkK7Dz17YuSUI9yqRqYS8aBww= -github.com/iancoleman/strcase v0.0.0-20190422225806-e506e3ef7365/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.4/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/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/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/influxdata/influxdb v1.7.7/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= -github.com/jackc/fake v0.0.0-20150926172116-812a484cc733/go.mod h1:WrMFNQdiFJ80sQsxDoMokWK1W5TQtxBFNpzWTD84ibQ= -github.com/jackc/pgx v3.2.0+incompatible/go.mod h1:0ZGrqGqkRlliWnWB4zKnWtjbSWbGkVEFm4TeybAXq+I= -github.com/jessevdk/go-flags v0.0.0-20180331124232-1c38ed7ad0cc/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jgautheron/goconst v1.4.0 h1:hp9XKUpe/MPyDamUbfsrGpe+3dnY2whNK4EtB86dvLM= -github.com/jgautheron/goconst v1.4.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jhump/protoreflect v1.6.1/go.mod h1:RZQ/lnuN+zqeRVpQigTwO6o0AJUkxbnSnpuG7toUTG4= -github.com/jingyugao/rowserrcheck v0.0.0-20210315055705-d907ca737bb1 h1:4Rlb26NqzNtbDH69CRpr0vZooj3jAlXTycWCX3xRYAY= -github.com/jingyugao/rowserrcheck v0.0.0-20210315055705-d907ca737bb1/go.mod h1:TOQpc2SLx6huPfoFGK3UOnEG+u02D3C1GeosjupAKCA= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= -github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= +github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= -github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= -github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmoiron/sqlx v1.2.0 h1:41Ip0zITnmWNR/vHV+S4m+VoUivnWY5E4OJfLZjCJMA= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= -github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= -github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901/go.mod h1:Z86h9688Y0wesXCyonoVr47MasHilkuLMqGhRZ4Hpak= -github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jsonnet-bundler/jsonnet-bundler v0.3.1/go.mod h1:/by7P/OoohkI3q4CgSFqcoFsVY+IaNbzOVDknEsKDeU= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/julz/importas v0.0.0-20210228071311-d0bf5cb4e1db h1:ZmwBthGFMVAieuVpLzuedUH9l4pY/0iFG16DN9dS38o= -github.com/julz/importas v0.0.0-20210228071311-d0bf5cb4e1db/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= -github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= -github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= 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/errcheck v1.6.0 h1:YTDO4pNy7AUN/021p+JGHycQyYNIyMoenM1YDVK6RlY= -github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.10.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.0/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= 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.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= 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/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kshvakov/clickhouse v1.3.5/go.mod h1:DMzX7FxRymoNkVgizH0DWAL8Cur7wHLgx3MUnGwJqpE= -github.com/kulti/thelper v0.4.0 h1:2Nx7XbdbE/BYZeoip2mURKUdtHQRuy6Ug+wR7K9ywNM= -github.com/kulti/thelper v0.4.0/go.mod h1:vMu2Cizjy/grP+jmsvOFDx1kYP6+PD1lqg4Yu5exl2U= -github.com/kunwardeep/paralleltest v1.0.2 h1:/jJRv0TiqPoEy/Y8dQxCFJhD56uS/pnvtatgTZBHokU= -github.com/kunwardeep/paralleltest v1.0.2/go.mod h1:ZPqNm1fVHPllh5LPVujzbVz1JN2GhLxSfY+oqUsvG30= -github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= -github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= -github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= -github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= -github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/ldez/gomoddirectives v0.2.1 h1:9pAcW9KRZW7HQjFwbozNvFMcNVwdCBufU7os5QUwLIY= -github.com/ldez/gomoddirectives v0.2.1/go.mod h1:sGicqkRgBOg//JfpXwkB9Hj0X5RyJ7mlACM5B9f6Me4= -github.com/leanovate/gopter v0.2.4/go.mod h1:gNcbPWNEWRe4lm+bycKqxUYoH5uoVje5SkOJ3uoLer8= -github.com/letsencrypt/pkcs11key/v4 v4.0.0/go.mod h1:EFUvBDay26dErnNb70Nd0/VW3tJiIbETBPTl9ATXQag= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= -github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= -github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= -github.com/lightstep/lightstep-tracer-go v0.18.0/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= -github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= -github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= -github.com/lovoo/gcloud-opentracing v0.3.0/go.mod h1:ZFqk2y38kMDDikZPAK7ynTTGuyt17nSPdS3K5e+ZTBY= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= +github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= -github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= -github.com/markbates/inflect v1.0.4 h1:5fh1gzTFhfae06u3hzHYO9xe3l3v3nW5Pwt3naLTP5g= -github.com/markbates/inflect v1.0.4/go.mod h1:1fR9+pO2KHEO9ZRtto13gDwwZaAKstQzferVeWqbgNs= -github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= -github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= -github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do= -github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -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/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= -github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81 h1:QASJXOGm2RZ5Ardbc86qNFvby9AqkLDibfChMtAg5QM= -github.com/mgechev/dots v0.0.0-20190921121421-c36f7dcfbb81/go.mod h1:KQ7+USdGKfpPjXk4Ga+5XxQM4Lm4e3gAogrreFAYpOg= -github.com/mgechev/revive v1.0.5 h1:cTDWX83qkDajREg4GO0sQcYrjJtSSh3308DWJzpnUqg= -github.com/mgechev/revive v1.0.5/go.mod h1:tSw34BaGZ0iF+oVKDOjq1/LuxGifgW7shaJ6+dBYFXg= +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/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.15/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.22/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= -github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= -github.com/mikefarah/yaml/v2 v2.4.0/go.mod h1:ahVqZF4n1W4NqwvVnZzC4es67xsW9uR/RRf2RRxieJU= -github.com/mikefarah/yq/v2 v2.4.1/go.mod h1:i8SYf1XdgUvY2OFwSqGAtWOOgimD2McJ6iutoxRm4k0= -github.com/minio/minio-go/v6 v6.0.49/go.mod h1:qD0lajrGW49lKZLtXKtCB4X/qkMf0a5tBvN2PaZg7Gg= -github.com/minio/sha256-simd v0.1.1/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/copystructure v1.0.0 h1:Laisrj+bAB6b/yJwB5Bt3ITZhGJdqmxquMKeZ+mmkFQ= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= -github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/hashstructure v0.0.0-20170609045927-2bca23e0e452/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/mitchellh/reflectwalk v1.0.1 h1:FVzMWA5RllMAKIdUSC8mdWo3XtwoecrH79BY70sEEpE= -github.com/mitchellh/reflectwalk v1.0.1/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +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= -github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8= -github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mozilla/scribe v0.0.0-20180711195314-fb71baf557c1/go.mod h1:FIczTrinKo8VaLxe6PWTPEXRXDIHz2QAwiaBaP5/4a8= -github.com/mozilla/tls-observatory v0.0.0-20210209181001-cf43108d6880/go.mod h1:FUqVoUPHSEdDR0MnFM3Dh8AU0pZHLXUD127SAJGER/s= -github.com/mozillazg/go-cos v0.13.0/go.mod h1:Zp6DvvXn0RUOXGJ2chmWt2bLEqRAnJnS3DnAZsJsoaE= -github.com/mozillazg/go-httpheader v0.2.1/go.mod h1:jJ8xECTlalr6ValeXYdOF8fFUISeBAdw6E61aqQma60= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007/go.mod h1:m2XC9Qq0AlmmVksL6FktJCdTYyLk7V3fKyp0sl1yWQo= -github.com/mwitkow/go-proto-validators v0.2.0/go.mod h1:ZfA1hW+UH/2ZHOWvQ3HnQaU0DtnpXu850MZiy+YUgcc= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= -github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= -github.com/nakagami/firebirdsql v0.0.0-20190310045651-3c02a58cfed8/go.mod h1:86wM1zFnC6/uDBfZGNwB65O+pR2OFi5q/YQaEUid1qA= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= -github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU= +github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.1.0 h1:kVlMw8h2LHPMGUVqUj6230oQjjTMFjwcZrnkhXzFfl8= -github.com/nishanths/exhaustive v0.1.0/go.mod h1:S1j9110vxV1ECdCudXRkeMnFQ/DQk9ajLT0Uf2MYZQQ= -github.com/nishanths/predeclared v0.0.0-20190419143655-18a43bb90ffc/go.mod h1:62PewwiQTlm/7Rj+cxVYqZvDIUc+JjZq6GHAC1fsObQ= -github.com/nishanths/predeclared v0.2.1 h1:1TXtjmy4f3YCFjTxRd8zcFHOmoUir+gp0ESzjFzG2sw= -github.com/nishanths/predeclared v0.2.1/go.mod h1:HvkGJcA3naj4lOwnFXFDkFxVtSqQMB9sbB1usJ+xjQE= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid v0.0.0-20170117200651-66bb6560562f/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= 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/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= -github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= 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.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/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.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.15.0 h1:1V1NfVQR87RtWAgp1lv9JZJ5Jap+XFGKPi00andXGi4= -github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg= +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 v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 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.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ= -github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48= -github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1 h1:WzifXhOVOEOuFYOJAW6aQqW0TooG2iki3E3Ii+WN7gQ= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6 h1:yN8BPXVwMBAm3Cuvh1L5XE8XpvYRMdsVLd82ILprhUU= -github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v0.1.1 h1:GlxAyO6x8rfZYN9Tt0Kti5a/cP41iuiO2yYT0IJGY8Y= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700 h1:eNUVfm/RFLIi1G7flU5/ZRTHvd4kcVuzfRnL6OFlzCI= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/openshift/api v0.0.0-20200701144905-de5b010b2b38 h1:kWdE0ZtJXJmkwl9Ns01/RvTptqG0kzi/3ZfttQT9HkM= -github.com/openshift/api v0.0.0-20200701144905-de5b010b2b38/go.mod h1:l6TGeqJ92DrZBuWMNKcot1iZUHfbYSJyBWHGgg6Dn6s= -github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc/go.mod h1:1CkcsT3aVebzRBzVTSbiKSkJMsC/CASqxesfqEMfJEc= -github.com/openshift/origin v0.0.0-20160503220234-8f127d736703/go.mod h1:0Rox5r9C8aQn6j1oAOQ0c1uC86mYbUFObzjBRvUKHII= -github.com/openshift/prom-label-proxy v0.1.1-0.20191016113035-b8153a7f39f1/go.mod h1:p5MuxzsYP1JPsNGwtjtcgRHHlGziCJJfztff91nNixw= -github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= +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/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/openshift/api v0.0.0-20201013121701-9d5ee23b507d h1:i/GapPJoFGAe6P+AXdZbjFIY7WC5jimZ0jFEkmT30OQ= +github.com/openshift/api v0.0.0-20201013121701-9d5ee23b507d/go.mod h1:RDvBcRQMGLa3aNuDuejVBbTEQj/2i14NXdpOLqbNBvM= +github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA= github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= -github.com/operator-framework/api v0.3.7-0.20200602203552-431198de9fc2/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q= -github.com/operator-framework/api v0.3.8 h1:tJykTCmwGKZBsPVTCfxbwz6nTF6dzmKydWJtC40erc8= -github.com/operator-framework/api v0.3.8/go.mod h1:Xbje9x0SHmh0nihE21kpesB38vk3cyxnE6JdDS8Jo1Q= -github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8 h1:F3zzxoBJJANdKMxmSOi5z/HWiVT+gwOdhROkEwDWD2M= -github.com/operator-framework/operator-registry v1.12.6-0.20200611222234-275301b779f8/go.mod h1:loVINznYhgBIkmv83kU4yee88RS0BBk+hqOw9r4bhJk= -github.com/operator-framework/operator-sdk v0.18.2 h1:Ts5ckGcJ/Jf+2IXeagsEk87o83bEeA+Z7DwNkyWEBPs= -github.com/operator-framework/operator-sdk v0.18.2/go.mod h1:XPYwfr/2R81nK5wzX1Xtesh9pduffTuuBGB76iDClh0= -github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= +github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= +github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= +github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= -github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc= -github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE= +github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f h1:xAw10KgJqG5NJDfmRqJ05Z0IFblKumjtMeyiOLxj3+4= -github.com/polyfloyd/go-errorlint v0.0.0-20201127212506-19bd8db6546f/go.mod h1:wi9BfjxjF/bwiZ701TzmfKu6UKC357IOAtNr0Td0Lvw= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/prometheus/alertmanager v0.18.0/go.mod h1:WcxHBl40VSPuOaqWae6l6HpnEOVRIycEJ7i9iYkadEE= -github.com/prometheus/alertmanager v0.20.0/go.mod h1:9g2i48FAyZW6BtbsnvHtMHQXl2aVtrORKwKVCQ+nbrg= -github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= 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.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_golang v1.2.0/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= -github.com/prometheus/client_golang v1.2.1/go.mod h1:XMU6Z2MjaRKVu/dC1qupJI9SiNkDYzz3xecMgSW/F+U= -github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= +github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_golang v1.9.0 h1:Rrch9mh17XcxvEu9D9DEpb4isxjGBtcevQjKvxPRQIU= +github.com/prometheus/client_golang v1.9.0/go.mod h1:FqZLKOZnGdFAhOK4nqGHa7D66IdsO+O441Eve7ptJDU= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/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.1.0/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.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= 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.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -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-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM= +github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190425082905-87a4384529e0/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.6/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -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/prometheus v0.0.0-20180315085919-58e2a31db8de/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= -github.com/prometheus/prometheus v1.8.2-0.20200110114423-1e64d757f711/go.mod h1:7U90zPoLkWjEIQcy/rweQla82OCTUzxVHE51G3OhJbI= -github.com/prometheus/prometheus v2.3.2+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s= +github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4= +github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA= -github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q= -github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= -github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= -github.com/quasilyte/go-ruleguard v0.3.1 h1:2KTXnHBCR4BUl8UAL2bCUorOBGC8RsmYncuDA9NEFW4= -github.com/quasilyte/go-ruleguard v0.3.1/go.mod h1:s41wdpioTcgelE3dlTUgK57UaUxjihg/DBGUccoN5IU= -github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.1/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20210203162857-b223e0831f88/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20210221215616-dfcc94e3dffd/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/robfig/cron v0.0.0-20170526150127-736158dc09e1/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.5.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= -github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3 h1:xkBtI5JktwbW/vf4vopBbhYsRFTGfQWHYXzC0/qYwxI= -github.com/rubenv/sql-migrate v0.0.0-20200212082348-64f95ea68aa3/go.mod h1:rtQlpHw+eR6UrqaS3kX1VYeaCxzCVdimDS7g5Ln4pPc= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= -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/ryancurrah/gomodguard v1.2.0 h1:YWfhGOrXwLGiqcC/u5EqG6YeS8nh+1fw0HEc85CVZro= -github.com/ryancurrah/gomodguard v1.2.0/go.mod h1:rNqbC4TOIdUDcVMSIpNNAzTbzXAZa6W5lnUepvuMMgQ= -github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= -github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sanposhiho/wastedassign v0.2.0 h1:0vycy8D/Ky55U5ub8oJFqyDv9M4ICM/wte9sAp2/7Mc= -github.com/sanposhiho/wastedassign v0.2.0/go.mod h1:LGpq5Hsv74QaqM47WtIsRSF/ik9kqk07kchgv66tLVE= -github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4= -github.com/satori/go.uuid v0.0.0-20160603004225-b111a074d5ef/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= -github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/securego/gosec/v2 v2.7.0 h1:mOhJv5w6UyNLpSssQOQCc7eGkKLuicAxvf66Ey/X4xk= -github.com/securego/gosec/v2 v2.7.0/go.mod h1:xNbGArrGUspJLuz3LS5XCY1EBW/0vABAl/LWfSklmiM= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil/v3 v3.21.2/go.mod h1:ghfMypLDrFSWN2c9cDYFLHyynQ+QUht0cv/18ZqVczw= -github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= -github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= -github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20180825020608-02ddb050ef6b/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= -github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/assertions v1.0.1 h1:voD4ITNjPL5jjBfgR/r8fPIIBrliWrWHeiJApdr3r4w= -github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM= -github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= -github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= -github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= +github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= 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/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= 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 v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.3 h1:xghbfqPkxzxP3C/f3n5DdpAbdKLj4ZE4BWQI362l53M= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= +github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= 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-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/ssgreg/nlreturn/v2 v2.1.0 h1:6/s4Rc49L6Uo6RLjhWZGBpWWjfzk2yrf1nIW8m4wgVA= -github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= +github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= 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 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b h1:HxLVTlqcHhFAz3nWUcuvpH7WuOMv8LQoCWmruLfFH2U= -github.com/tdakkota/asciicheck v0.0.0-20200416200610-e657995f937b/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= -github.com/tetafro/godot v1.4.4 h1:VAtLEoAMmopIzHVWVBrztjVWDeYm1OD/DKqhqXR4828= -github.com/tetafro/godot v1.4.4/go.mod h1:FVDd4JuKliW3UgjswZfJfHq4vAx0bD/Jd5brJjGeaz4= -github.com/thanos-io/thanos v0.11.0/go.mod h1:N/Yes7J68KqvmY+xM6J5CJqEvWIvKSR5sqGtmuD6wDc= -github.com/tidwall/pretty v0.0.0-20180105212114-65a9db5fad51/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94 h1:ig99OeTyDwQWhPe2iw9lwfQVF1KB3Q4fpP3X7/2VBG8= -github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek= -github.com/tklauser/numcpus v0.2.1/go.mod h1:9aU+wOc6WjUIZEwWMP62PL/41d65P+iks1gBkr4QyP8= 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/tmc/grpc-websocket-proxy v0.0.0-20200427203606-3cfed13b9966/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tomarrell/wrapcheck v1.0.0 h1:e/6yv/rH08TZFvkYpaAMrgGbaQHVFdzaPPv4a5EIu+o= -github.com/tomarrell/wrapcheck v1.0.0/go.mod h1:Bd3i1FaEKe3XmcPoHhNQ+HM0S8P6eIXoQIoGj/ndJkU= -github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoik09Xen7gje4m9ERNah1d1PPsVq1VEx9vE4= -github.com/tommy-muehle/go-mnd/v2 v2.3.1 h1:a1S4+4HSXDJMgeODJH/t0EEKxcVla6Tasw+Zx9JJMog= -github.com/tommy-muehle/go-mnd/v2 v2.3.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/uber/jaeger-client-go v2.20.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= -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/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.4 h1:If7Va4cM03mpgrNH9k49/VOicWpGoG70XPBFFODYDsg= -github.com/ultraware/whitespace v0.0.4/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/uudashr/gocognit v1.0.1 h1:MoG2fZ0b/Eo7NXoIwCVFLG5JED3qgQz5/NEE+rOsjPs= -github.com/uudashr/gocognit v1.0.1/go.mod h1:j44Ayx2KW4+oB6SWMv8KsmHzZrOInQav7D3cQMJ5JUM= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasthttp v1.16.0/go.mod h1:YOKImeEosDdBPnxc0gy7INqi3m1zK6A+xl6TwOBhHCA= -github.com/valyala/quicktemplate v1.6.3/go.mod h1:fwPzK2fHuYEODzJ9pkw0ipCPNHZ2tD5KW4lOuSdPKzY= -github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= -github.com/viki-org/dnscache v0.0.0-20130720023526-c70c1f23c5d8/go.mod h1:dniwbG03GafCjFohMDmz6Zc6oCuiqgH6tGNyXTkHzXE= -github.com/xanzy/go-gitlab v0.15.0/go.mod h1:8zdQa/ri1dfn8eS3Ir1SyfvOKlw7WBJ8DVThkpGiXrs= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xeipuuv/gojsonschema v1.1.0 h1:ngVtJC9TY/lg0AA/1k48FYhBrhRoFlEmWzsehpNAaZg= -github.com/xeipuuv/gojsonschema v1.1.0/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= -github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8= -github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= -github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= -github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= -github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= -github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= -github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= -github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= -github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= -github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b/go.mod h1:T3BPAOm2cqquPa0MKWeNkmOM5RQsRhkrwMWonFMN7fE= -go.elastic.co/apm v1.5.0/go.mod h1:OdB9sPtM6Vt7oz3VXt7+KR96i9li74qrxBGHTQygFvk= -go.elastic.co/apm/module/apmhttp v1.5.0/go.mod h1:1FbmNuyD3ddauwzgVwFB0fqY6KbZt3JkV187tGCYYhY= -go.elastic.co/apm/module/apmot v1.5.0/go.mod h1:d2KYwhJParTpyw2WnTNy8geNlHKKFX+4oK3YLlsesWE= -go.elastic.co/fastjson v1.0.0/go.mod h1:PmeUOMMtLHQr9ZS9J9owrAVg0FkaZDRZJEFTTGHtchs= 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.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +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.0.0-20200513171258-e048e166ab9c/go.mod h1:xCI7ZzBfRuGgBXyXO6yfWfDmlWd35khcWpUa4L0xI/k= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.0/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 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA= -go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mozilla.org/mozlog v0.0.0-20170222151521-4bb13139d403/go.mod h1:jHoPAGnDrCy6kaI2tAze5Prf0Nr0w/oNkROt2lw3n3o= +go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= 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.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/automaxprocs v1.2.0/go.mod h1:YfO3fm683kQpzETxlTGZhGIVmXAhaw3gxeBADbpZtnU= -go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +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.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= 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 v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= -go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20180501155221-613d6eafa307/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +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-20181029021203-45a5f77698d3/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= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190312203227-4b39c73a6495/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= @@ -1373,7 +522,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1395,44 +543,28 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0 h1:8pl+sMODzuvGJkmj2W4kZihvVb5mKm8pB/X44PIQHv8= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1 h1:Kvvh58BN8Y9/lBi7hTekvtMpm07eUZ0ck5pRHpsMWrY= -golang.org/x/mod v0.4.1/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= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190424112056-4829fb13d2c6/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-20190619014844-b5b0513f8c1b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191028085509-fe3aa8a45271/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191112182307-2180aed22343/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1440,24 +572,15 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20201216054612-986b41b23924 h1:QsnDpLLOKwHBBDa8nDws4DYNc/ryVW2vCpxCs09d4PY= +golang.org/x/net v0.0.0-20201216054612-986b41b23924/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= @@ -1466,14 +589,9 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1482,294 +600,161 @@ golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190102155601-82a175fd1598/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190310054646-10058d7d4faa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190425145619-16072639606e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190602015325-4c4f7f33c9ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191025021431-6c3a3bfe00ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/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-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/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-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/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/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 h1:V066+OYJ66oTjnhm4Yrn7SXIwSCiDQJxpBxmvqb1N1c= -golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= +golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201218084310-7d0127a74742 h1:+CBz4km/0KPU3RGTwARGh/noP3bEwtHcq+0YcBQM2JQ= +golang.org/x/sys v0.0.0-20201218084310-7d0127a74742/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180805044716-cb6730876b98/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= +golang.org/x/text v0.3.4/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/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI= -golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/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-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/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= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190118193359-16909d206f00/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190425222832-ad9eeb80039a/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= 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-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= -golang.org/x/tools v0.0.0-20190813034749-528a2984e271/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/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-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190918214516-5a1a30219888/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-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191010075000-0337d82405ff/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-20191030203535-5e247c9ad0a0/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-20191111182352-50fa39b762bc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/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-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200115044656-831fdb1e1868/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200403190813-44a64ad78b9b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200426102838-f3a5411a4c3b/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200630154851-b2d8b0336632/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200706234117-b22de6825cf7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201011145850-ed2f50202694/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201028025901-8cd080b735b3/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201114224030-61ea331ec02b/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201118003311-bd56c0adb394/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210101214203-2dba1e4ea05c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210104081019-d8d6ddbec6ee/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20201218024724-ae774e9781d2 h1:lHDhNNs7asPT3p01mm8EP3B+bNyyVfg0bcYjhJUYgxw= +golang.org/x/tools v0.0.0-20201218024724-ae774e9781d2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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/v3 v3.0.1 h1:Te7hKxV52TKCbNYq3t84tzKav3xhThdvSsSp/W89IyI= -gomodules.xyz/jsonpatch/v3 v3.0.1/go.mod h1:CBhndykehEwTOlEfnsfJwvkFQbSN8YZFr9M+cIHAJto= -gomodules.xyz/orderedmap v0.1.0 h1:fM/+TGh/O1KkqGR5xjTKg6bU8OKBkg7p0Y+x/J9m8Os= -gomodules.xyz/orderedmap v0.1.0/go.mod h1:g9/TPUCm1t2gwD3j3zfV8uylyYhVdCNSi+xCEIu7yTU= -gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0= -gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= -gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ= -google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= +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.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= -google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= 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= google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.10.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= 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.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= 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/cloud v0.0.0-20151119220103-975617b05ea8/go.mod h1:0H1ncTHf11KCFhTc/+EFRbzSCOZx+VUbRMk55Yv5MYk= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20181107211654-5fc9ac540362/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-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= -google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200626011028-ee7919e894b5/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df h1:HWF6nM8ruGdu1K8IXFR+i2oT3YP+iBfZzCbC9zUfcWo= -google.golang.org/genproto v0.0.0-20200707001353-8e8330bf89df/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= 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.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.0/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1781,197 +766,95 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= -gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/fsnotify/fsnotify.v1 v1.4.7/go.mod h1:Fyux9zXlo4rWoMSIzpn9fDAYjalPqJ/K1qJ27s+7ltE= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw= -gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= -gopkg.in/imdario/mergo.v0 v0.3.7/go.mod h1:9qPP6AGrlC1G2PTNXko614FwGZvorN7MiBU0Eppok+U= -gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473/go.mod h1:N1eN2tsCx0Ydtgjl4cqmbRCsY4/+z4cYDeqwZTk6zog= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.1.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= 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.3/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.6/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/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +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= -helm.sh/helm/v3 v3.2.0 h1:V12EGAmr2DJ/fWrPo2fPdXWSIXvlXm51vGkQIXMeymE= -helm.sh/helm/v3 v3.2.0/go.mod h1:ZaXz/vzktgwjyGGFbUWtIQkscfE7WYoRGP2szqAFHR0= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.1.3 h1:qTakTkI6ni6LFD5sBwwsdSO+AQqbSIxOauHTTQKZ/7o= -honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= -howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0= -k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A= -k8s.io/api v0.0.0-20190813020757-36bff7324fb7/go.mod h1:3Iy+myeAORNCLgjd/Xu9ebwN7Vh59Bw0vh9jhoX+V58= -k8s.io/api v0.0.0-20190918155943-95b840bb6a1f/go.mod h1:uWuOHnjmNrtQomJrvEBg0c0HRNyQ+8KTEERVsK0PW48= -k8s.io/api v0.0.0-20191115095533-47f6de673b26/go.mod h1:iA/8arsvelvo4IDqIhX4IbjTEKBGgvsf2OraTuRtLFU= -k8s.io/api v0.0.0-20191122220107-b5267f2975e0/go.mod h1:vYpRfxYkMrmPPSesoHEkGNHxNKTk96REAwqm/inQbs0= -k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= -k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= -k8s.io/api v0.18.3/go.mod h1:UOaMwERbqJMfeeeHc8XJKawj4P9TgDRnViIqqBeH2QA= -k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI= -k8s.io/api v0.18.9 h1:7VDtivqwbvLOf8hmXSd/PDSSbpCBq49MELg84EYBYiQ= -k8s.io/api v0.18.9/go.mod h1:9u/h6sUh6FxfErv7QqetX1EB3yBMIYOBXzdcf0Gf0rc= -k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783/go.mod h1:xvae1SZB3E17UpV59AWc271W/Ph25N+bjPyR63X6tPY= -k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo= -k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= -k8s.io/apiextensions-apiserver v0.18.6/go.mod h1:lv89S7fUysXjLZO7ke783xOwVTm6lKizADfvUM/SS/M= -k8s.io/apiextensions-apiserver v0.18.9 h1:tVEf8rVKh5BnXORnYYCztjbf6CSyGNMt/rAIEyfU00Q= -k8s.io/apiextensions-apiserver v0.18.9/go.mod h1:JagmAhU0TVENzgUZqHJsjCSDh7YuV5o6g01G1Fwh7zI= -k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= -k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8= -k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= -k8s.io/apimachinery v0.0.0-20191115015347-3c7067801da2/go.mod h1:dXFS2zaQR8fyzuvRdJDHw2Aerij/yVGJSre0bZQSVJA= -k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= -k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.18.3/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.6/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.18.9 h1:3ZABKQx3F3xPWlsGhCfUl8W+JXRRblV6Wo2A3zn0pvY= -k8s.io/apimachinery v0.18.9/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk= -k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad/go.mod h1:XPCXEwhjaFN29a8NldXA901ElnKeKLrLtREO9ZhFyhg= -k8s.io/apiserver v0.0.0-20191122221311-9d521947b1e1/go.mod h1:RbsZY5zzBIWnz4KbctZsTVjwIuOpTp4Z8oCgFHN4kZQ= -k8s.io/apiserver v0.18.0/go.mod h1:3S2O6FeBBd6XTo0njUrLxiqk8GNy6wWOftjhJcXYnjw= -k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= -k8s.io/apiserver v0.18.6/go.mod h1:Zt2XvTHuaZjBz6EFYzpp+X4hTmgWGy8AthNVnTdm3Wg= -k8s.io/apiserver v0.18.9 h1:ziivCosB28MltECzhDBLLVKW01zCghl/lXke3B62y8g= -k8s.io/apiserver v0.18.9/go.mod h1:vXQzMtUCLsGg1Bh+7Jo2mZKHpHZFCZn8eTNSepcIA1M= -k8s.io/autoscaler v0.0.0-20190607113959-1b4f1855cb8e/go.mod h1:QEXezc9uKPT91dwqhSJq3GNI3B1HxFRQHiku9kmrsSA= -k8s.io/cli-runtime v0.18.0/go.mod h1:1eXfmBsIJosjn9LjEBUd2WVPoPAY9XGTqTFcPMIBsUQ= -k8s.io/cli-runtime v0.18.2 h1:JiTN5RgkFNTiMxHBRyrl6n26yKWAuNRlei1ZJALUmC8= -k8s.io/cli-runtime v0.18.2/go.mod h1:yfFR2sQQzDsV0VEKGZtrJwEy4hLZ2oj4ZIfodgxAHWQ= -k8s.io/client-go v0.18.9 h1:sPHX49yOtUqv1fl49TwV3f8cC0N3etSnwgFGsIsXnZc= -k8s.io/client-go v0.18.9/go.mod h1:UjkEetDmr40P9NX0Ok3Idt08FCf2I4mIHgjFsot77uY= -k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= -k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/code-generator v0.18.3/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/code-generator v0.18.9 h1:o/J5cctAlmk8zBqaz9M5JvUZvgkThDcFqebDvxltQiY= -k8s.io/code-generator v0.18.9/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= -k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090/go.mod h1:933PBGtQFJky3TEwYx4aEPZ4IxqhWh3R6DCmzqIn1hA= -k8s.io/component-base v0.0.0-20191122220729-2684fb322cb9/go.mod h1:NFuUusy/X4Tk21m21tcNUihnmp4OI7lXU7/xA+rYXkc= -k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c= -k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= -k8s.io/component-base v0.18.6/go.mod h1:knSVsibPR5K6EW2XOjEHik6sdU5nCvKMrzMt2D4In14= -k8s.io/component-base v0.18.9 h1:7G0D/PUKrVxyUxjT5HV4aTqYqhPj60erA1ab1JUw7m8= -k8s.io/component-base v0.18.9/go.mod h1:tUo4qZtV8m7t/U+0DgY+fcnn4BFZ480fZdzxOkWH4zk= -k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4= -k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.3.3/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= -k8s.io/klog v0.4.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= -k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= +k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= +k8s.io/api v0.20.4 h1:xZjKidCirayzX6tHONRQyTNDVIR55TYVqgATqo6ZULY= +k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk= +k8s.io/apiextensions-apiserver v0.20.2 h1:rfrMWQ87lhd8EzQWRnbQ4gXrniL/yTRBgYH1x1+BLlo= +k8s.io/apiextensions-apiserver v0.20.2/go.mod h1:F6TXp389Xntt+LUq3vw6HFOLttPa0V8821ogLGwb6Zs= +k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.4 h1:vhxQ0PPUUU2Ns1b9r4/UFp13UPs8cw2iOoTjnY9faa0= +k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/apiserver v0.20.2/go.mod h1:2nKd93WyMhZx4Hp3RfgH2K5PhwyTrprrkWYnI7id7jA= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE= +k8s.io/client-go v0.20.4 h1:85crgh1IotNkLpKYKZHVNI1JT86nr/iDCvq2iWKsql4= +k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= +k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= +k8s.io/code-generator v0.20.2/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.2 h1:LMmu5I0pLtwjpp5009KLuMGFqSc2S2isGw8t1hpYKLE= +k8s.io/component-base v0.20.2/go.mod h1:pzFtCiwe/ASD0iV7ySMu8SYVJjCapNM9bjvk7ptpKh0= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20190320154901-5e45bb682580/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= -k8s.io/kube-openapi v0.0.0-20190709113604-33be087ad058/go.mod h1:nfDlWeOsu3pUf4yWGL+ERqohP4YsZcBJXWMK+gkzOA4= -k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E= -k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY= -k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-state-metrics v1.7.2 h1:6vdtgXrrRRMSgnyDmgua+qvgCYv954JNfxXAtDkeLVQ= -k8s.io/kube-state-metrics v1.7.2/go.mod h1:U2Y6DRi07sS85rmVPmBFlmv+2peBcL8IWGjM+IjYA/E= -k8s.io/kubectl v0.18.0/go.mod h1:LOkWx9Z5DXMEg5KtOjHhRiC1fqJPLyCr3KtQgEolCkU= -k8s.io/kubectl v0.18.2 h1:9jnGSOC2DDVZmMUTMi0D1aed438mfQcgqa5TAzVjA1k= -k8s.io/kubectl v0.18.2/go.mod h1:OdgFa3AlsPKRpFFYE7ICTwulXOcMGXHTc+UKhHKvrb4= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= -k8s.io/metrics v0.18.0/go.mod h1:8aYTW18koXqjLVKL7Ds05RPMX9ipJZI3mywYvBOxXd4= -k8s.io/metrics v0.18.2/go.mod h1:qga8E7QfYNR9Q89cSCAjinC9pTZ7yv1XSVGUB0vJypg= -k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= -k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= -k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE= -k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= -modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= -modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= -modernc.org/strutil v1.0.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= -modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I= -mvdan.cc/gofumpt v0.1.1 h1:bi/1aS/5W00E2ny5q65w9SnKpWEF/UIOqDYBILpo9rA= -mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7 h1:HT3e4Krq+IE44tiN36RvVEb6tvqeIdtsVSsxmNPqlFU= -mvdan.cc/unparam v0.0.0-20210104141923-aac4ce9116a7/go.mod h1:hBpJkZE8H/sb+VRFvw2+rBpHNsTBcvSpk61hr8mzXZE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ= +k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/letsencrypt v0.0.3 h1:H7xDfhkaFFSYEJlKeq38RwX2jYcnTeHuDQyT+mMNMwM= -rsc.io/letsencrypt v0.0.3/go.mod h1:buyQKZ6IXrRnB7TdkHP0RyEybLx18HHyOSoTyoOLqNY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7 h1:uuHDyjllyzRyCIvvn0OBjiRB0SgBZGqHNYAmjR7fO50= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= -sigs.k8s.io/controller-runtime v0.6.0/go.mod h1:CpYf5pdNY/B352A1TFLAS2JVSlnGQ5O2cftPHndTroo= -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-tools v0.2.4/go.mod h1:m/ztfQNocGYBgTTCmFdnK94uVvgxeZeE3LtJvd/jIzA= -sigs.k8s.io/controller-tools v0.3.0 h1:y3YD99XOyWaXkiF1kd41uRvfp/64teWcrEZFuHxPhJ4= -sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/kubebuilder v1.0.9-0.20200513134826-f07a0146a40b h1:/ldZApUjz/QfKav8hg3OMYAGDrSozVgMVoDlN0VXJgk= -sigs.k8s.io/kubebuilder v1.0.9-0.20200513134826-f07a0146a40b/go.mod h1:FGPx0hvP73+bapzWoy5ePuhAJYgJjrFbPxgvWyortM0= -sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= -sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= -sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= -sigs.k8s.io/structured-merge-diff v0.0.0-20190817042607-6149e4549fca/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2IemQ4LmOcAumeiyDWXKUI2SO0NYDe3H6QGvPOVgU= -sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18= -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 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/controller-runtime v0.8.3 h1:GMHvzjTmaWHQB8HadW+dIvBoJuLvZObYJ5YoZruPRao= +sigs.k8s.io/controller-runtime v0.8.3/go.mod h1:U/l+DUopBc1ecfRZ5aviA9JDmGFQKvLf5YkZNx2e0sU= +sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= +sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/hack/boilerplate.go.txt b/hack/boilerplate.go.txt new file mode 100644 index 00000000..45dbbbbc --- /dev/null +++ b/hack/boilerplate.go.txt @@ -0,0 +1,15 @@ +/* +Copyright 2021. + +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. +*/ \ No newline at end of file diff --git a/hack/copy_manifests.sh b/hack/copy_manifests.sh deleted file mode 100755 index cc4afb78..00000000 --- a/hack/copy_manifests.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -for f in $(find deploy/olm-catalog -name "*clusterserviceversion.yaml"); do - cp $f bundle/ -done \ No newline at end of file diff --git a/main.go b/main.go new file mode 100644 index 00000000..0d1d2df6 --- /dev/null +++ b/main.go @@ -0,0 +1,148 @@ +/* +Copyright 2021. + +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. +*/ + +package main + +import ( + "flag" + "fmt" + "os" + runt "runtime" + + // 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/kubernetes" + _ "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" + ctrl "sigs.k8s.io/controller-runtime" + "sigs.k8s.io/controller-runtime/pkg/healthz" + "sigs.k8s.io/controller-runtime/pkg/log/zap" + + secv1 "github.com/openshift/api/security/v1" + + k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/api/v1alpha1" + "github.com/nginxinc/nginx-ingress-operator/controllers" + "sigs.k8s.io/controller-runtime/pkg/client/config" + //+kubebuilder:scaffold:imports +) + +var ( + scheme = runtime.NewScheme() + setupLog = ctrl.Log.WithName("setup") + version string +) + +func printVersion() { + setupLog.Info(fmt.Sprintf("Operator Version: %s", version)) + setupLog.Info(fmt.Sprintf("Go Version: %s", runt.Version())) + setupLog.Info(fmt.Sprintf("Go OS/Arch: %s/%s", runt.GOOS, runt.GOARCH)) + setupLog.Info(fmt.Sprintf("Version of kubernetes: %v", controllers.RunningK8sVersion)) +} + +func init() { + utilruntime.Must(clientgoscheme.AddToScheme(scheme)) + utilruntime.Must(k8sv1alpha1.AddToScheme(scheme)) + + //+kubebuilder:scaffold:scheme +} + +func main() { + var metricsAddr string + var enableLeaderElection bool + 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: false, + } + opts.BindFlags(flag.CommandLine) + flag.Parse() + + ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + // Get a config to talk to the apiserver + cfg, err := config.GetConfig() + if err != nil { + setupLog.Error(err, "problem getting k8s config") + os.Exit(1) + } + clientset, err := kubernetes.NewForConfig(cfg) + if err != nil { + setupLog.Error(err, "problem creating clientset") + os.Exit(1) + } + controllers.RunningK8sVersion, err = controllers.GetK8sVersion(clientset) + if err != nil { + setupLog.Error(err, "problem getting k8s version") + os.Exit(1) + } + + printVersion() + + mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ + Scheme: scheme, + MetricsBindAddress: metricsAddr, + Port: 9443, + HealthProbeBindAddress: probeAddr, + LeaderElection: enableLeaderElection, + LeaderElectionID: "ca5c10a7.nginx.org", + }) + if err != nil { + setupLog.Error(err, "unable to start manager") + os.Exit(1) + } + + // Setup Scheme for SCC if deployed in OpenShift + sccAPIExists, err := controllers.VerifySCCAPIExists() + if err != nil { + setupLog.Error(err, "could not check if SCC API exists") + os.Exit(1) + } + + if sccAPIExists { + utilruntime.Must(secv1.AddToScheme(scheme)) + } + + if err = (&controllers.NginxIngressControllerReconciler{ + Client: mgr.GetClient(), + Scheme: mgr.GetScheme(), + SccAPIExists: sccAPIExists, + Mgr: mgr, + }).SetupWithManager(mgr); err != nil { + setupLog.Error(err, "unable to create controller", "controller", "NginxIngressController") + os.Exit(1) + } + //+kubebuilder:scaffold:builder + if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { + setupLog.Error(err, "unable to set up health check") + os.Exit(1) + } + if err := mgr.AddReadyzCheck("readyz", 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") + os.Exit(1) + } +} diff --git a/pkg/apis/addtoscheme_k8s_v1alpha1.go b/pkg/apis/addtoscheme_k8s_v1alpha1.go deleted file mode 100644 index a118df99..00000000 --- a/pkg/apis/addtoscheme_k8s_v1alpha1.go +++ /dev/null @@ -1,10 +0,0 @@ -package apis - -import ( - "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" -) - -func init() { - // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back - AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme) -} diff --git a/pkg/apis/apis.go b/pkg/apis/apis.go deleted file mode 100644 index 07dc9616..00000000 --- a/pkg/apis/apis.go +++ /dev/null @@ -1,13 +0,0 @@ -package apis - -import ( - "k8s.io/apimachinery/pkg/runtime" -) - -// AddToSchemes may be used to add all resources defined in the project to a Scheme -var AddToSchemes runtime.SchemeBuilder - -// AddToScheme adds all Resources to the Scheme -func AddToScheme(s *runtime.Scheme) error { - return AddToSchemes.AddToScheme(s) -} diff --git a/pkg/apis/k8s/group.go b/pkg/apis/k8s/group.go deleted file mode 100644 index 8168e37f..00000000 --- a/pkg/apis/k8s/group.go +++ /dev/null @@ -1,6 +0,0 @@ -// Package k8s contains k8s API versions. -// -// This file ensures Go source parsers acknowledge the k8s package -// and any child packages. It can be removed if any other Go source files are -// added to this package. -package k8s diff --git a/pkg/apis/k8s/v1alpha1/doc.go b/pkg/apis/k8s/v1alpha1/doc.go deleted file mode 100644 index e0074b7d..00000000 --- a/pkg/apis/k8s/v1alpha1/doc.go +++ /dev/null @@ -1,4 +0,0 @@ -// Package v1alpha1 contains API Schema definitions for the k8s v1alpha1 API group -// +k8s:deepcopy-gen=package,register -// +groupName=k8s.nginx.org -package v1alpha1 diff --git a/pkg/apis/k8s/v1alpha1/register.go b/pkg/apis/k8s/v1alpha1/register.go deleted file mode 100644 index e73b8dea..00000000 --- a/pkg/apis/k8s/v1alpha1/register.go +++ /dev/null @@ -1,19 +0,0 @@ -// NOTE: Boilerplate only. Ignore this file. - -// Package v1alpha1 contains API Schema definitions for the k8s v1alpha1 API group -// +k8s:deepcopy-gen=package,register -// +groupName=k8s.nginx.org -package v1alpha1 - -import ( - "k8s.io/apimachinery/pkg/runtime/schema" - "sigs.k8s.io/controller-runtime/pkg/scheme" -) - -var ( - // SchemeGroupVersion is group version used to register these objects - SchemeGroupVersion = schema.GroupVersion{Group: "k8s.nginx.org", Version: "v1alpha1"} - - // SchemeBuilder is used to add go types to the GroupVersionKind scheme - SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion} -) diff --git a/pkg/controller/add_nginxingresscontroller.go b/pkg/controller/add_nginxingresscontroller.go deleted file mode 100644 index 467efdbd..00000000 --- a/pkg/controller/add_nginxingresscontroller.go +++ /dev/null @@ -1,10 +0,0 @@ -package controller - -import ( - "github.com/nginxinc/nginx-ingress-operator/pkg/controller/nginxingresscontroller" -) - -func init() { - // AddToManagerFuncs is a list of functions to create controllers and add them to a manager. - AddToManagerFuncs = append(AddToManagerFuncs, nginxingresscontroller.Add) -} diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go deleted file mode 100644 index 7c069f3e..00000000 --- a/pkg/controller/controller.go +++ /dev/null @@ -1,18 +0,0 @@ -package controller - -import ( - "sigs.k8s.io/controller-runtime/pkg/manager" -) - -// AddToManagerFuncs is a list of functions to add all Controllers to the Manager -var AddToManagerFuncs []func(manager.Manager) error - -// AddToManager adds all Controllers to the Manager -func AddToManager(m manager.Manager) error { - for _, f := range AddToManagerFuncs { - if err := f(m); err != nil { - return err - } - } - return nil -} diff --git a/pkg/controller/nginxingresscontroller/configmap.go b/pkg/controller/nginxingresscontroller/configmap.go deleted file mode 100644 index 42dc0ba5..00000000 --- a/pkg/controller/nginxingresscontroller/configmap.go +++ /dev/null @@ -1,24 +0,0 @@ -package nginxingresscontroller - -import ( - "reflect" - - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - v1 "k8s.io/api/core/v1" -) - -func configMapForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *v1.ConfigMap { - return &v1.ConfigMap{ - ObjectMeta: metav1.ObjectMeta{ - Name: instance.Name, - Namespace: instance.Namespace, - }, - Data: instance.Spec.ConfigMapData, - } -} - -func hasConfigMapChanged(cm *v1.ConfigMap, instance *k8sv1alpha1.NginxIngressController) bool { - return !reflect.DeepEqual(cm.Data, instance.Spec.ConfigMapData) -} diff --git a/pkg/controller/nginxingresscontroller/configmap_test.go b/pkg/controller/nginxingresscontroller/configmap_test.go deleted file mode 100644 index 05b08f03..00000000 --- a/pkg/controller/nginxingresscontroller/configmap_test.go +++ /dev/null @@ -1,51 +0,0 @@ -package nginxingresscontroller - -import ( - "reflect" - "testing" - - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -func TestConfigMapForNginxIngressController(t *testing.T) { - instance := &k8sv1alpha1.NginxIngressController{ - ObjectMeta: metav1.ObjectMeta{ - Name: "my-nginx-ingress-controller", - Namespace: "my-nginx-ingress-controller", - }, - } - expected := &v1.ConfigMap{ - ObjectMeta: metav1.ObjectMeta{ - Name: "my-nginx-ingress-controller", - Namespace: "my-nginx-ingress-controller", - }, - } - - result := configMapForNginxIngressController(instance) - if !reflect.DeepEqual(result, expected) { - t.Errorf("configMapForNginxIngressController(%+v) returned %+v but expected %+v", instance, result, expected) - } -} - -func TestHasConfigMapChanged(t *testing.T) { - cm1 := &v1.ConfigMap{ - ObjectMeta: metav1.ObjectMeta{ - Name: "my-nginx-ingress-controller", - Namespace: "my-nginx-ingress-controller", - }, - } - - instance := &k8sv1alpha1.NginxIngressController{Spec: k8sv1alpha1.NginxIngressControllerSpec{}} - result := hasConfigMapChanged(cm1, instance) - if result != false { - t.Errorf("hasConfigMapChanged(%v, %v) returned %v but expected %v for the case of same configmaps.", cm1, instance, result, false) - } - - instance.Spec.ConfigMapData = map[string]string{"key": "value"} - result = hasConfigMapChanged(cm1, instance) - if result != true { - t.Errorf("hasConfigMapChanged(%v, %v) returned %v but expected %v for the case of different configmaps.", cm1, instance, result, true) - } -} diff --git a/pkg/controller/nginxingresscontroller/crds.go b/pkg/controller/nginxingresscontroller/crds.go deleted file mode 100644 index ab8d6acc..00000000 --- a/pkg/controller/nginxingresscontroller/crds.go +++ /dev/null @@ -1,59 +0,0 @@ -package nginxingresscontroller - -import ( - "fmt" - "io/ioutil" - "os" - - v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - "k8s.io/apimachinery/pkg/util/yaml" -) - -const crdsPath = "/kic_crds" -const decoderBufferSize = 100 - -func getCRDsManifests() ([]string, error) { - files, err := ioutil.ReadDir(crdsPath) - if err != nil { - return nil, err - } - - var manifests []string - for _, f := range files { - manifests = append(manifests, fmt.Sprintf("%v/%v", crdsPath, f.Name())) - } - - return manifests, nil -} - -func kicCRDs() ([]*v1.CustomResourceDefinition, error) { - manifests, err := getCRDsManifests() - if err != nil { - return nil, err - } - - var crds []*v1.CustomResourceDefinition - for _, path := range manifests { - f, err := os.Open(path) - if err != nil { - return nil, fmt.Errorf("failed to open the CRD manifest %v: %v", path, err) - } - - var crd v1.CustomResourceDefinition - - err = yaml.NewYAMLOrJSONDecoder(f, decoderBufferSize).Decode(&crd) - - if err != nil { - return nil, fmt.Errorf("failed to parse the CRD manifest %v: %v", path, err) - } - - err = f.Close() - if err != nil { - return nil, fmt.Errorf("failed to close the CRD manifest %v: %v", path, err) - } - - crds = append(crds, &crd) - } - - return crds, nil -} diff --git a/pkg/controller/nginxingresscontroller/nginxingresscontroller_controller.go b/pkg/controller/nginxingresscontroller/nginxingresscontroller_controller.go deleted file mode 100644 index 23a4a743..00000000 --- a/pkg/controller/nginxingresscontroller/nginxingresscontroller_controller.go +++ /dev/null @@ -1,692 +0,0 @@ -package nginxingresscontroller - -import ( - "context" - commonerrors "errors" - "fmt" - "strings" - - "github.com/go-logr/logr" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - "github.com/operator-framework/operator-sdk/pkg/k8sutil" - appsv1 "k8s.io/api/apps/v1" - rbacv1 "k8s.io/api/rbac/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/version" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - - v1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/types" - - apixv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/controller" - "sigs.k8s.io/controller-runtime/pkg/handler" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/source" -) - -var log = logf.Log.WithName("controller_nginxingresscontroller") - -const ( - clusterRoleName = "nginx-ingress-role" - sccName = "nginx-ingress-scc" - finalizer = "finalizer.nginxingresscontroller.k8s.nginx.org" -) - -// Add creates a new NginxIngressController Controller and adds it to the Manager. The Manager will set fields on the Controller -// and Start it when the Manager is Started. -func Add(mgr manager.Manager) error { - sccAPIExists, err := VerifySCCAPIExists() - if err != nil { - return err - } - - return add(mgr, newReconciler(mgr, sccAPIExists), sccAPIExists) -} - -// newReconciler returns a new reconcile.Reconciler -func newReconciler(mgr manager.Manager, sccAPIExists bool) reconcile.Reconciler { - return &ReconcileNginxIngressController{client: mgr.GetClient(), scheme: mgr.GetScheme(), sccAPIExists: sccAPIExists} -} - -// isLocal returns true if the Operator is running locally and false if running inside a cluster -func isLocal() bool { - _, err := k8sutil.GetOperatorNamespace() - if err != nil { - if commonerrors.Is(err, k8sutil.ErrRunLocal) { - return true - } - } - - return false -} - -func createKICCustomResourceDefinitions(mgr manager.Manager) error { - reqLogger := log.WithValues("Request.Namespace", "", "Request.Name", "nginxingresscontroller-controller") - - if isLocal() { - reqLogger.Info("Skipping KIC CRDs creation; not running in a cluster") - return nil - } - - // Create CRDs with a different client (apiextensions) - apixClient, err := apixv1client.NewForConfig(mgr.GetConfig()) - if err != nil { - reqLogger.Error(err, "unable to create client for CRD registration") - return err - } - - crds, err := kicCRDs() - - if err != nil { - return err - } - - crdsClient := apixClient.CustomResourceDefinitions() - for _, crd := range crds { - oldCRD, err := crdsClient.Get(context.TODO(), crd.Name, metav1.GetOptions{}) - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info(fmt.Sprintf("no previous CRD %v found, creating a new one.", crd.Name)) - _, err = crdsClient.Create(context.TODO(), crd, metav1.CreateOptions{}) - if err != nil { - return fmt.Errorf("error creating CustomResourceDefinition %v: %v", crd.Name, err) - } - } else { - return fmt.Errorf("error getting CustomResourceDefinition %v: %v", crd.Name, err) - } - } else { - // Update CRDs if they already exist - reqLogger.Info(fmt.Sprintf("previous CustomResourceDefinition %v found, updating.", crd.Name)) - oldCRD.Spec = crd.Spec - _, err = crdsClient.Update(context.TODO(), oldCRD, metav1.UpdateOptions{}) - if err != nil { - return fmt.Errorf("error updating CustomResourceDefinition %v: %v", crd.Name, err) - } - } - } - - return nil -} - -// create common resources shared by all the Ingress Controllers -func createCommonResources(mgr manager.Manager, sccAPIExists bool) error { - reqLogger := log.WithValues("Request.Namespace", "", "Request.Name", "nginxingresscontroller-controller") - - // Create ClusterRole and ClusterRoleBinding for all the NginxIngressController resources. - clientReader := mgr.GetAPIReader() - clientWriter := mgr.GetClient() - cr := clusterRoleForNginxIngressController(clusterRoleName) - - err := clientReader.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, cr) - - if err != nil { - if errors.IsNotFound(err) { - reqLogger.Info("no previous ClusterRole found, creating a new one.") - err = clientWriter.Create(context.TODO(), cr) - if err != nil { - return fmt.Errorf("error creating ClusterRole: %v", err) - } - } else { - return fmt.Errorf("error getting ClusterRole: %v", err) - } - } else { - // For updates in the ClusterRole permissions (eg new CRDs of the Ingress Controller). - reqLogger.Info("previous ClusterRole found, updating.") - cr := clusterRoleForNginxIngressController(clusterRoleName) - err = clientWriter.Update(context.TODO(), cr) - if err != nil { - return fmt.Errorf("error updating ClusterRole: %v", err) - } - } - - crb := clusterRoleBindingForNginxIngressController(clusterRoleName) - - err = clientReader.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) - if err != nil && errors.IsNotFound(err) { - reqLogger.Info("no previous ClusterRoleBinding found, creating a new one.") - err = clientWriter.Create(context.TODO(), crb) - } - - if err != nil { - return fmt.Errorf("error creating ClusterRoleBinding: %v", err) - } - - err = createKICCustomResourceDefinitions(mgr) - if err != nil { - return fmt.Errorf("error creating KIC CRDs: %v", err) - } - - if sccAPIExists { - reqLogger.Info("OpenShift detected as platform.") - - scc := sccForNginxIngressController(sccName) - - err = clientReader.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) - if err != nil && errors.IsNotFound(err) { - reqLogger.Info("no previous SecurityContextConstraints found, creating a new one.") - err = clientWriter.Create(context.TODO(), scc) - } - - if err != nil { - return fmt.Errorf("error creating SecurityContextConstraints: %v", err) - } - } - - return nil -} - -// add adds a new Controller to mgr with r as the reconcile.Reconciler -func add(mgr manager.Manager, r reconcile.Reconciler, sccAPIExists bool) error { - // Create a new controller - c, err := controller.New("nginxingresscontroller-controller", mgr, controller.Options{Reconciler: r}) - if err != nil { - return err - } - - // Create common resources - err = createCommonResources(mgr, sccAPIExists) - if err != nil { - return err - } - - // Watch for changes to primary resource NginxIngressController - err = c.Watch(&source.Kind{Type: &k8sv1alpha1.NginxIngressController{}}, &handler.EnqueueRequestForObject{}) - if err != nil { - return err - } - - // Watch for changes to any of the following resources where NginxIngressController is their owner - err = c.Watch(&source.Kind{Type: &appsv1.Deployment{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - err = c.Watch(&source.Kind{Type: &appsv1.DaemonSet{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - err = c.Watch(&source.Kind{Type: &v1.ServiceAccount{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - err = c.Watch(&source.Kind{Type: &v1.Service{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - err = c.Watch(&source.Kind{Type: &v1.ConfigMap{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - err = c.Watch(&source.Kind{Type: &v1.Secret{}}, &handler.EnqueueRequestForOwner{ - IsController: true, - OwnerType: &k8sv1alpha1.NginxIngressController{}, - }) - if err != nil { - return err - } - - return nil -} - -// checkPrerequisites creates all necessary objects before the deployment of a new Ingress Controller. -func (r *ReconcileNginxIngressController) checkPrerequisites(reqLogger logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { - sa := serviceAccountForNginxIngressController(instance) - err := controllerutil.SetControllerReference(instance, sa, r.scheme) - if err != nil { - return err - } - - err, existed := r.createIfNotExists(sa) - if err != nil { - return err - } - - if !existed { - reqLogger.Info("ServiceAccount created", "ServiceAccount.Namespace", sa.Namespace, "ServiceAccount.Name", sa.Name) - } - - // Assign this new ServiceAccount to the ClusterRoleBinding (if is not present already) - crb := clusterRoleBindingForNginxIngressController(clusterRoleName) - - err = r.client.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) - if err != nil { - return err - } - - subject := subjectForServiceAccount(sa.Namespace, sa.Name) - found := false - for _, s := range crb.Subjects { - if s.Name == subject.Name && s.Namespace == subject.Namespace { - found = true - break - } - } - - if !found { - crb.Subjects = append(crb.Subjects, subject) - - err = r.client.Update(context.TODO(), crb) - if err != nil { - return err - } - } - - cm := configMapForNginxIngressController(instance) - - err = controllerutil.SetControllerReference(instance, cm, r.scheme) - if err != nil { - return err - } - - err, existed = r.createIfNotExists(cm) - if err != nil { - return err - } - - if !existed { - reqLogger.Info("ConfigMap created", "ConfigMap.Namespace", cm.Namespace, "ConfigMap.Name", cm.Name) - } - - // IngressClass is available from k8s 1.18+ - minVersion, _ := version.ParseGeneric("v1.18.0") - if RunningK8sVersion.AtLeast(minVersion) { - if instance.Spec.IngressClass == "" { - instance.Spec.IngressClass = "nginx" - reqLogger.Info("Warning! IngressClass not set, using default", "IngressClass.Name", instance.Spec.IngressClass) - } - ic := ingressClassForNginxIngressController(instance) - - err, existed = r.createIfNotExists(ic) - if err != nil { - return err - } - - if !existed { - reqLogger.Info("IngressClass created", "IngressClass.Name", ic.Name) - } - } - - if instance.Spec.DefaultSecret == "" { - err = r.client.Get(context.TODO(), types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, &v1.Secret{}) - - if err != nil && errors.IsNotFound(err) { - secret, err := defaultSecretForNginxIngressController(instance) - if err != nil { - return err - } - - err = controllerutil.SetControllerReference(instance, secret, r.scheme) - if err != nil { - return err - } - - err = r.client.Create(context.TODO(), secret) - if err != nil { - return err - } - - reqLogger.Info("Warning! A custom self-signed TLS Secret has been created for the default server. "+ - "Update your 'DefaultSecret' with your own Secret in Production", - "Secret.Namespace", secret.Namespace, "Secret.Name", secret.Name) - - } else if err != nil { - return err - } - } - - if r.sccAPIExists { - // Assign this new User to the SCC (if is not present already) - scc := sccForNginxIngressController(sccName) - - err = r.client.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) - if err != nil { - return err - } - - user := userForSCC(sa.Namespace, sa.Name) - found := false - for _, u := range scc.Users { - if u == user { - found = true - break - } - } - - if !found { - scc.Users = append(scc.Users, user) - - err = r.client.Update(context.TODO(), scc) - if err != nil { - return err - } - } - } - - return nil -} - -// blank assignment to verify that ReconcileNginxIngressController implements reconcile.Reconciler -var _ reconcile.Reconciler = &ReconcileNginxIngressController{} - -// ReconcileNginxIngressController reconciles a NginxIngressController object -type ReconcileNginxIngressController struct { - // This client, initialized using mgr.Client() above, is a split client - // that reads objects from the cache and writes to the apiserver - client client.Client - scheme *runtime.Scheme - sccAPIExists bool -} - -// Reconcile reads that state of the cluster for a NginxIngressController object and makes changes based on the state read -// and what is in the NginxIngressController.Spec -// The Controller will requeue the Request to be processed again if the returned error is non-nil or -// Result.Requeue is true, otherwise upon completion it will remove the work from the queue. -func (r *ReconcileNginxIngressController) Reconcile(request reconcile.Request) (reconcile.Result, error) { - reqLogger := log.WithValues("Request.Namespace", request.Namespace, "Request.Name", request.Name) - reqLogger.Info("Reconciling NginxIngressController") - - instance := &k8sv1alpha1.NginxIngressController{} - err := r.client.Get(context.TODO(), request.NamespacedName, instance) - if err != nil && 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 - return reconcile.Result{}, nil - } else if err != nil { - // Error reading the object - requeue the request. - return reconcile.Result{}, err - } - - if instance.GetDeletionTimestamp() != nil { - err = r.handleDeletion(reqLogger, instance) - if err != nil { - return reconcile.Result{}, err - } - - reqLogger.Info("NginxIngressController was successfully deleted") - return reconcile.Result{}, nil - } - - err = r.ensureFinalizer(reqLogger, instance) - if err != nil { - return reconcile.Result{}, err - } - - // Namespace could have been deleted in the middle of the reconcile - ns := &v1.Namespace{} - err = r.client.Get(context.TODO(), types.NamespacedName{Name: instance.Namespace, Namespace: v1.NamespaceAll}, ns) - if (err != nil && errors.IsNotFound(err)) || (ns.Status.Phase == "Terminating") { - reqLogger.Info(fmt.Sprintf("The namespace '%v' does not exist or is in Terminating status, canceling Reconciling", instance.Namespace)) - return reconcile.Result{}, nil - } else if err != nil { - reqLogger.Error(err, "Failed to check if namespace exists") - return reconcile.Result{}, err - } - - err = r.checkPrerequisites(reqLogger, instance) - if err != nil { - return reconcile.Result{}, err - } - - if strings.ToLower(instance.Spec.Type) == "deployment" { - dep := deploymentForNginxIngressController(instance) - found := &appsv1.Deployment{} - err = r.client.Get(context.TODO(), types.NamespacedName{Name: dep.Name, Namespace: dep.Namespace}, found) - if err != nil && errors.IsNotFound(err) { - reqLogger.Info("Creating a new Deployment for NGINX Ingress Controller", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name) - - err = controllerutil.SetControllerReference(instance, dep, r.scheme) - if err != nil { - reqLogger.Error(err, "Error setting controller reference") - return reconcile.Result{}, err - } - - err = r.client.Create(context.TODO(), dep) - if err != nil { - reqLogger.Error(err, "Failed to create new Deployment", "Deployment.Namespace", dep.Namespace, "Deployment.Name", dep.Name) - return reconcile.Result{}, err - } - } else if err != nil { - return reconcile.Result{}, err - } else if hasDeploymentChanged(found, instance) { - reqLogger.Info("NginxIngressController spec has changed, updating Deployment") - updated := updateDeployment(found, instance) - err = r.client.Update(context.TODO(), updated) - if err != nil { - return reconcile.Result{}, err - } - } - - // Remove possible DaemonSet - ds := daemonSetForNginxIngressController(instance) - err = r.deleteIfExists(ds.Name, ds.Namespace, ds) - if err != nil { - return reconcile.Result{}, err - } - } else if strings.ToLower(instance.Spec.Type) == "daemonset" { - ds := daemonSetForNginxIngressController(instance) - found := &appsv1.DaemonSet{} - err = r.client.Get(context.TODO(), types.NamespacedName{Name: ds.Name, Namespace: ds.Namespace}, found) - if err != nil && errors.IsNotFound(err) { - reqLogger.Info("Creating a new DaemonSet for NGINX Ingress Controller", "DaemonSet.Namespace", ds.Namespace, "DaemonSet.Name", ds.Name) - - err = controllerutil.SetControllerReference(instance, ds, r.scheme) - if err != nil { - reqLogger.Error(err, "Error setting controller reference") - return reconcile.Result{}, err - } - - err = r.client.Create(context.TODO(), ds) - if err != nil { - reqLogger.Error(err, "Failed to create new DaemonSet", "DaemonSet.Namespace", ds.Namespace, "DaemonSet.Name", ds.Name) - return reconcile.Result{}, err - } - } else if err != nil { - return reconcile.Result{}, err - } else if hasDaemonSetChanged(ds, instance) { - reqLogger.Info("NginxIngressController spec has changed, updating DaemonSet") - updated := updateDaemonSet(found, instance) - err = r.client.Update(context.TODO(), updated) - if err != nil { - return reconcile.Result{}, err - } - } - - // Remove possible Deployment - dep := deploymentForNginxIngressController(instance) - err = r.deleteIfExists(dep.Name, dep.Namespace, dep) - if err != nil { - return reconcile.Result{}, err - } - } - - svc := serviceForNginxIngressController(instance) - svcFound := &v1.Service{} - err = r.client.Get(context.TODO(), types.NamespacedName{Name: svc.Name, Namespace: svc.Namespace}, svcFound) - if err != nil && errors.IsNotFound(err) { - reqLogger.Info("Creating a new Service for NGINX Ingress Controller", "Service.Namespace", svc.Namespace, "Service.Name", svc.Name) - - err = controllerutil.SetControllerReference(instance, svc, r.scheme) - if err != nil { - reqLogger.Error(err, "Error setting controller reference") - return reconcile.Result{}, err - } - - err = r.client.Create(context.TODO(), svc) - if err != nil { - reqLogger.Error(err, "Failed to create new Service", "Service.Namespace", svc.Namespace, "Service.Name", svc.Name) - return reconcile.Result{}, err - } - } else if err != nil { - return reconcile.Result{}, err - } else if hasServiceChanged(svcFound, instance) { - reqLogger.Info("NginxIngressController spec has changed, updating Service") - updated := updateService(svcFound, instance) - err = r.client.Update(context.TODO(), updated) - if err != nil { - return reconcile.Result{}, err - } - } - - cm := configMapForNginxIngressController(instance) - cmFound := &v1.ConfigMap{} - err = r.client.Get(context.TODO(), types.NamespacedName{Namespace: cm.Namespace, Name: cm.Name}, cmFound) - if err != nil { - return reconcile.Result{}, err - } else { - if hasConfigMapChanged(cmFound, instance) { - err = r.client.Update(context.TODO(), cm) - reqLogger.Info("NginxIngressController spec has changed, updating ConfigMap") - if err != nil { - return reconcile.Result{}, err - } - } - } - - if !instance.Status.Deployed { - instance.Status.Deployed = true - err := r.client.Status().Update(context.TODO(), instance) - if err != nil { - return reconcile.Result{}, err - } - } - - reqLogger.Info("Finish reconcile for NginxIngressController") - return reconcile.Result{}, nil -} - -// createIfNotExists creates a new object. If the object exists, does nothing. It returns whether the object existed before or not. -func (r *ReconcileNginxIngressController) createIfNotExists(object runtime.Object) (error, bool) { - err := r.client.Create(context.TODO(), object) - if err != nil && errors.IsAlreadyExists(err) { - return nil, true - } - - return err, false -} - -// deleteIfExists deletes an object if it exists in the cluster. -func (r *ReconcileNginxIngressController) deleteIfExists(name string, namespace string, object runtime.Object) error { - err := r.client.Get(context.TODO(), types.NamespacedName{Name: name, Namespace: namespace}, object) - if err != nil && !errors.IsNotFound(err) { - return err - } - - if err == nil { - err := r.client.Delete(context.TODO(), object) - if err != nil { - return err - } - } - - return nil -} - -func (r *ReconcileNginxIngressController) finalizeNginxIngressController(reqLogger logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { - crb := clusterRoleBindingForNginxIngressController(clusterRoleName) - - err := r.client.Get(context.TODO(), types.NamespacedName{Name: clusterRoleName, Namespace: v1.NamespaceAll}, crb) - if err != nil { - return err - } - - var subjects []rbacv1.Subject - for _, s := range crb.Subjects { - if s.Name != instance.Name || s.Namespace != instance.Namespace { - subjects = append(subjects, s) - } - } - - crb.Subjects = subjects - - err = r.client.Update(context.TODO(), crb) - if err != nil { - return err - } - - if r.sccAPIExists { - scc := sccForNginxIngressController(sccName) - - err := r.client.Get(context.TODO(), types.NamespacedName{Name: sccName, Namespace: v1.NamespaceAll}, scc) - if err != nil { - return err - } - - var users []string - for _, u := range scc.Users { - if u != userForSCC(instance.Namespace, instance.Name) { - users = append(users, u) - } - } - - scc.Users = users - - err = r.client.Update(context.TODO(), scc) - if err != nil { - return err - } - } - - reqLogger.Info("Successfully finalized NginxIngressController") - return nil -} - -func (r *ReconcileNginxIngressController) addFinalizer(reqLogger logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { - reqLogger.Info("Adding Finalizer for the NginxIngressController") - instance.SetFinalizers(append(instance.GetFinalizers(), finalizer)) - - err := r.client.Update(context.TODO(), instance) - if err != nil { - reqLogger.Error(err, "Failed to update NginxIngressController with finalizer") - return err - } - - return nil -} - -func (r *ReconcileNginxIngressController) handleDeletion(reqLogger logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { - if !contains(instance.GetFinalizers(), finalizer) { - return nil - } - - err := r.finalizeNginxIngressController(reqLogger, instance) - if err != nil { - return err - } - - instance.SetFinalizers(remove(instance.GetFinalizers(), finalizer)) - return r.client.Update(context.TODO(), instance) -} - -func (r *ReconcileNginxIngressController) ensureFinalizer(reqLogger logr.Logger, instance *k8sv1alpha1.NginxIngressController) error { - if contains(instance.GetFinalizers(), finalizer) { - return nil - } - - return r.addFinalizer(reqLogger, instance) -} diff --git a/pkg/controller/nginxingresscontroller/service_test.go b/pkg/controller/nginxingresscontroller/service_test.go deleted file mode 100644 index b9f0bc44..00000000 --- a/pkg/controller/nginxingresscontroller/service_test.go +++ /dev/null @@ -1,322 +0,0 @@ -package nginxingresscontroller - -import ( - "testing" - - "github.com/google/go-cmp/cmp" - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - corev1 "k8s.io/api/core/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" -) - -func TestServiceForNginxIngressController(t *testing.T) { - name := "my-service" - namespace := "my-nginx-ingress" - extraLabels := map[string]string{"app": "my-nginx-ingress"} - - instance := &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - Service: &k8sv1alpha1.Service{ - ExtraLabels: extraLabels, - }, - }, - } - expected := &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: corev1.ServiceSpec{ - Ports: []corev1.ServicePort{ - { - Name: "http", - Protocol: "TCP", - Port: 80, - TargetPort: intstr.IntOrString{ - Type: 0, - IntVal: 80, - }, - }, - { - Name: "https", - Protocol: "TCP", - Port: 443, - TargetPort: intstr.IntOrString{ - Type: 0, - IntVal: 443, - }, - }, - }, - Selector: map[string]string{"app": instance.Name}, - Type: corev1.ServiceTypeLoadBalancer, - }, - } - - result := serviceForNginxIngressController(instance) - if diff := cmp.Diff(expected, result); diff != "" { - t.Errorf("serviceForNginxIngressController() mismatch (-want +got):\n%s", diff) - } -} - -func TestHasServiceChanged(t *testing.T) { - name := "my-service" - namespace := "my-nginx-ingress" - extraLabels := map[string]string{"app": "my-nginx-ingress"} - - tests := []struct { - svc *corev1.Service - instance *k8sv1alpha1.NginxIngressController - expected bool - msg string - }{ - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - }, - }, - false, - "no changes", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: "NodePort", - }, - }, - true, - "different service type", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - Service: &k8sv1alpha1.Service{ - ExtraLabels: map[string]string{"new": "label"}, - }, - }, - }, - true, - "different label", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - Service: &k8sv1alpha1.Service{ - ExtraLabels: nil, - }, - }, - }, - true, - "remove label", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - }, - }, - true, - "remove service parameters", - }, - } - for _, test := range tests { - result := hasServiceChanged(test.svc, test.instance) - if result != test.expected { - t.Errorf("hasServiceChanged() = %v, want %v for the case of %v", result, test.expected, test.msg) - } - } -} - -func TestUpdateService(t *testing.T) { - name := "my-service" - namespace := "my-nginx-ingress" - extraLabels := map[string]string{"app": "my-nginx-ingress"} - - tests := []struct { - svc *corev1.Service - instance *k8sv1alpha1.NginxIngressController - expected *corev1.Service - msg string - }{ - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeNodePort), - }, - }, - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeNodePort, - }, - }, - "override service type", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: map[string]string{"my": "labelToBeOverridden"}, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - Service: &k8sv1alpha1.Service{ - ExtraLabels: extraLabels, - }, - }, - }, - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: extraLabels, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - "override labels", - }, - { - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - Labels: map[string]string{"my": "labelToBeRemoved"}, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: k8sv1alpha1.NginxIngressControllerSpec{ - ServiceType: string(corev1.ServiceTypeLoadBalancer), - }, - }, - &corev1.Service{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - Spec: corev1.ServiceSpec{ - Type: corev1.ServiceTypeLoadBalancer, - }, - }, - "remove labels", - }, - } - for _, test := range tests { - result := updateService(test.svc, test.instance) - if diff := cmp.Diff(test.expected, result); diff != "" { - t.Errorf("updateService() mismatch for the case of %v (-want +got):\n%s", test.msg, diff) - } - } -} diff --git a/pkg/controller/nginxingresscontroller/serviceaccount.go b/pkg/controller/nginxingresscontroller/serviceaccount.go deleted file mode 100644 index 3cee134b..00000000 --- a/pkg/controller/nginxingresscontroller/serviceaccount.go +++ /dev/null @@ -1,16 +0,0 @@ -package nginxingresscontroller - -import ( - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - corev1 "k8s.io/api/core/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -func serviceAccountForNginxIngressController(instance *k8sv1alpha1.NginxIngressController) *corev1.ServiceAccount { - return &corev1.ServiceAccount{ - ObjectMeta: v1.ObjectMeta{ - Name: instance.Name, - Namespace: instance.Namespace, - }, - } -} diff --git a/pkg/controller/nginxingresscontroller/serviceaccount_test.go b/pkg/controller/nginxingresscontroller/serviceaccount_test.go deleted file mode 100644 index eb2c3eb2..00000000 --- a/pkg/controller/nginxingresscontroller/serviceaccount_test.go +++ /dev/null @@ -1,32 +0,0 @@ -package nginxingresscontroller - -import ( - "reflect" - "testing" - - k8sv1alpha1 "github.com/nginxinc/nginx-ingress-operator/pkg/apis/k8s/v1alpha1" - corev1 "k8s.io/api/core/v1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" -) - -func TestServiceAccountForNginxIngressController(t *testing.T) { - namespace := "my-nginx-ingress" - name := "my-sa" - instance := &k8sv1alpha1.NginxIngressController{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - } - expected := &corev1.ServiceAccount{ - ObjectMeta: v1.ObjectMeta{ - Name: name, - Namespace: namespace, - }, - } - - result := serviceAccountForNginxIngressController(instance) - if !reflect.DeepEqual(result, expected) { - t.Errorf("serviceAccountForNginxIngressController(%v) returned %+v but expected %+v", instance, result, expected) - } -} diff --git a/tools.go b/tools.go deleted file mode 100644 index 9fad3c97..00000000 --- a/tools.go +++ /dev/null @@ -1,10 +0,0 @@ -// +build tools - -// Place any runtime dependencies as imports in this file. -// Go modules will be forced to download and install them. -package tools - -import ( - _ "github.com/golangci/golangci-lint/cmd/golangci-lint" - _ "github.com/operator-framework/operator-sdk/cmd/operator-sdk" -) diff --git a/version/version.go b/version/version.go deleted file mode 100644 index a33bb345..00000000 --- a/version/version.go +++ /dev/null @@ -1,3 +0,0 @@ -package version - -var Version = "0.2.0"