feat: drop support of Nginx cache sync

tsuru · May 17, 2023 · 632e93d · 632e93d
1 parent 1cb7a44
commit 632e93d
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 797 deletions.
diff --git a/api/v1alpha1/rpaasplan_types.go b/api/v1alpha1/rpaasplan_types.go
@@ -66,10 +66,6 @@ type NginxConfig struct {
 	CacheSize        *resource.Quantity `json:"cacheSize,omitempty"`
 	CacheZoneSize    *resource.Quantity `json:"cacheZoneSize,omitempty"`
 
-	CacheSnapshotEnabled bool                  `json:"cacheSnapshotEnabled,omitempty"`
-	CacheSnapshotStorage CacheSnapshotStorage  `json:"cacheSnapshotStorage,omitempty"`
-	CacheSnapshotSync    CacheSnapshotSyncSpec `json:"cacheSnapshotSync,omitempty"`
-
 	LogFormat            string            `json:"logFormat,omitempty"`
 	LogFormatEscape      string            `json:"logFormatEscape,omitempty"`
 	LogFormatName        string            `json:"logFormatName,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/cmd/plugin/rpaasv2/cmd/info_test.go b/cmd/plugin/rpaasv2/cmd/info_test.go
@@ -338,8 +338,6 @@ Plan overrides:
   "image": "registry.example.com/my/repository/nginx:v1",
   "config": {
     "cacheEnabled": false,
-    "cacheSnapshotStorage": {},
-    "cacheSnapshotSync": {},
     "workerProcesses": 4,
     "workerConnections": 4096
   },

diff --git a/config/crd/bases/extensions.tsuru.io_rpaasflavors.yaml b/config/crd/bases/extensions.tsuru.io_rpaasflavors.yaml
@@ -422,48 +422,6 @@ spec:
                             - type: string
                             pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                             x-kubernetes-int-or-string: true
-                          cacheSnapshotEnabled:
-                            type: boolean
-                          cacheSnapshotStorage:
-                            properties:
-                              storageClassName:
-                                type: string
-                              storageSize:
-                                anyOf:
-                                - type: integer
-                                - type: string
-                                pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                                x-kubernetes-int-or-string: true
-                              volumeLabels:
-                                additionalProperties:
-                                  type: string
-                                type: object
-                            type: object
-                          cacheSnapshotSync:
-                            properties:
-                              cmdPVCToPod:
-                                description: CmdPVCToPod is used to customize command
-                                  used to sync persistent storage (PVC) to memory
-                                  cache (POD)
-                                items:
-                                  type: string
-                                type: array
-                              cmdPodToPVC:
-                                description: CmdPodToPVC is used to customize command
-                                  used to sync memory cache (POD) to persistent storage
-                                  (PVC)
-                                items:
-                                  type: string
-                                type: array
-                              image:
-                                description: Container is the image used to sync the
-                                  containers default is bitnami/kubectl:latest
-                                type: string
-                              schedule:
-                                description: Schedule is the the cron time string
-                                  format, see https://en.wikipedia.org/wiki/Cron.
-                                type: string
-                            type: object
                           cacheZoneSize:
                             anyOf:
                             - type: integer

diff --git a/config/crd/bases/extensions.tsuru.io_rpaasinstances.yaml b/config/crd/bases/extensions.tsuru.io_rpaasinstances.yaml
@@ -398,48 +398,6 @@ spec:
                         - type: string
                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                         x-kubernetes-int-or-string: true
-                      cacheSnapshotEnabled:
-                        type: boolean
-                      cacheSnapshotStorage:
-                        properties:
-                          storageClassName:
-                            type: string
-                          storageSize:
-                            anyOf:
-                            - type: integer
-                            - type: string
-                            pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                            x-kubernetes-int-or-string: true
-                          volumeLabels:
-                            additionalProperties:
-                              type: string
-                            type: object
-                        type: object
-                      cacheSnapshotSync:
-                        properties:
-                          cmdPVCToPod:
-                            description: CmdPVCToPod is used to customize command
-                              used to sync persistent storage (PVC) to memory cache
-                              (POD)
-                            items:
-                              type: string
-                            type: array
-                          cmdPodToPVC:
-                            description: CmdPodToPVC is used to customize command
-                              used to sync memory cache (POD) to persistent storage
-                              (PVC)
-                            items:
-                              type: string
-                            type: array
-                          image:
-                            description: Container is the image used to sync the containers
-                              default is bitnami/kubectl:latest
-                            type: string
-                          schedule:
-                            description: Schedule is the the cron time string format,
-                              see https://en.wikipedia.org/wiki/Cron.
-                            type: string
-                        type: object
                       cacheZoneSize:
                         anyOf:
                         - type: integer

diff --git a/config/crd/bases/extensions.tsuru.io_rpaasplans.yaml b/config/crd/bases/extensions.tsuru.io_rpaasplans.yaml
@@ -54,46 +54,6 @@ spec:
                     - type: string
                     pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                     x-kubernetes-int-or-string: true
-                  cacheSnapshotEnabled:
-                    type: boolean
-                  cacheSnapshotStorage:
-                    properties:
-                      storageClassName:
-                        type: string
-                      storageSize:
-                        anyOf:
-                        - type: integer
-                        - type: string
-                        pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                        x-kubernetes-int-or-string: true
-                      volumeLabels:
-                        additionalProperties:
-                          type: string
-                        type: object
-                    type: object
-                  cacheSnapshotSync:
-                    properties:
-                      cmdPVCToPod:
-                        description: CmdPVCToPod is used to customize command used
-                          to sync persistent storage (PVC) to memory cache (POD)
-                        items:
-                          type: string
-                        type: array
-                      cmdPodToPVC:
-                        description: CmdPodToPVC is used to customize command used
-                          to sync memory cache (POD) to persistent storage (PVC)
-                        items:
-                          type: string
-                        type: array
-                      image:
-                        description: Container is the image used to sync the containers
-                          default is bitnami/kubectl:latest
-                        type: string
-                      schedule:
-                        description: Schedule is the the cron time string format,
-                          see https://en.wikipedia.org/wiki/Cron.
-                        type: string
-                    type: object
                   cacheZoneSize:
                     anyOf:
                     - type: integer