Separate CHYT init options into makeDefault and createPublicClique

ytsaurus · Sep 19, 2024 · 1334eeb · 1334eeb
1 parent 54143b9
commit 1334eeb
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/api/v1/chyt_types.go b/api/v1/chyt_types.go
@@ -40,8 +40,12 @@ type ChytSpec struct {
 
 	Ytsaurus *corev1.LocalObjectReference `json:"ytsaurus,omitempty"`
 	Image    string                       `json:"image,omitempty"`
+	// Mark specified image as default for cliques.
 	//+kubebuilder:default:=false
 	MakeDefault bool `json:"makeDefault"`
+	// Create ch_public clique, which is used by default when running CHYT queries.
+	//+kubebuilder:default:=false
+	CreatePublicClique bool `json:"createPublicClique"`
 }
 
 // ChytStatus defines the observed state of Chyt

diff --git a/config/crd/bases/cluster.ytsaurus.tech_chyts.yaml b/config/crd/bases/cluster.ytsaurus.tech_chyts.yaml
@@ -40,6 +40,11 @@ spec:
           spec:
             description: ChytSpec defines the desired state of Chyt
             properties:
+              createPublicClique:
+                default: false
+                description: Create ch_public clique, which is used by default when
+                  running CHYT queries.
+                type: boolean
               image:
                 type: string
               imagePullSecrets:
@@ -58,6 +63,7 @@ spec:
                 type: array
               makeDefault:
                 default: false
+                description: Mark specified image as default for cliques.
                 type: boolean
               ytsaurus:
                 description: |-
@@ -72,6 +78,7 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
             required:
+            - createPublicClique
             - makeDefault
             type: object
           status:

diff --git a/config/samples/cluster_v1_chyt.yaml b/config/samples/cluster_v1_chyt.yaml
@@ -8,3 +8,4 @@ spec:
       minisaurus
   image: ghcr.io/ytsaurus/chyt:2.14.0-relwithdebinfo
   makeDefault: true
+  createPublicClique: true
diff --git a/docs/api.md b/docs/api.md
@@ -181,7 +181,8 @@ _Appears in:_
 | `imagePullSecrets` _[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#localobjectreference-v1-core) array_ |  |  |  |
 | `ytsaurus` _[LocalObjectReference](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#localobjectreference-v1-core)_ |  |  |  |
 | `image` _string_ |  |  |  |
-| `makeDefault` _boolean_ |  | false |  |
+| `makeDefault` _boolean_ | Mark specified image as default for cliques. | false |  |
+| `createPublicClique` _boolean_ | Create ch_public clique, which is used by default when running CHYT queries. | false |  |
 
 
 

diff --git a/pkg/components/chyt.go b/pkg/components/chyt.go
@@ -188,7 +188,7 @@ func (c *Chyt) doSync(ctx context.Context, dry bool) (ComponentStatus, error) {
 		return status, err
 	}
 
-	if c.ytsaurus.Spec.StrawberryController != nil && c.chyt.GetResource().Spec.MakeDefault {
+	if c.ytsaurus.Spec.StrawberryController != nil && c.chyt.GetResource().Spec.CreatePublicClique {
 		if !dry {
 			c.prepareChPublicJob()
 		}

diff --git a/ytop-chart/templates/crds/chyts.cluster.ytsaurus.tech.yaml b/ytop-chart/templates/crds/chyts.cluster.ytsaurus.tech.yaml
@@ -51,6 +51,11 @@ spec:
           spec:
             description: ChytSpec defines the desired state of Chyt
             properties:
+              createPublicClique:
+                default: false
+                description: Create ch_public clique, which is used by default when
+                  running CHYT queries.
+                type: boolean
               image:
                 type: string
               imagePullSecrets:
@@ -69,6 +74,7 @@ spec:
                 type: array
               makeDefault:
                 default: false
+                description: Mark specified image as default for cliques.
                 type: boolean
               ytsaurus:
                 description: |-
@@ -83,6 +89,7 @@ spec:
                 type: object
                 x-kubernetes-map-type: atomic
             required:
+            - createPublicClique
             - makeDefault
             type: object
           status: