Skip to content

Commit

Permalink
Merge branch 'main' into renovate/k8s.io
Browse files Browse the repository at this point in the history
  • Loading branch information
@bshephar
bshephar authored Feb 5, 2024
2 parents dbb02d6 + e3111ae commit 6180711
Show file tree
Hide file tree
Showing 24 changed files with 56 additions and 340 deletions.
12 changes: 0 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,19 @@ spec:
customServiceConfig: ""
databaseInstance: openstack
databaseUser: "heat"
debug:
dbSync: false
heatAPI:
containerImage: "quay.io/podified-antelope-centos9/openstack-heat-api:current-podified"
customServiceConfig: ""
debug:
service: false
replicas: 1
resources: {}
heatCfnAPI:
containerImage: "quay.io/podified-antelope-centos9/openstack-heat-api-cfn:current-podified"
customServiceConfig: ""
debug:
service: false
replicas: 1
resources: {}
heatEngine:
containerImage: "quay.io/podified-antelope-centos9/openstack-heat-engine:current-podified"
customServiceConfig: ""
debug:
service: false
replicas: 1
resources: {}
memcachedInstance: memcached
Expand All @@ -60,8 +52,6 @@ spec:
num_engine_workers=4
databaseInstance: openstack
databaseUser: heat
debug:
dbSync: false
```

In this example, we are setting `num_engine_workers` to 4. After this resource has been updated, the controller will
Expand Down Expand Up @@ -99,8 +89,6 @@ template:
customServiceConfig: ''
databaseInstance: openstack
databaseUser: heat
debug:
dbSync: false
heatAPI:
replicas: 1
resources: {}
Expand Down
10 changes: 0 additions & 10 deletions api/bases/heat.openstack.org_heatapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
10 changes: 0 additions & 10 deletions api/bases/heat.openstack.org_heatcfnapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
10 changes: 0 additions & 10 deletions api/bases/heat.openstack.org_heatengines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
40 changes: 0 additions & 40 deletions api/bases/heat.openstack.org_heats.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
dbSync:
default: false
description: DBSync enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand All @@ -94,16 +84,6 @@ spec:
content gets added to to /etc/<service>/<service>.conf.d directory
as custom.conf file.
type: string
debug:
description: Debug - enable debug for different deploy stages.
If an init container is used, it runs and the actual action
pod gets started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down Expand Up @@ -403,16 +383,6 @@ spec:
content gets added to to /etc/<service>/<service>.conf.d directory
as custom.conf file.
type: string
debug:
description: Debug - enable debug for different deploy stages.
If an init container is used, it runs and the actual action
pod gets started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down Expand Up @@ -712,16 +682,6 @@ spec:
content gets added to to /etc/<service>/<service>.conf.d directory
as custom.conf file.
type: string
debug:
description: Debug - enable debug for different deploy stages.
If an init container is used, it runs and the actual action
pod gets started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
2 changes: 1 addition & 1 deletion api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down
4 changes: 2 additions & 2 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd h1:r8yyd+DJDmsUhGrRBxH5Pj7KeFK5l+Y3FsgT8keqKtk=
github.com/google/pprof v0.0.0-20230323073829-e72429f035bd/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
Expand Down
21 changes: 0 additions & 21 deletions api/v1beta1/common_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ type HeatServiceTemplate struct {
// ContainerImage - Container Image URL
ContainerImage string `json:"containerImage"`

// +kubebuilder:validation:Optional
// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
// actual action pod gets started with sleep infinity
Debug HeatServiceDebug `json:"debug,omitempty"`

// +kubebuilder:validation:Optional
// +kubebuilder:default=1
// +kubebuilder:validation:Maximum=32
Expand Down Expand Up @@ -108,19 +103,3 @@ type PasswordSelector struct {
// AuthEncryptionKey - Selector to get the heat auth encryption key from the Secret
AuthEncryptionKey string `json:"authEncryptionKey"`
}

// HeatDebug ...
type HeatDebug struct {
// +kubebuilder:validation:Optional
// +kubebuilder:default=false
// DBSync enable debug
DBSync bool `json:"dbSync"`
}

// HeatServiceDebug ...
type HeatServiceDebug struct {
// +kubebuilder:validation:Optional
// +kubebuilder:default=false
// Service enable debug
Service bool `json:"service"`
}
5 changes: 0 additions & 5 deletions api/v1beta1/heat_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ type HeatSpec struct {
// Memcached instance name.
MemcachedInstance string `json:"memcachedInstance"`

// +kubebuilder:validation:Optional
// Debug - enable debug for different deploy stages. If an init container is used, it runs and the
// actual action pod gets started with sleep infinity
Debug HeatDebug `json:"debug,omitempty"`

// +kubebuilder:validation:Optional
// +kubebuilder:default=false
// PreserveJobs - do not delete jobs after they finished e.g. to check logs
Expand Down
32 changes: 0 additions & 32 deletions api/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions config/crd/bases/heat.openstack.org_heatapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
10 changes: 0 additions & 10 deletions config/crd/bases/heat.openstack.org_heatcfnapis.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
10 changes: 0 additions & 10 deletions config/crd/bases/heat.openstack.org_heatengines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,6 @@ spec:
to heat. TODO: -> implement needs work in mariadb-operator, right
now only heat.'
type: string
debug:
description: Debug - enable debug for different deploy stages. If
an init container is used, it runs and the actual action pod gets
started with sleep infinity
properties:
service:
default: false
description: Service enable debug
type: boolean
type: object
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down
Loading

0 comments on commit 6180711

Please sign in to comment.