diff --git a/Makefile b/Makefile index 876da2da3..1827c2fe1 100644 --- a/Makefile +++ b/Makefile @@ -410,7 +410,7 @@ lint: $(BUILD_DIRS) --env GO111MODULE=on \ --env GOFLAGS="-mod=vendor" \ $(BUILD_IMAGE) \ - golangci-lint run --enable $(ADDTL_LINTERS) --max-same-issues=100 --timeout=60m --skip-files="generated.*\.go$\" --skip-dirs-use-default --skip-dirs=client,vendor + golangci-lint run --enable $(ADDTL_LINTERS) --max-same-issues=100 --timeout=60m --exclude-files="generated.*\.go$\" --exclude-dirs-use-default --exclude-dirs=client,vendor $(BUILD_DIRS): @mkdir -p $@ diff --git a/hub/menuoutlines/ace/kubedb-accordion.yaml b/hub/menuoutlines/ace/kubedb-accordion.yaml index 44d430ce2..73626d185 100644 --- a/hub/menuoutlines/ace/kubedb-accordion.yaml +++ b/hub/menuoutlines/ace/kubedb-accordion.yaml @@ -152,22 +152,22 @@ spec: - src: https://cdn.appscode.com/k8s/icons/stash.appscode.com/backupconfigurations.png type: image/png items: - - layoutName: stash.appscode.com-v1beta1-backupsessions-kubedb + - layoutName: core.kubestash.com-v1alpha1-backupsessions name: Recent Backups required: true type: - group: stash.appscode.com + group: core.kubestash.com kind: BackupSession - - layoutName: stash.appscode.com-v1alpha1-repositories-kubedb - name: Repository + - layoutName: core.kubestash.com-v1alpha1-backupconfigurations + name: Backup Configuration required: true type: - group: stash.appscode.com - kind: Repository - - layoutName: stash.appscode.com-v1beta1-restoresessions-kubedb + group: core.kubestash.com + kind: BackupConfiguration + - layoutName: core.kubestash.com-v1alpha1-restoresessions name: Recent Restores required: true type: - group: stash.appscode.com + group: core.kubestash.com kind: RestoreSession name: Backups diff --git a/hub/menuoutlines/ace/kubedb-gallery.yaml b/hub/menuoutlines/ace/kubedb-gallery.yaml index f5cfa46ea..434b5da14 100644 --- a/hub/menuoutlines/ace/kubedb-gallery.yaml +++ b/hub/menuoutlines/ace/kubedb-gallery.yaml @@ -152,16 +152,22 @@ spec: - src: https://cdn.appscode.com/k8s/icons/stash.appscode.com/backupconfigurations.png type: image/png items: - - layoutName: stash.appscode.com-v1alpha1-repositories-kubedb - name: Repository + - layoutName: core.kubestash.com-v1alpha1-backupsessions + name: Recent Backups required: true type: - group: stash.appscode.com - kind: Repository - - layoutName: stash.appscode.com-v1beta1-restoresessions-kubedb - name: Restore + group: core.kubestash.com + kind: BackupSession + - layoutName: core.kubestash.com-v1alpha1-backupconfigurations + name: Backup Configuration required: true type: - group: stash.appscode.com + group: core.kubestash.com + kind: BackupConfiguration + - layoutName: core.kubestash.com-v1alpha1-restoresessions + name: Restores + required: true + type: + group: core.kubestash.com kind: RestoreSession name: Backups diff --git a/hub/resourcedescriptors/kubedb.com/v1/pgbouncers.yaml b/hub/resourcedescriptors/kubedb.com/v1/pgbouncers.yaml index d7f27cd54..42f6719d1 100644 --- a/hub/resourcedescriptors/kubedb.com/v1/pgbouncers.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1/pgbouncers.yaml @@ -207,10 +207,13 @@ spec: type: object deletionPolicy: enum: + - Halt - Delete - WipeOut - DoNotTerminate type: string + halted: + type: boolean healthChecker: default: failureThreshold: 1 diff --git a/hub/resourcedescriptors/kubedb.com/v1/proxysqls.yaml b/hub/resourcedescriptors/kubedb.com/v1/proxysqls.yaml index e4e75ec21..e622e041a 100644 --- a/hub/resourcedescriptors/kubedb.com/v1/proxysqls.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1/proxysqls.yaml @@ -171,6 +171,8 @@ spec: - WipeOut - DoNotTerminate type: string + halted: + type: boolean healthChecker: default: failureThreshold: 1 diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/clickhouses.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/clickhouses.yaml index 6f538dcef..eaae3ef21 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/clickhouses.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/clickhouses.yaml @@ -6355,6 +6355,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml index 2647311db..4774d262a 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/druids.yaml @@ -449,6 +449,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/elasticsearches.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/elasticsearches.yaml index 4183abb3c..77e5dca79 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/elasticsearches.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/elasticsearches.yaml @@ -4158,6 +4158,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/etcds.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/etcds.yaml index 0c3190f15..114583808 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/etcds.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/etcds.yaml @@ -3976,6 +3976,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml index ef746b84b..925eb4145 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/ferretdbs.yaml @@ -3488,6 +3488,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/kafkas.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/kafkas.yaml index 97f2df54e..581c4b4d9 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/kafkas.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/kafkas.yaml @@ -6607,6 +6607,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml index 8b4146b43..49db09484 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/mariadbs.yaml @@ -4249,6 +4249,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/memcacheds.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/memcacheds.yaml index 54497c4bb..7b4eb4446 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/memcacheds.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/memcacheds.yaml @@ -3773,6 +3773,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/mongodbs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/mongodbs.yaml index b24a59af2..24d5ba5d9 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/mongodbs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/mongodbs.yaml @@ -9678,6 +9678,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml index 4e7428d01..fce286446 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/mssqlservers.yaml @@ -4723,6 +4723,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml index 08bdd005f..4c9c73ae2 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/mysqls.yaml @@ -4358,6 +4358,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/perconaxtradbs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/perconaxtradbs.yaml index 57357f9c7..c40635ce3 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/perconaxtradbs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/perconaxtradbs.yaml @@ -4190,6 +4190,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/pgbouncers.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/pgbouncers.yaml index 8265ebdc5..b7ce6c8db 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/pgbouncers.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/pgbouncers.yaml @@ -205,6 +205,8 @@ spec: - databaseName - databaseRef type: object + halted: + type: boolean healthChecker: default: failureThreshold: 1 @@ -3070,6 +3072,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: @@ -3143,6 +3146,7 @@ spec: type: string terminationPolicy: enum: + - Halt - Delete - WipeOut - DoNotTerminate diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml index 89566db4a..32f981bba 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/pgpools.yaml @@ -3495,6 +3495,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/postgreses.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/postgreses.yaml index b80adad43..8fc502b05 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/postgreses.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/postgreses.yaml @@ -4400,6 +4400,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/proxysqls.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/proxysqls.yaml index 2da80d1f8..4e2cd0ba3 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/proxysqls.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/proxysqls.yaml @@ -164,6 +164,8 @@ spec: type: string type: object x-kubernetes-map-type: atomic + halted: + type: boolean healthChecker: default: failureThreshold: 1 @@ -3078,6 +3080,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml index cc3a98598..c52b39284 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/rabbitmqs.yaml @@ -178,6 +178,17 @@ spec: type: string disableSecurity: type: boolean + disabledProtocols: + items: + enum: + - http + - amqp + - mqtt + - stomp + - web_mqtt + - web_stomp + type: string + type: array enableSSL: type: boolean halted: @@ -3479,6 +3490,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/redises.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/redises.yaml index f2b9c483d..6d4291dd2 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/redises.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/redises.yaml @@ -4253,6 +4253,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/redissentinels.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/redissentinels.yaml index de56c7964..3cf3422d5 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/redissentinels.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/redissentinels.yaml @@ -2940,6 +2940,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml index 24866ec05..75bdcc47d 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/singlestores.yaml @@ -4487,6 +4487,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml index d030debf8..e8f2eee54 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/solrs.yaml @@ -3482,6 +3482,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml b/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml index bf33e7fab..c87b92f54 100644 --- a/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml +++ b/hub/resourcedescriptors/kubedb.com/v1alpha2/zookeepers.yaml @@ -3481,6 +3481,7 @@ spec: - primary - standby - stats + - dashboard type: string metadata: properties: diff --git a/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml b/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml index f9bcf00c2..471195e2b 100644 --- a/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml +++ b/hub/resourcedescriptors/ops.kubedb.com/v1alpha1/singlestoreopsrequests.yaml @@ -121,17 +121,139 @@ spec: type: string type: object x-kubernetes-map-type: atomic + horizontalScaling: + properties: + aggregator: + format: int32 + type: integer + leaf: + format: int32 + type: integer + type: object restart: type: object timeout: type: string + tls: + properties: + certificates: + items: + properties: + alias: + type: string + dnsNames: + items: + type: string + type: array + duration: + type: string + emailAddresses: + items: + type: string + type: array + ipAddresses: + items: + type: string + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + privateKey: + properties: + encoding: + enum: + - PKCS1 + - PKCS8 + type: string + type: object + renewBefore: + type: string + secretName: + type: string + subject: + properties: + countries: + items: + type: string + type: array + localities: + items: + type: string + type: array + organizationalUnits: + items: + type: string + type: array + organizations: + items: + type: string + type: array + postalCodes: + items: + type: string + type: array + provinces: + items: + type: string + type: array + serialNumber: + type: string + streetAddresses: + items: + type: string + type: array + type: object + uris: + items: + type: string + type: array + required: + - alias + type: object + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + remove: + type: boolean + rotateCertificates: + type: boolean + type: object type: enum: + - UpdateVersion + - HorizontalScaling - VerticalScaling - VolumeExpansion - Restart - Configuration + - ReconfigureTLS type: string + updateVersion: + properties: + targetVersion: + type: string + type: object verticalScaling: properties: aggregator: diff --git a/icons/core.kubestash.com/backupbatches.png b/icons/core.kubestash.com/backupbatches.png new file mode 100644 index 000000000..6a63bd7f9 Binary files /dev/null and b/icons/core.kubestash.com/backupbatches.png differ diff --git a/icons/core.kubestash.com/backupbatches.svg b/icons/core.kubestash.com/backupbatches.svg new file mode 100644 index 000000000..de0f274a5 --- /dev/null +++ b/icons/core.kubestash.com/backupbatches.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/icons/core.kubestash.com/backupblueprints.png b/icons/core.kubestash.com/backupblueprints.png new file mode 100644 index 000000000..cf25bf9eb Binary files /dev/null and b/icons/core.kubestash.com/backupblueprints.png differ diff --git a/icons/core.kubestash.com/backupblueprints.svg b/icons/core.kubestash.com/backupblueprints.svg new file mode 100644 index 000000000..10ace707f --- /dev/null +++ b/icons/core.kubestash.com/backupblueprints.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/core.kubestash.com/backupconfigurations.png b/icons/core.kubestash.com/backupconfigurations.png new file mode 100644 index 000000000..8a8ff0734 Binary files /dev/null and b/icons/core.kubestash.com/backupconfigurations.png differ diff --git a/icons/core.kubestash.com/backupconfigurations.svg b/icons/core.kubestash.com/backupconfigurations.svg new file mode 100644 index 000000000..0113ebf4d --- /dev/null +++ b/icons/core.kubestash.com/backupconfigurations.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/core.kubestash.com/backupsessions.png b/icons/core.kubestash.com/backupsessions.png new file mode 100644 index 000000000..8a088e42f Binary files /dev/null and b/icons/core.kubestash.com/backupsessions.png differ diff --git a/icons/core.kubestash.com/backupsessions.svg b/icons/core.kubestash.com/backupsessions.svg new file mode 100644 index 000000000..bb9ae5d24 --- /dev/null +++ b/icons/core.kubestash.com/backupsessions.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/core.kubestash.com/functions.png b/icons/core.kubestash.com/functions.png new file mode 100644 index 000000000..eed67d304 Binary files /dev/null and b/icons/core.kubestash.com/functions.png differ diff --git a/icons/core.kubestash.com/functions.svg b/icons/core.kubestash.com/functions.svg new file mode 100644 index 000000000..c6b1f106b --- /dev/null +++ b/icons/core.kubestash.com/functions.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icons/core.kubestash.com/restorebatches.png b/icons/core.kubestash.com/restorebatches.png new file mode 100644 index 000000000..d05925d24 Binary files /dev/null and b/icons/core.kubestash.com/restorebatches.png differ diff --git a/icons/core.kubestash.com/restorebatches.svg b/icons/core.kubestash.com/restorebatches.svg new file mode 100644 index 000000000..b80e47db8 --- /dev/null +++ b/icons/core.kubestash.com/restorebatches.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/icons/core.kubestash.com/restoresessions.png b/icons/core.kubestash.com/restoresessions.png new file mode 100644 index 000000000..7aa08159b Binary files /dev/null and b/icons/core.kubestash.com/restoresessions.png differ diff --git a/icons/core.kubestash.com/restoresessions.svg b/icons/core.kubestash.com/restoresessions.svg new file mode 100644 index 000000000..8a3b7cf50 --- /dev/null +++ b/icons/core.kubestash.com/restoresessions.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/core.kubestash.com/tasks.png b/icons/core.kubestash.com/tasks.png new file mode 100644 index 000000000..294d90537 Binary files /dev/null and b/icons/core.kubestash.com/tasks.png differ diff --git a/icons/core.kubestash.com/tasks.svg b/icons/core.kubestash.com/tasks.svg new file mode 100644 index 000000000..1207c1a9e --- /dev/null +++ b/icons/core.kubestash.com/tasks.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/storage.kubestash.com/repositories.png b/icons/storage.kubestash.com/repositories.png new file mode 100644 index 000000000..95b5b29d4 Binary files /dev/null and b/icons/storage.kubestash.com/repositories.png differ diff --git a/icons/storage.kubestash.com/repositories.svg b/icons/storage.kubestash.com/repositories.svg new file mode 100644 index 000000000..b7b3d4c73 --- /dev/null +++ b/icons/storage.kubestash.com/repositories.svg @@ -0,0 +1,11 @@ + + + + + + + + + + +