Skip to content

Allow defaultConfigOverwrite to replace httpd.conf #1084

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

Draft
gibizer wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Draft

Allow defaultConfigOverwrite to replace httpd.conf #1084

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
4 changes: 2 additions & 2 deletions api/v1beta1/novaapi_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"

"github.com/openstack-k8s-operators/lib-common/modules/common/service"
topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
"github.com/openstack-k8s-operators/lib-common/modules/common/service"
)

// NovaAPIDefaults -
Expand Down Expand Up @@ -148,7 +148,7 @@ func ValidateAPIDefaultConfigOverwrite(
return ValidateDefaultConfigOverwrite(
basePath,
defaultConfigOverwrite,
[]string{"policy.yaml", "api-paste.ini"})
[]string{"policy.yaml", "api-paste.ini", "httpd.conf"})
}

// ValidateTopology validates the referenced TopoRef.Namespace.
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/novametadata_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (
"fmt"

"github.com/google/go-cmp/cmp"
topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/validation/field"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
)

// NovaMetadataDefaults -
Expand Down Expand Up @@ -156,7 +156,7 @@ func ValidateMetadataDefaultConfigOverwrite(
defaultConfigOverwrite map[string]string,
) field.ErrorList {
return ValidateDefaultConfigOverwrite(
basePath, defaultConfigOverwrite, []string{"api-paste.ini"})
basePath, defaultConfigOverwrite, []string{"api-paste.ini", "httpd.conf"})
}

// ValidateTopology validates the referenced TopoRef.Namespace.
Expand Down
Loading