Skip to content

Commit

Permalink
Merge pull request #797 from Deydra71/tls-kuttl
Browse files Browse the repository at this point in the history
[tls] Improve the TLS kuttl scenarios
  • Loading branch information
openshift-merge-bot[bot] authored Jul 18, 2024
2 parents 12fdef2 + 78f6fbb commit df26588
Show file tree
Hide file tree
Showing 58 changed files with 1,723 additions and 217 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ KUTTL ?= $(LOCALBIN)/kubectl-kuttl
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.11.1
CRD_MARKDOWN_VERSION ?= v0.0.3
KUTTL_VERSION ?= 0.15.0
KUTTL_VERSION ?= 0.17.0

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,198 @@
apiVersion: core.openstack.org/v1beta1
kind: OpenStackControlPlane
metadata:
name: openstack-basic
spec:
secret: osp-secret
storageClass: local-storage
keystone:
template:
databaseInstance: openstack
secret: osp-secret
galera:
templates:
openstack:
storageClass: local-storage
storageRequest: 500M
secret: osp-secret
replicas: 1
openstack-cell1:
storageClass: local-storage
storageRequest: 500M
secret: osp-secret
replicas: 1
rabbitmq:
templates:
rabbitmq:
replicas: 1
#resources:
# requests:
# cpu: 500m
# memory: 1Gi
# limits:
# cpu: 800m
# memory: 1Gi
rabbitmq-cell1:
replicas: 1
memcached:
templates:
memcached:
replicas: 1
barbican:
template:
databaseInstance: openstack
secret: osp-secret
barbicanAPI:
replicas: 1
barbicanWorker:
replicas: 1
barbicanKeystoneListener:
replicas: 1
placement:
template:
databaseInstance: openstack
secret: osp-secret
glance:
template:
secret: osp-secret
databaseInstance: openstack
storage:
storageClass: ""
storageRequest: 10G
keystoneEndpoint: default
glanceAPIs:
default:
type: single
replicas: 1
cinder:
template:
databaseInstance: openstack
secret: osp-secret
cinderAPI:
replicas: 1
cinderScheduler:
replicas: 1
cinderBackup:
replicas: 0 # backend needs to be configured
cinderVolumes:
volume1:
replicas: 0 # backend needs to be configured
manila:
template:
manilaAPI:
replicas: 1
manilaScheduler:
replicas: 1
manilaShares:
share1:
replicas: 1
ovn:
template:
ovnDBCluster:
ovndbcluster-nb:
replicas: 1
dbType: NB
storageRequest: 10G
ovndbcluster-sb:
replicas: 1
dbType: SB
storageRequest: 10G
ovnNorthd:
replicas: 1
ovnController: {}
neutron:
template:
databaseInstance: openstack
secret: osp-secret
horizon:
template:
replicas: 1
secret: osp-secret
nova:
template:
secret: osp-secret
heat:
enabled: false
template:
databaseInstance: openstack
heatAPI:
replicas: 1
heatEngine:
replicas: 1
secret: osp-secret
ironic:
enabled: false
template:
databaseInstance: openstack
ironicAPI:
replicas: 1
ironicConductors:
- replicas: 1
storageRequest: 10G
ironicInspector:
replicas: 1
ironicNeutronAgent:
replicas: 1
secret: osp-secret
telemetry:
enabled: true
template:
metricStorage:
enabled: false
monitoringStack:
alertingEnabled: true
scrapeInterval: 30s
storage:
strategy: persistent
retention: 24h
persistent:
pvcStorageRequest: 20G
autoscaling:
enabled: false
aodh:
passwordSelectors:
databaseAccount: aodh
databaseInstance: openstack
secret: osp-secret
heatInstance: heat
ceilometer:
enabled: true
secret: osp-secret
logging:
enabled: false
network: internalapi
ipaddr: 172.17.0.80
port: 10514
cloNamespace: openshift-logging
swift:
enabled: true
template:
swiftRing:
ringReplicas: 1
swiftStorage:
replicas: 1
swiftProxy:
replicas: 1
octavia:
enabled: false
template:
databaseInstance: openstack
octaviaAPI:
replicas: 1
secret: osp-secret
designate:
template:
databaseInstance: openstack
secret: osp-secret
designateAPI:
replicas: 1
designateCentral:
replicas: 0 # backend needs to be configured
designateWorker:
replicas: 0 # backend needs to be configured
designateProducer:
replicas: 0 # backend needs to be configured
designateMdns:
replicas: 0 # backend needs to be configured
designateBackendbind9:
replicas: 0 # backend needs to be configured
10 changes: 10 additions & 0 deletions config/samples/base/openstackcontrolplane/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
resources:
- core_v1beta1_openstackcontrolplane.yaml
patches:
- target:
kind: OpenStackControlPlane
name: .*
patch: |-
- op: replace
path: /metadata/name
value: openstack
Loading

0 comments on commit df26588

Please sign in to comment.