Skip to content

Commit 0580641

Browse files
ArnobKumarSahaArnobKumarSaha
committed
Update uninstall scripts & CRDs
Signed-off-by: Arnob kumar saha <arnob@appscode.com>
1 parent 45dcea5 commit 0580641

10 files changed

Lines changed: 53 additions & 61 deletions

File tree

‎charts/catalog-manager/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,8 +3367,6 @@ spec:
33673367
type: boolean
33683368
name:
33693369
type: string
3370-
required:
3371-
- create
33723370
type: object
33733371
tolerations:
33743372
description: If specified, the pod's tolerations.
@@ -4883,8 +4881,6 @@ spec:
48834881
type: string
48844882
replicas:
48854883
type: integer
4886-
required:
4887-
- priorityClassName
48884884
type: object
48894885
gateway-converter:
48904886
properties:
@@ -6416,8 +6412,6 @@ spec:
64166412
type: boolean
64176413
name:
64186414
type: string
6419-
required:
6420-
- create
64216415
type: object
64226416
tolerations:
64236417
description: If specified, the pod's tolerations.

‎charts/service-gateway-presets/crds/gateway.catalog.appscode.com_gatewayconfigs.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,8 +3367,6 @@ spec:
33673367
type: boolean
33683368
name:
33693369
type: string
3370-
required:
3371-
- create
33723370
type: object
33733371
tolerations:
33743372
description: If specified, the pod's tolerations.
@@ -4883,8 +4881,6 @@ spec:
48834881
type: string
48844882
replicas:
48854883
type: integer
4886-
required:
4887-
- priorityClassName
48884884
type: object
48894885
gateway-converter:
48904886
properties:
@@ -6416,8 +6412,6 @@ spec:
64166412
type: boolean
64176413
name:
64186414
type: string
6419-
required:
6420-
- create
64216415
type: object
64226416
tolerations:
64236417
description: If specified, the pod's tolerations.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
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.22
6+
go.bytebuilders.dev/catalog v0.0.23-0.20260427125711-362e13006a81
77
go.bytebuilders.dev/resource-model v0.4.0
88
go.bytebuilders.dev/ui-wizards v0.31.0
99
go.openviz.dev/installer v0.0.0-20260408131258-3023af9e16ae
@@ -141,7 +141,7 @@ require (
141141
sigs.k8s.io/randfill v1.0.0 // indirect
142142
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
143143
stash.appscode.dev/apimachinery v0.42.0 // indirect
144-
voyagermesh.dev/installer v0.0.0-20260422083412-9fb2b415ba60 // indirect
144+
voyagermesh.dev/installer v0.0.0-20260427124054-e6fbf86716f0 // indirect
145145
x-helm.dev/apimachinery v0.0.18 // indirect
146146
)
147147

‎go.sum‎

Lines changed: 4 additions & 4 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.20250217100836-596fabefb762 h1:ZHLkcss6a932HK5WGtaqKxHrVinTTqjC212zvurk1uc=
213213
go.appscode.dev/alerts v0.2.1-0.20250217100836-596fabefb762/go.mod h1:ry87MIviY9ALBNP1rLSCZuFtbRcl/UuvfIyvSag3ENI=
214-
go.bytebuilders.dev/catalog v0.0.22 h1:VX55dYTGYbTmnNPtd1KnIVsn/O6Jl4Kbz4qYWVTloOA=
215-
go.bytebuilders.dev/catalog v0.0.22/go.mod h1:JeefcRl8d/ejVYitcnnEMXx1eYCI1pjulhWpE5dri7s=
214+
go.bytebuilders.dev/catalog v0.0.23-0.20260427125711-362e13006a81 h1:53i2RqeYLV/J9qimMkUaI7LoAhIfeo9iGwMNqnvE7q4=
215+
go.bytebuilders.dev/catalog v0.0.23-0.20260427125711-362e13006a81/go.mod h1:nn0qsSn19iWbuyCgAMjn5HJ1j9sh/qY6UIiehxnJZF0=
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.31.0 h1:jLKOZEdUQbyA6r0iFe9khwB5U46Ad2HfgBlqmysc73o=
@@ -373,7 +373,7 @@ sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
373373
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
374374
stash.appscode.dev/apimachinery v0.42.0 h1:tqGAhAbII/WoYxM4LyQW+Hc6jgjRgBYUcI3AORwBLYs=
375375
stash.appscode.dev/apimachinery v0.42.0/go.mod h1:Q7iqhJAS0n7IV545NxaYNE5C31bBrWklZj7SfjOyryc=
376-
voyagermesh.dev/installer v0.0.0-20260422083412-9fb2b415ba60 h1:jrdyQ3lK3zxiE8P42Li8O37n5DZXvk+yxtakNKWF9F4=
377-
voyagermesh.dev/installer v0.0.0-20260422083412-9fb2b415ba60/go.mod h1:htuE0aMmX0+gT/L47MkQ0nMy2v9Dv2uXCpr+XQoo7jQ=
376+
voyagermesh.dev/installer v0.0.0-20260427124054-e6fbf86716f0 h1:4v/meCp51rpWEe2va5iV/YRQtd0pJzzNtxq7DDEuixg=
377+
voyagermesh.dev/installer v0.0.0-20260427124054-e6fbf86716f0/go.mod h1:htuE0aMmX0+gT/L47MkQ0nMy2v9Dv2uXCpr+XQoo7jQ=
378378
x-helm.dev/apimachinery v0.0.18 h1:UHrC0PGjeSRSRECXRaVUl4fIIwwyQSnNFCCAevSI14w=
379379
x-helm.dev/apimachinery v0.0.18/go.mod h1:C+M2A9cVmNhqP6ZGft4opUm1cPiWLHukKV5kWNkzXZs=

‎hack/deploy/uninstall-ace.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ done
2323

2424
echo "uninstall ace chart"
2525
helm uninstall ace -n ace
26+
helm uninstall ace -n ace-gw
2627
echo "deleting ace jobs"
2728
kubectl delete jobs -n ace ace-openfga-migrate ace-setup || true
2829
# wait for pods to teminate
@@ -48,6 +49,7 @@ done
4849
for x in $(kubectl get helmreleases.helm.toolkit.fluxcd.io -n kubeops -o name); do
4950
kubectl patch $x -n kubeops -p '{"metadata":{"finalizers":null}}' --type=merge
5051
done
52+
kubectl patch helmreleases.helm.toolkit.fluxcd.io ace -n ace-gw -p '{"metadata":{"finalizers":null}}' --type=merge
5153
# delete helmreleases
5254
kubectl delete helmreleases.helm.toolkit.fluxcd.io -n kubeops --all
5355

‎vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ github.com/zeebo/xxh3
317317
## explicit; go 1.22.0
318318
go.appscode.dev/alerts/apis/alerts
319319
go.appscode.dev/alerts/apis/alerts/v1alpha1
320-
# go.bytebuilders.dev/catalog v0.0.22
320+
# go.bytebuilders.dev/catalog v0.0.23-0.20260427125711-362e13006a81
321321
## explicit; go 1.25.6
322322
go.bytebuilders.dev/catalog/api/gateway/v1alpha1
323323
# go.bytebuilders.dev/resource-model v0.4.0
@@ -1054,7 +1054,7 @@ stash.appscode.dev/apimachinery/apis/stash
10541054
stash.appscode.dev/apimachinery/apis/stash/v1alpha1
10551055
stash.appscode.dev/apimachinery/apis/stash/v1beta1
10561056
stash.appscode.dev/apimachinery/crds
1057-
# voyagermesh.dev/installer v0.0.0-20260422083412-9fb2b415ba60
1057+
# voyagermesh.dev/installer v0.0.0-20260427124054-e6fbf86716f0
10581058
## explicit; go 1.25.0
10591059
voyagermesh.dev/installer/apis/installer
10601060
voyagermesh.dev/installer/apis/installer/v1alpha1

‎vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/crd_manager_types.go‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -46,39 +46,39 @@ type CrdManager struct {
4646
// CrdManagerSpec is the schema for Identity Server values file
4747
type CrdManagerSpec struct {
4848
//+optional
49-
NameOverride string `json:"nameOverride"`
49+
NameOverride string `json:"nameOverride,omitempty"`
5050
//+optional
51-
FullnameOverride string `json:"fullnameOverride"`
51+
FullnameOverride string `json:"fullnameOverride,omitempty"`
5252
//+optional
53-
RegistryFQDN string `json:"registryFQDN"`
53+
RegistryFQDN string `json:"registryFQDN,omitempty"`
5454
// +optional
55-
Image ImageRef `json:"image"`
55+
Image ImageRef `json:"image,omitempty"`
5656
// +optional
57-
ImagePullPolicy string `json:"imagePullPolicy"`
57+
ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
5858
//+optional
59-
ImagePullSecrets []string `json:"imagePullSecrets"`
59+
ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
6060
//+optional
61-
PodAnnotations map[string]string `json:"podAnnotations"`
61+
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
6262
// PodSecurityContext holds pod-level security attributes and common container settings.
6363
// Optional: Defaults to empty. See type description for default values of each field.
6464
// +optional
65-
PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext"`
65+
PodSecurityContext *core.PodSecurityContext `json:"podSecurityContext,omitempty"`
6666
//+optional
67-
SecurityContext *core.SecurityContext `json:"securityContext"`
67+
SecurityContext *core.SecurityContext `json:"securityContext,omitempty"`
6868
//+optional
69-
Resources core.ResourceRequirements `json:"resources"`
69+
Resources core.ResourceRequirements `json:"resources,omitempty"`
7070
//+optional
71-
NodeSelector map[string]string `json:"nodeSelector"`
71+
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
7272
// If specified, the pod's tolerations.
7373
// +optional
74-
Tolerations []core.Toleration `json:"tolerations"`
74+
Tolerations []core.Toleration `json:"tolerations,omitempty"`
7575
// If specified, the pod's scheduling constraints
7676
// +optional
77-
Affinity *core.Affinity `json:"affinity"`
77+
Affinity *core.Affinity `json:"affinity,omitempty"`
7878
// +optional
79-
ServiceAccount ServiceAccountSpec `json:"serviceAccount"`
79+
ServiceAccount ServiceAccountSpec `json:"serviceAccount,omitempty"`
8080
// +optional
81-
FeatureGates map[string]bool `json:"featureGates"`
81+
FeatureGates map[string]bool `json:"featureGates,omitempty"`
8282
RemoveUnusedCRDs bool `json:"removeUnusedCRDs,omitempty"`
8383
TTLSecondsAfterFinished int `json:"ttlSecondsAfterFinished,omitempty"`
8484
// +optional

‎vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/gateway_converter_types.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,22 +53,22 @@ type GatewayConverterSpec struct {
5353
Server *Container `json:"server,omitempty"`
5454
ImagePullPolicy *string `json:"imagePullPolicy,omitempty"`
5555
//+optional
56-
ImagePullSecrets []string `json:"imagePullSecrets"`
56+
ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
5757
//+optional
58-
CriticalAddon bool `json:"criticalAddon"`
58+
CriticalAddon bool `json:"criticalAddon,omitempty"`
5959
//+optional
60-
LogLevel int32 `json:"logLevel,omitempty"`
60+
LogLevel int32 `json:"logLevel,omitempty,omitempty"`
6161
//+optional
62-
Annotations map[string]string `json:"annotations"`
62+
Annotations map[string]string `json:"annotations,omitempty"`
6363
//+optional
64-
PodAnnotations map[string]string `json:"podAnnotations"`
64+
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
6565
//+optional
66-
PodLabels map[string]string `json:"podLabels"`
66+
PodLabels map[string]string `json:"podLabels,omitempty"`
6767
//+optional
6868
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
6969
// If specified, the pod's tolerations.
7070
// +optional
71-
Tolerations []core.Toleration `json:"tolerations"`
71+
Tolerations []core.Toleration `json:"tolerations,omitempty"`
7272
// If specified, the pod's scheduling constraints
7373
// +optional
7474
Affinity *core.Affinity `json:"affinity,omitempty"`

‎vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_gateway_types.go‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ type PodDisruptionBudgetSpec struct {
8888

8989
type DeploymentSpec struct {
9090
// +optional
91-
Annotations map[string]string `json:"annotations"`
92-
EnvoyGateway *EnvoyGatewayDeployment `json:"envoyGateway,omitempty"`
93-
Ports []Port `json:"ports,omitempty"`
94-
PriorityClassName *string `json:"priorityClassName"`
95-
Replicas *int `json:"replicas,omitempty"`
96-
Pod *PodTemplateSpec `json:"pod,omitempty"`
91+
Annotations map[string]string `json:"annotations,omitempty"`
92+
EnvoyGateway *EnvoyGatewayDeployment `json:"envoyGateway,omitempty"`
93+
Ports []Port `json:"ports,omitempty"`
94+
// +optional
95+
PriorityClassName *string `json:"priorityClassName,omitempty"`
96+
Replicas *int `json:"replicas,omitempty"`
97+
Pod *PodTemplateSpec `json:"pod,omitempty"`
9798
}
9899

99100
type ServiceSpec struct {
@@ -130,17 +131,17 @@ type Port struct {
130131

131132
type PodTemplateSpec struct {
132133
// +optional
133-
Affinity *core.Affinity `json:"affinity"`
134+
Affinity *core.Affinity `json:"affinity,omitempty"`
134135
// +optional
135-
Annotations map[string]string `json:"annotations"`
136+
Annotations map[string]string `json:"annotations,omitempty"`
136137
// +optional
137-
Labels map[string]string `json:"labels"`
138+
Labels map[string]string `json:"labels,omitempty"`
138139
// +optional
139-
TopologySpreadConstraints []core.TopologySpreadConstraint `json:"topologySpreadConstraints"`
140+
TopologySpreadConstraints []core.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
140141
// +optional
141-
Tolerations []core.Toleration `json:"tolerations"`
142+
Tolerations []core.Toleration `json:"tolerations,omitempty"`
142143
// +optional
143-
NodeSelector map[string]string `json:"nodeSelector"`
144+
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
144145
}
145146

146147
type EnvoyGatewayConfig struct {
@@ -220,7 +221,7 @@ type TesterSpec struct {
220221
Resources core.ResourceRequirements `json:"resources"`
221222
SecurityContext *core.SecurityContext `json:"securityContext,omitempty"`
222223
// +optional
223-
Pod TesterPodSpec `json:"pod"`
224+
Pod TesterPodSpec `json:"pod,omitempty"`
224225
}
225226
type TesterPodSpec struct {
226227
PodTemplateSpec `json:",inline,omitempty"`

‎vendor/voyagermesh.dev/installer/apis/installer/v1alpha1/voyager_types.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ type VoyagerSpec struct {
9393

9494
type ImageRef struct {
9595
// +optional
96-
Registry string `json:"registry"`
96+
Registry string `json:"registry,omitempty"`
9797
// +optional
98-
Repository string `json:"repository"`
98+
Repository string `json:"repository,omitempty"`
9999
// +optional
100-
Tag string `json:"tag"`
100+
Tag string `json:"tag,omitempty"`
101101
}
102102

103103
type CleanerRef struct {
@@ -122,11 +122,12 @@ type CloudConfig struct {
122122
}
123123

124124
type ServiceAccountSpec struct {
125-
Create bool `json:"create"`
126125
//+optional
127-
Name *string `json:"name"`
126+
Create bool `json:"create,omitempty"`
128127
//+optional
129-
Annotations map[string]string `json:"annotations"`
128+
Name *string `json:"name,omitempty"`
129+
//+optional
130+
Annotations map[string]string `json:"annotations,omitempty"`
130131
}
131132

132133
type WebHookSpec struct {

0 commit comments

Comments
 (0)