Skip to content

Commit

Permalink
update dependencies for go modules and external deps (#333)
Browse files Browse the repository at this point in the history
Signed-off-by: Dejan Zele Pejchev <[email protected]>
  • Loading branch information
dejanzele authored Oct 29, 2024
1 parent 77f7bbc commit 07d2bee
Show file tree
Hide file tree
Showing 27 changed files with 1,355 additions and 1,821 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ submit-example-job: ## Submit example job to Armada using armadactl
armadactl submit dev/quickstart/example-job.yaml

.PHONY: get-armadactl
get-armadactl: ## Get armadactl binary
curl -o $(LOCALBIN_APP)/get-armadactl.sh https://raw.githubusercontent.com/armadaproject/armada/master/scripts/get-armadactl.sh
get-armadactl: $(LOCALBIN_APP) ## Get armadactl binary
curl -o "$(LOCALBIN_APP)/get-armadactl.sh" "https://raw.githubusercontent.com/armadaproject/armada/master/scripts/get-armadactl.sh"
bash -c "cd bin/app && bash get-armadactl.sh"
rm bin/app/get-armadactl.sh

Expand Down Expand Up @@ -368,14 +368,14 @@ GORELEASER ?= $(LOCALBIN_TOOLING)/goreleaser
CRD_REF_DOCS ?= $(LOCALBIN_TOOLING)/crd-ref-docs
GOLANGCI_LINT ?= $(LOCALBIN_TOOLING)/golangci-lint

KUSTOMIZE_VERSION ?= v5.4.2
KUSTOMIZE_VERSION ?= v5.5.0
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
$(KUSTOMIZE): $(LOCALBIN_TOOLING)
test -s $(KUSTOMIZE) || { curl -Ss $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN_TOOLING); }

CONTROLLER_TOOLS_VERSION ?= v0.15.0
CONTROLLER_TOOLS_VERSION ?= v0.16.1
.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
$(CONTROLLER_GEN): $(LOCALBIN)
Expand All @@ -386,7 +386,7 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN_TOOLING)
test -s $(ENVTEST) || GOBIN=$(LOCALBIN_TOOLING) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

GOTESTSUM_VERSION ?= v1.11.0
GOTESTSUM_VERSION ?= v1.12.0
.PHONY: gotestsum
gotestsum: $(GOTESTSUM) ## Download gotestsum locally if necessary.
$(GOTESTSUM): $(LOCALBIN_TOOLING)
Expand All @@ -398,31 +398,31 @@ mockgen: $(MOCKGEN) ## Download mockgen locally if necessary.
$(MOCKGEN): $(LOCALBIN_TOOLING)
test -s $(MOCKGEN) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/golang/mock/mockgen@$(MOCKGEN_VERSION)

KIND_VERSION ?= v0.23.0
KIND_VERSION ?= v0.24.0
.PHONY: kind
kind: $(KIND) ## Download kind locally if necessary.
$(KIND): $(LOCALBIN_TOOLING)
test -s $(KIND) || GOBIN=$(LOCALBIN_TOOLING) go install sigs.k8s.io/kind@$(KIND_VERSION)

HELMIFY_VERSION ?= v0.4.13
HELMIFY_VERSION ?= v0.4.14
.PHONY: helmify
helmify: $(HELMIFY) ## Download helmify locally if necessary.
$(HELMIFY): $(LOCALBIN_TOOLING)
test -s $(HELMIFY) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/arttor/helmify/cmd/helmify@$(HELMIFY_VERSION)

GORELEASER_VERSION ?= v1.26.2
GORELEASER_VERSION ?= v2.3.2
.PHONY: goreleaser
goreleaser: $(GORELEASER) ## Download GoReleaser locally if necessary.
$(GORELEASER): $(LOCALBIN_TOOLING)
test -s $(GORELEASER) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION)

CRD_REF_DOCS_VERSION ?= v0.0.12
CRD_REF_DOCS_VERSION ?= v0.1.0
.PHONY: crd-ref-docs
crd-ref-docs: $(CRD_REF_DOCS) ## Download crd-ref-docs locally if necessary.
$(CRD_REF_DOCS): $(LOCALBIN_TOOLING)
test -s $(CRD_REF_DOCS) || GOBIN=$(LOCALBIN_TOOLING) go install github.com/elastic/crd-ref-docs@$(CRD_REF_DOCS_VERSION)

GOLANGCI_LINT_VERSION ?= v1.59.0
GOLANGCI_LINT_VERSION ?= v1.61.0
.PHONY: golangci-lint
golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
$(GOLANGCI_LINT): $(LOCALBIN_TOOLING)
Expand Down
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,16 @@ should all succeed without error.
Add and change appropriate unit and integration tests to ensure your changes
are covered by automated tests and appear to be correct.

## FAQ

### kube-prometheus-stack is not installing

If you get the following error:
```bash
Error: template: kube-prometheus-stack/templates/prometheus/prometheus.yaml:262:11: executing "kube-prometheus-stack/templates/prometheus/prometheus.yaml" at <ne .Values.prometheus.prometheusSpec.scrapeConfigNamespaceSelector nil>: error calling ne: uncomparable type map[string]interface {}: map[]
```
Try upgrading your Helm version to `v3.16.2` or later.

## License

Copyright 2024.
Expand Down
163 changes: 76 additions & 87 deletions charts/armada-operator/crds/armadaserver-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/binoculars-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/eventingester-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/executor-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/lookout-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/lookoutingester-crd.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion charts/armada-operator/crds/queue-crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
cert-manager.io/inject-ca-from: armada-system/armada-operator-serving-cert
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: queues.core.armadaproject.io
spec:
conversion:
Expand Down
171 changes: 82 additions & 89 deletions charts/armada-operator/crds/scheduler-crd.yaml

Large diffs are not rendered by default.

163 changes: 76 additions & 87 deletions charts/armada-operator/crds/scheduleringester-crd.yaml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions charts/armada-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ spec:
10 }}
securityContext: {{- toYaml .Values.controllerManager.kubeRbacProxy.containerSecurityContext
| nindent 10 }}
securityContext:
runAsNonRoot: false
securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
8 }}
serviceAccountName: {{ include "armada-operator.fullname" . }}-controller-manager
terminationGracePeriodSeconds: 10
volumes:
Expand Down
182 changes: 10 additions & 172 deletions charts/armada-operator/templates/manager-rbac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,32 +120,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- batch
resources:
- jobs
verbs:
- create
- delete
- deletecollection
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- secrets
- serviceaccounts
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
Expand Down Expand Up @@ -198,138 +172,13 @@ rules:
- install.armadaproject.io
resources:
- armadaservers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- armadaservers/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- binoculars
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- binoculars/finalizers
verbs:
- update
- apiGroups:
- install.armadaproject.io
resources:
- binoculars/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- eventingesters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- eventingesters/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- executors
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- executors/finalizers
verbs:
- update
- apiGroups:
- install.armadaproject.io
resources:
- executors/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- lookoutingesters
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- lookoutingesters/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- lookouts
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- lookouts/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- scheduleringesters
- schedulers
verbs:
- create
- delete
Expand All @@ -341,37 +190,26 @@ rules:
- apiGroups:
- install.armadaproject.io
resources:
- armadaservers/status
- binoculars/status
- eventingesters/status
- executors/status
- lookoutingesters/status
- lookouts/status
- scheduleringesters/status
- schedulers/status
verbs:
- get
- patch
- update
- apiGroups:
- install.armadaproject.io
resources:
- schedulers
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- install.armadaproject.io
resources:
- binoculars/finalizers
- executors/finalizers
- schedulers/finalizers
verbs:
- update
- apiGroups:
- install.armadaproject.io
resources:
- schedulers/status
verbs:
- get
- patch
- update
- apiGroups:
- monitoring.coreos.com
resources:
Expand Down
2 changes: 2 additions & 0 deletions charts/armada-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ controllerManager:
requests:
cpu: 10m
memory: 64Mi
podSecurityContext:
runAsNonRoot: false
replicas: 1
serviceAccount:
annotations: {}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/core.armadaproject.io_queues.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
name: queues.core.armadaproject.io
spec:
group: core.armadaproject.io
Expand Down
Loading

0 comments on commit 07d2bee

Please sign in to comment.