Skip to content

Commit 542d166

Browse files
jlarribajlarriba
committed
Adjust to use CloudKittyCore to avoid exposing images in the ControlPlane
1 parent 05c41e1 commit 542d166

File tree

12 files changed

+543
-97
lines changed

12 files changed

+543
-97
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 169 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14680,10 +14680,20 @@ spec:
1468014680
customServiceConfig:
1468114681
type: string
1468214682
customServiceConfigSecrets:
14683+
allOf:
14684+
- items:
14685+
type: string
14686+
- items:
14687+
type: string
1468314688
items:
1468414689
type: string
1468514690
type: array
1468614691
networkAttachments:
14692+
allOf:
14693+
- items:
14694+
type: string
14695+
- items:
14696+
type: string
1468714697
items:
1468814698
type: string
1468914699
type: array
@@ -14722,6 +14732,11 @@ spec:
1472214732
loadBalancerClass:
1472314733
type: string
1472414734
loadBalancerSourceRanges:
14735+
allOf:
14736+
- items:
14737+
type: string
14738+
- items:
14739+
type: string
1472514740
items:
1472614741
type: string
1472714742
type: array
@@ -14744,17 +14759,45 @@ spec:
1474414759
type: object
1474514760
type: object
1474614761
replicas:
14762+
allOf:
14763+
- minimum: 0
14764+
- minimum: 0
1474714765
default: 1
1474814766
format: int32
1474914767
minimum: 0
1475014768
type: integer
1475114769
resources:
1475214770
properties:
1475314771
claims:
14772+
allOf:
14773+
- items:
14774+
properties:
14775+
name:
14776+
type: string
14777+
request:
14778+
type: string
14779+
required:
14780+
- name
14781+
type: object
14782+
x-kubernetes-list-map-keys:
14783+
- name
14784+
- items:
14785+
properties:
14786+
name:
14787+
type: string
14788+
request:
14789+
type: string
14790+
required:
14791+
- name
14792+
type: object
14793+
x-kubernetes-list-map-keys:
14794+
- name
1475414795
items:
1475514796
properties:
1475614797
name:
1475714798
type: string
14799+
request:
14800+
type: string
1475814801
required:
1475914802
- name
1476014803
type: object
@@ -14764,6 +14807,13 @@ spec:
1476414807
x-kubernetes-list-type: map
1476514808
limits:
1476614809
additionalProperties:
14810+
allOf:
14811+
- anyOf:
14812+
- type: integer
14813+
- type: string
14814+
- anyOf:
14815+
- type: integer
14816+
- type: string
1476714817
anyOf:
1476814818
- type: integer
1476914819
- type: string
@@ -14772,6 +14822,13 @@ spec:
1477214822
type: object
1477314823
requests:
1477414824
additionalProperties:
14825+
allOf:
14826+
- anyOf:
14827+
- type: integer
14828+
- type: string
14829+
- anyOf:
14830+
- type: integer
14831+
- type: string
1477514832
anyOf:
1477614833
- type: integer
1477714834
- type: string
@@ -14804,8 +14861,6 @@ spec:
1480414861
namespace:
1480514862
type: string
1480614863
type: object
14807-
required:
14808-
- containerImage
1480914864
type: object
1481014865
cloudKittyProc:
1481114866
properties:
@@ -14814,10 +14869,20 @@ spec:
1481414869
customServiceConfig:
1481514870
type: string
1481614871
customServiceConfigSecrets:
14872+
allOf:
14873+
- items:
14874+
type: string
14875+
- items:
14876+
type: string
1481714877
items:
1481814878
type: string
1481914879
type: array
1482014880
networkAttachments:
14881+
allOf:
14882+
- items:
14883+
type: string
14884+
- items:
14885+
type: string
1482114886
items:
1482214887
type: string
1482314888
type: array
@@ -14826,17 +14891,45 @@ spec:
1482614891
type: string
1482714892
type: object
1482814893
replicas:
14894+
allOf:
14895+
- minimum: 0
14896+
- minimum: 0
1482914897
default: 1
1483014898
format: int32
1483114899
minimum: 0
1483214900
type: integer
1483314901
resources:
1483414902
properties:
1483514903
claims:
14904+
allOf:
14905+
- items:
14906+
properties:
14907+
name:
14908+
type: string
14909+
request:
14910+
type: string
14911+
required:
14912+
- name
14913+
type: object
14914+
x-kubernetes-list-map-keys:
14915+
- name
14916+
- items:
14917+
properties:
14918+
name:
14919+
type: string
14920+
request:
14921+
type: string
14922+
required:
14923+
- name
14924+
type: object
14925+
x-kubernetes-list-map-keys:
14926+
- name
1483614927
items:
1483714928
properties:
1483814929
name:
1483914930
type: string
14931+
request:
14932+
type: string
1484014933
required:
1484114934
- name
1484214935
type: object
@@ -14846,6 +14939,13 @@ spec:
1484614939
x-kubernetes-list-type: map
1484714940
limits:
1484814941
additionalProperties:
14942+
allOf:
14943+
- anyOf:
14944+
- type: integer
14945+
- type: string
14946+
- anyOf:
14947+
- type: integer
14948+
- type: string
1484914949
anyOf:
1485014950
- type: integer
1485114951
- type: string
@@ -14854,6 +14954,13 @@ spec:
1485414954
type: object
1485514955
requests:
1485614956
additionalProperties:
14957+
allOf:
14958+
- anyOf:
14959+
- type: integer
14960+
- type: string
14961+
- anyOf:
14962+
- type: integer
14963+
- type: string
1485714964
anyOf:
1485814965
- type: integer
1485914966
- type: string
@@ -14875,18 +14982,19 @@ spec:
1487514982
namespace:
1487614983
type: string
1487714984
type: object
14878-
required:
14879-
- containerImage
1488014985
type: object
1488114986
customServiceConfig:
1488214987
type: string
1488314988
databaseAccount:
1488414989
default: cloudkitty
1488514990
type: string
1488614991
databaseInstance:
14992+
default: openstack
1488714993
type: string
1488814994
enabled:
14889-
default: false
14995+
allOf:
14996+
- default: false
14997+
- default: false
1489014998
type: boolean
1489114999
memcachedInstance:
1489215000
default: memcached
@@ -14915,16 +15023,20 @@ spec:
1491515023
prometheusHost:
1491615024
type: string
1491715025
prometheusPort:
15026+
allOf:
15027+
- maximum: 65535
15028+
minimum: 1
15029+
- maximum: 65535
15030+
minimum: 1
1491815031
format: int32
14919-
maximum: 65535
14920-
minimum: 1
1492115032
type: integer
1492215033
prometheusTLSCaCertSecret:
1492315034
nullable: true
1492415035
properties:
1492515036
key:
1492615037
type: string
1492715038
name:
15039+
default: ""
1492815040
type: string
1492915041
optional:
1493015042
type: boolean
@@ -14935,25 +15047,68 @@ spec:
1493515047
rabbitMqClusterName:
1493615048
default: rabbitmq
1493715049
type: string
15050+
s3StorageConfig:
15051+
default:
15052+
secret:
15053+
name: cloudkitty-loki-s3
15054+
type: s3
15055+
properties:
15056+
schemas:
15057+
allOf:
15058+
- items:
15059+
properties:
15060+
effectiveDate:
15061+
type: string
15062+
version:
15063+
type: string
15064+
type: object
15065+
minItems: 1
15066+
- items:
15067+
properties:
15068+
effectiveDate:
15069+
type: string
15070+
version:
15071+
type: string
15072+
type: object
15073+
minItems: 1
15074+
default:
15075+
- effectiveDate: "2020-10-11"
15076+
version: v11
15077+
type: array
15078+
secret:
15079+
properties:
15080+
credentialMode:
15081+
type: string
15082+
name:
15083+
type: string
15084+
type:
15085+
type: string
15086+
type: object
15087+
tls:
15088+
properties:
15089+
caKey:
15090+
type: string
15091+
caName:
15092+
type: string
15093+
required:
15094+
- caName
15095+
type: object
15096+
type: object
1493815097
secret:
15098+
default: osp-secret
1493915099
type: string
1494015100
serviceUser:
1494115101
default: cloudkitty
1494215102
type: string
15103+
storageClass:
15104+
type: string
1494315105
topologyRef:
1494415106
properties:
1494515107
name:
1494615108
type: string
1494715109
namespace:
1494815110
type: string
1494915111
type: object
14950-
required:
14951-
- cloudKittyAPI
14952-
- cloudKittyProc
14953-
- databaseInstance
14954-
- memcachedInstance
14955-
- rabbitMqClusterName
14956-
- secret
1495715112
type: object
1495815113
logging:
1495915114
properties:

‎apis/go.mod‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ require (
6868
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
6969
github.com/google/uuid v1.6.0 // indirect
7070
github.com/gophercloud/gophercloud v1.14.1 // indirect
71-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba // indirect
7271
github.com/imdario/mergo v0.3.16 // indirect
7372
github.com/josharian/intern v1.0.0 // indirect
7473
github.com/json-iterator/go v1.1.12 // indirect
@@ -120,4 +119,4 @@ replace github.com/openshift/api => github.com/openshift/api v0.0.0-202507112000
120119
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
121120

122121
// Test CloudKitty
123-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28
122+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930095645-339cbb438db7

‎apis/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
6060
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
6161
github.com/gophercloud/gophercloud v1.14.1 h1:DTCNaTVGl8/cFu58O1JwWgis9gtISAFONqpMKNg/Vpw=
6262
github.com/gophercloud/gophercloud v1.14.1/go.mod h1:aAVqcocTSXh2vYFZ1JTvx4EQmfgzxRcNupUfxZbBNDM=
63-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba h1:P5Wgp2HfGfNPLCPpS+YqquKdrrl4tW0El7VX23D6vtg=
64-
github.com/grafana/loki/operator/api/loki v0.0.0-20250910094332-a082b8a061ba/go.mod h1:OBAgJh0mLYRvziBzBKr4/anrPHqGY9qEfuNXCpnUNi0=
6563
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
6664
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
67-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28 h1:9H+DxrR9/zzJtTZ9HeC7Ngxq83fLyZU6Z2sr4J5HOcI=
68-
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250923092300-186405486b28/go.mod h1:+SOqfHuYQlyFGykNxqMWZcFjdIB6+2+L3K7w+Uh+vCM=
65+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930095645-339cbb438db7 h1:umRMaevm75QW0eQpfehDMyNedKlCgSdxNPjy402/xLo=
66+
github.com/jlarriba/telemetry-operator/api v0.1.1-0.20250930095645-339cbb438db7/go.mod h1:v4Stbc6YFVR3r7ofSuErpTJ9Ki2Ka9Fs8S+dgiNqx60=
6967
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
7068
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7169
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=

0 commit comments

Comments
 (0)