Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pre commit #67

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@ config/manager/kustomization.yaml

# Common CI tools repository
CI_TOOLS_REPO

#ignore go.work as it is generated on the fly
go.work
go.work.sum
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -288,3 +288,15 @@ golangci: get-ci-tools
# Run go lint against code
golint: get-ci-tools
PATH=$(GOBIN):$(PATH); $(CI_TOOLS_REPO_DIR)/test-runner/golint.sh

.PHONY: operator-lint
operator-lint: $(LOCALBIN) gowork ## Runs operator-lint
#TODO(gibi): bump this to v0.2.2 as soon as that version is tagged
GOBIN=$(LOCALBIN) go install github.com/gibizer/operator-lint@2ffa25b7f1c13fb2bdae5444a3dd1b5bbad529b1
go vet -vettool=$(LOCALBIN)/operator-lint ./... ./api/...

.PHONY: gowork
gowork: ## Generate go.work file
test -f go.work || go work init
go work use .
go work use ./api
2 changes: 1 addition & 1 deletion api/v1beta1/mariadb_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type MariaDBSpec struct {

// +kubebuilder:validation:Optional
// +kubebuilder:default="quay.io/tripleozedcentos9/openstack-mariadb:current-tripleo"
ContainerImage string `json:"containerImage,omitempty"`
ContainerImage string `json:"containerImage"`

AdoptionRedirect AdoptionRedirectSpec `json:"adoptionRedirect,omitempty"`
}
Expand Down
Empty file modified templates/mariadb/bin/mariadb_init.sh
100644 → 100755
Empty file.