diff --git a/assets/cloudcasa/cloudcasa-1.tgz b/assets/cloudcasa/cloudcasa-1.tgz new file mode 100644 index 000000000..6a31f2577 Binary files /dev/null and b/assets/cloudcasa/cloudcasa-1.tgz differ diff --git a/assets/index.yaml b/assets/index.yaml index 9ff56b91b..51ae6f3ea 100644 --- a/assets/index.yaml +++ b/assets/index.yaml @@ -206,6 +206,29 @@ entries: - assets/citrix-k8s-cpx-ingress-controller/citrix-k8s-cpx-ingress-controller-1.8.2800.tgz version: 1.8.2800 cloudcasa: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/namespace: cloudcasa-io + catalog.cattle.io/release-name: cloudcasa + apiVersion: v2 + appVersion: "1.0" + created: "2021-04-13T23:59:35.41596176Z" + description: CloudCasa backup service for Kubernetes and cloud native applications + digest: 014dcf27bd1589e86e3401fadc3ebbb77a339eb8a791b5286f196aa828e5ffb3 + home: https://cloudcasa.io + icon: https://partner-charts.rancher.io/assets/logos/cloudcasa.png + keywords: + - backup + - Catalogic + - CloudCasa + kubeVersion: '>=1.13.0-0' + maintainers: + - email: info@catalogicsoftware.com + name: catalogicsoftware + name: cloudcasa + urls: + - assets/cloudcasa/cloudcasa-1.tgz + version: "1" - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/namespace: cloudcasa-io @@ -660,4 +683,4 @@ entries: urls: - assets/sysdig/sysdig-1.9.200.tgz version: 1.9.200 -generated: "2021-04-13T23:45:40.963701127Z" +generated: "2021-04-13T23:59:35.408531094Z" diff --git a/charts/cloudcasa/Chart.yaml b/charts/cloudcasa/Chart.yaml index 5cf85779f..2540e4bef 100644 --- a/charts/cloudcasa/Chart.yaml +++ b/charts/cloudcasa/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.1.0 +appVersion: "1.0" description: CloudCasa backup service for Kubernetes and cloud native applications home: https://cloudcasa.io icon: https://partner-charts.rancher.io/assets/logos/cloudcasa.png @@ -12,7 +12,7 @@ maintainers: - email: info@catalogicsoftware.com name: catalogicsoftware name: cloudcasa -version: 0.1.000 +version: 1.000 annotations: catalog.cattle.io/certified: partner catalog.cattle.io/release-name: cloudcasa diff --git a/charts/cloudcasa/templates/cluster-register.yaml b/charts/cloudcasa/templates/cluster-register.yaml index 57552aa2e..0ea859686 100644 --- a/charts/cloudcasa/templates/cluster-register.yaml +++ b/charts/cloudcasa/templates/cluster-register.yaml @@ -1,15 +1,3 @@ -# -# The velero part of the agent spec has been generated using the following -# command: -# -# velero install \ -# --features=EnableCSI \ -# --no-default-backup-location=true \ -# --namespace=cloudcasa-io \ -# --use-volume-snapshots=false \ -# --no-secret \ -# --plugins velero/velero-plugin-for-aws \ -# --dry-run -o yaml > ./intermediate-template.yaml # ----------------------------------------------------------------------- # Steps to delete the agent deployment are: # ----------------------------------------------------------------------- @@ -2288,6 +2276,7 @@ items: - name: v1 served: true storage: true +{{- if not (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "volumesnapshotlocations.velero.io") }} - apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -2348,6 +2337,7 @@ items: - name: v1 served: true storage: true +{{- end }} - apiVersion: v1 kind: ServiceAccount metadata: @@ -2373,6 +2363,7 @@ items: namespace: {{ .Values.namespace }} kind: List --- +{{- if not (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "volumesnapshotclasses.snapshot.storage.k8s.io") }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -2456,7 +2447,9 @@ status: plural: "" conditions: [] storedVersions: [] +{{- end }} --- +{{- if not (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "volumesnapshotcontents.snapshot.storage.k8s.io") }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -2688,7 +2681,9 @@ status: plural: "" conditions: [] storedVersions: [] +{{- end }} --- +{{- if not (lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" "volumesnapshots.snapshot.storage.k8s.io") }} apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: @@ -2873,6 +2868,7 @@ status: plural: "" conditions: [] storedVersions: [] +{{- end }} --- apiVersion: apps/v1 kind: Deployment @@ -2908,6 +2904,8 @@ spec: env: - name: AMDS_CLUSTER_ID value: "{{ .Values.cluster_id }}" + - name: KUBEMOVER_IMAGE + value: "{{ .Values.kagent_image.repository }}:{{ .Values.kagent_image.tag }}" volumeMounts: - mountPath: /credentials name: cloud-credentials @@ -2939,6 +2937,10 @@ spec: value: /plugins - name: AWS_SHARED_CREDENTIALS_FILE value: /credentials/s3/cloud + - name: GOOGLE_APPLICATION_CREDENTIALS + value: /credentials/gcp/cloud + - name: AZURE_CREDENTIALS_FILE + value: /credentials/azure/cloud ports: - containerPort: 8085 name: metrics @@ -2964,6 +2966,20 @@ spec: volumeMounts: - mountPath: /target name: plugins +# - image: velero/velero-plugin-for-gcp:v1.1.0 +# imagePullPolicy: IfNotPresent +# name: velero-plugin-for-gcp +# resources: {} +# volumeMounts: +# - mountPath: /target +# name: plugins +# - image: velero/velero-plugin-for-microsoft-azure:v1.1.1 +# imagePullPolicy: IfNotPresent +# name: velero-plugin-for-microsoft-azure +# resources: {} +# volumeMounts: +# - mountPath: /target +# name: plugins - image: "{{ .Values.velero_csi_plugin_image.repository }}:{{ .Values.velero_csi_plugin_image.tag }}" imagePullPolicy: IfNotPresent name: velero-plugin-for-csi diff --git a/charts/cloudcasa/values.yaml b/charts/cloudcasa/values.yaml index 8ce3850b6..e51d6a8d3 100644 --- a/charts/cloudcasa/values.yaml +++ b/charts/cloudcasa/values.yaml @@ -11,7 +11,7 @@ namespace: cloudcasa-io velero_csi_plugin_image: registry: docker.io repository: catalogicsoftware/velero-plugin-for-csi - tag: v0.1.2.1 + tag: v0.1.2.3 pullPolicy: IfNotPresent debug: false ## @@ -41,7 +41,7 @@ velero_image: kagent_image: registry: docker.io repository: catalogicsoftware/amds-kagent - tag: 0.1.0-rc.515 + tag: 0.1.0-prod.47 pullPolicy: IfNotPresent debug: false ## diff --git a/index.yaml b/index.yaml index 9ff56b91b..51ae6f3ea 100644 --- a/index.yaml +++ b/index.yaml @@ -206,6 +206,29 @@ entries: - assets/citrix-k8s-cpx-ingress-controller/citrix-k8s-cpx-ingress-controller-1.8.2800.tgz version: 1.8.2800 cloudcasa: + - annotations: + catalog.cattle.io/certified: partner + catalog.cattle.io/namespace: cloudcasa-io + catalog.cattle.io/release-name: cloudcasa + apiVersion: v2 + appVersion: "1.0" + created: "2021-04-13T23:59:35.41596176Z" + description: CloudCasa backup service for Kubernetes and cloud native applications + digest: 014dcf27bd1589e86e3401fadc3ebbb77a339eb8a791b5286f196aa828e5ffb3 + home: https://cloudcasa.io + icon: https://partner-charts.rancher.io/assets/logos/cloudcasa.png + keywords: + - backup + - Catalogic + - CloudCasa + kubeVersion: '>=1.13.0-0' + maintainers: + - email: info@catalogicsoftware.com + name: catalogicsoftware + name: cloudcasa + urls: + - assets/cloudcasa/cloudcasa-1.tgz + version: "1" - annotations: catalog.cattle.io/certified: partner catalog.cattle.io/namespace: cloudcasa-io @@ -660,4 +683,4 @@ entries: urls: - assets/sysdig/sysdig-1.9.200.tgz version: 1.9.200 -generated: "2021-04-13T23:45:40.963701127Z" +generated: "2021-04-13T23:59:35.408531094Z" diff --git a/sha256sum/cloudcasa/cloudcasa.sum b/sha256sum/cloudcasa/cloudcasa.sum index 0c43ce935..c3909bcc2 100644 --- a/sha256sum/cloudcasa/cloudcasa.sum +++ b/sha256sum/cloudcasa/cloudcasa.sum @@ -1,2 +1,2 @@ -36e6731efd505cb139f7e4221e688426cee4e841ddd231c820dd1cde73af7f8d packages/cloudcasa/cloudcasa.patch -5d8867f7b7abfb5bac35f8ea49b93889e23212f66e8385da7a9abbd0dfb3731d packages/cloudcasa/package.yaml +36330ace2f94ebb7069bd02702d517e23b8c9703668df64ed959ef4f28a48c91 packages/cloudcasa/cloudcasa.patch +0d21a6f849e213545560e20436f306d8cfef3244c6703ef0c037fcc08af47899 packages/cloudcasa/package.yaml