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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fixes 'make manifests' bug caused by overwritten generate_manifest definition #4116

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Fixes 'make manifests' bug caused by overwritten generate_manifest definition #4116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions hack/make/manifests/kubernetes.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define generate_manifest
define generate_k8s_manifest
helm template dynatrace-operator config/helm/chart/default \
--namespace dynatrace \
--set csidriver.enabled=$(1) \
Expand All @@ -11,15 +11,15 @@ endef

## Generates a Kubernetes manifest including CRD and CSI driver
manifests/kubernetes/csi: manifests/crd/helm
$(call generate_manifest,true,$(KUBERNETES_CSIDRIVER_YAML))
$(call generate_k8s_manifest,true,$(KUBERNETES_CSIDRIVER_YAML))

## Generates a Kubernetes manifest including CRD without CSI driver
manifests/kubernetes/core: manifests/crd/helm
$(call generate_manifest,false,$(KUBERNETES_CORE_YAML))
$(call generate_k8s_manifest,false,$(KUBERNETES_CORE_YAML))

## Generates a Kubernetes manifest including CRD and CSI driver with OLM set to true
manifests/kubernetes/olm: manifests/crd/helm
OLM=true $(call generate_manifest,true,$(KUBERNETES_OLM_YAML))
OLM=true $(call generate_k8s_manifest,true,$(KUBERNETES_OLM_YAML))

## Generates a manifest for Kubernetes including a CRD, a CSI driver deployment
manifests/kubernetes: manifests/kubernetes/core manifests/kubernetes/csi
8 changes: 4 additions & 4 deletions hack/make/manifests/openshift.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define generate_manifest
define generate_openshift_manifest
helm template dynatrace-operator config/helm/chart/default \
--namespace dynatrace \
--set csidriver.enabled=$(1) \
Expand All @@ -11,15 +11,15 @@ endef

## Generates an Openshift manifest including CRD and CSI driver
manifests/openshift/csi: manifests/crd/helm
$(call generate_manifest,true,$(OPENSHIFT_CSIDRIVER_YAML))
$(call generate_openshift_manifest,true,$(OPENSHIFT_CSIDRIVER_YAML))

## Generates a Openshift manifest including CRD without CSI driver
manifests/openshift/core: manifests/crd/helm
$(call generate_manifest,false,$(OPENSHIFT_CORE_YAML))
$(call generate_openshift_manifest,false,$(OPENSHIFT_CORE_YAML))

## Generates an Openshift manifest including CRD and CSI driver with OLM set to true
manifests/openshift/olm: manifests/crd/helm
OLM=true $(call generate_manifest,true,$(OPENSHIFT_OLM_YAML))
OLM=true $(call generate_openshift_manifest,true,$(OPENSHIFT_OLM_YAML))

## Generates a manifest for OpenShift including a CRD and a CSI driver deployment
manifests/openshift: manifests/openshift/core manifests/openshift/csi
Loading