Skip to content

Commit 17a13b0

Browse files
Use shared CleanerSpec from catalog API in service-gateway charts
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 80d2e05 commit 17a13b0

8 files changed

Lines changed: 128 additions & 36 deletions

File tree

apis/installer/v1alpha1/service_gateway_types.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1alpha1
1919
import (
2020
catgwapi "go.bytebuilders.dev/catalog/api/gateway/v1alpha1"
2121

22-
core "k8s.io/api/core/v1"
2322
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2423
)
2524

@@ -49,7 +48,6 @@ type ServiceGatewaySpec struct {
4948
FullnameOverride string `json:"fullnameOverride"`
5049
ClusterMetadata StashClusterMetadata `json:"clusterMetadata"`
5150
GatewayClass GatewayClassSpec `json:"gatewayClass"`
52-
Cleaner CleanerSpec `json:"cleaner"`
5351
catgwapi.GatewayValues `json:",inline,omitempty"`
5452
}
5553

@@ -58,15 +56,6 @@ type GatewayClassSpec struct {
5856
Description string `json:"description"`
5957
}
6058

61-
type CleanerSpec struct {
62-
Enabled bool `json:"enabled"`
63-
Registry string `json:"registry"`
64-
Repository string `json:"repository"`
65-
Tag string `json:"tag"`
66-
PullPolicy core.PullPolicy `json:"pullPolicy"`
67-
SecurityContext *core.SecurityContext `json:"securityContext,omitempty"`
68-
}
69-
7059
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
7160

7261
// ServiceGatewayList is a list of ServiceGateways

apis/installer/v1alpha1/zz_generated.deepcopy.go

Lines changed: 0 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

charts/service-gateway-presets/values.openapiv3_schema.yaml

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,97 @@ properties:
3030
- name
3131
- sourceRef
3232
type: object
33+
cleaner:
34+
properties:
35+
enabled:
36+
type: boolean
37+
pullPolicy:
38+
type: string
39+
registry:
40+
type: string
41+
repository:
42+
type: string
43+
securityContext:
44+
properties:
45+
allowPrivilegeEscalation:
46+
type: boolean
47+
appArmorProfile:
48+
properties:
49+
localhostProfile:
50+
type: string
51+
type:
52+
type: string
53+
required:
54+
- type
55+
type: object
56+
capabilities:
57+
properties:
58+
add:
59+
items:
60+
type: string
61+
type: array
62+
x-kubernetes-list-type: atomic
63+
drop:
64+
items:
65+
type: string
66+
type: array
67+
x-kubernetes-list-type: atomic
68+
type: object
69+
privileged:
70+
type: boolean
71+
procMount:
72+
type: string
73+
readOnlyRootFilesystem:
74+
type: boolean
75+
runAsGroup:
76+
format: int64
77+
type: integer
78+
runAsNonRoot:
79+
type: boolean
80+
runAsUser:
81+
format: int64
82+
type: integer
83+
seLinuxOptions:
84+
properties:
85+
level:
86+
type: string
87+
role:
88+
type: string
89+
type:
90+
type: string
91+
user:
92+
type: string
93+
type: object
94+
seccompProfile:
95+
properties:
96+
localhostProfile:
97+
type: string
98+
type:
99+
type: string
100+
required:
101+
- type
102+
type: object
103+
windowsOptions:
104+
properties:
105+
gmsaCredentialSpec:
106+
type: string
107+
gmsaCredentialSpecName:
108+
type: string
109+
hostProcess:
110+
type: boolean
111+
runAsUserName:
112+
type: string
113+
type: object
114+
type: object
115+
tag:
116+
type: string
117+
required:
118+
- enabled
119+
- pullPolicy
120+
- registry
121+
- repository
122+
- tag
123+
type: object
33124
cluster:
34125
properties:
35126
tls:
@@ -4693,6 +4784,7 @@ properties:
46934784
- name
46944785
type: object
46954786
required:
4787+
- cleaner
46964788
- cluster
46974789
- clusterMetadata
46984790
- echoserver

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module go.bytebuilders.dev/installer
33
go 1.25.6
44

55
require (
6-
go.bytebuilders.dev/catalog v0.0.23
6+
go.bytebuilders.dev/catalog v0.0.25-0.20260626115826-a5d44c24f104
77
go.bytebuilders.dev/resource-model v0.4.0
88
go.bytebuilders.dev/ui-wizards v0.35.0
99
go.openviz.dev/installer v0.0.0-20260619044110-702becd1dd97

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
211211
github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
212212
go.appscode.dev/alerts v0.2.1-0.20260516020454-00c8e56b1991 h1:juyyBSMLxf/D/py8QidUT0wZUIhisivkdeCIvwXvob8=
213213
go.appscode.dev/alerts v0.2.1-0.20260516020454-00c8e56b1991/go.mod h1:oG1OnN2JTilTTqGAHv4CCoqnvT3u0J8c7YgNny0Rj7g=
214-
go.bytebuilders.dev/catalog v0.0.23 h1:C2QLyWa5e32WfhhJLvXgorPwQ1LvEVqT6Ox4GSY2Rf8=
215-
go.bytebuilders.dev/catalog v0.0.23/go.mod h1:o+3cekrGPUeG95FPtGfDMNiX0k4Lz0vK0Bc8b4F4S9U=
214+
go.bytebuilders.dev/catalog v0.0.25-0.20260626115826-a5d44c24f104 h1:DDdpXghpMjyJn6Alu9i3n5FJdQtYTmIXcFn/oJAULwA=
215+
go.bytebuilders.dev/catalog v0.0.25-0.20260626115826-a5d44c24f104/go.mod h1:zXAS4yNzCueduM3glK0JDuPuJd2MDvCx2PtauRtzT7I=
216216
go.bytebuilders.dev/resource-model v0.4.0 h1:wDXg4SGYn3zNRuOj17gGo0qeSE//ytdzGPSxkHa8JvA=
217217
go.bytebuilders.dev/resource-model v0.4.0/go.mod h1:wGndjj3y+Yjh7+e8Wjc6joqzZCC16WZfKNx9adAFVkw=
218218
go.bytebuilders.dev/ui-wizards v0.35.0 h1:/JFbHqPFP/n57Igsg54ShFFENGcROiJHv+ENnE4nMqM=

vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/gatewayconfig_types.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,17 @@ type GatewaySpec struct {
4545
Echoserver EchoserverSpec `json:"echoserver"`
4646
// +optional
4747
VaultServer kmapi.ObjectReference `json:"vaultServer"`
48+
Cleaner CleanerSpec `json:"cleaner"`
49+
}
50+
51+
type CleanerSpec struct {
52+
Enabled bool `json:"enabled"`
53+
Registry string `json:"registry"`
54+
Repository string `json:"repository"`
55+
Tag string `json:"tag"`
56+
PullPolicy core.PullPolicy `json:"pullPolicy"`
57+
// +optional
58+
SecurityContext *core.SecurityContext `json:"securityContext,omitempty"`
4859
}
4960

5061
type GatewayValues struct {

vendor/go.bytebuilders.dev/catalog/api/gateway/v1alpha1/zz_generated.deepcopy.go

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ github.com/zeebo/xxh3
317317
## explicit; go 1.25
318318
go.appscode.dev/alerts/apis/alerts
319319
go.appscode.dev/alerts/apis/alerts/v1alpha1
320-
# go.bytebuilders.dev/catalog v0.0.23
320+
# go.bytebuilders.dev/catalog v0.0.25-0.20260626115826-a5d44c24f104
321321
## explicit; go 1.25.6
322322
go.bytebuilders.dev/catalog/api/gateway/v1alpha1
323323
# go.bytebuilders.dev/resource-model v0.4.0

0 commit comments

Comments
 (0)