diff --git a/installation/resources/installer.yaml b/installation/resources/installer.yaml index f11248bce871..0901e7ce87ae 100644 --- a/installation/resources/installer.yaml +++ b/installation/resources/installer.yaml @@ -178,7 +178,7 @@ spec: done < helm2-releases containers: - name: kyma-installer-container - image: eu.gcr.io/kyma-project/kyma-installer:1.14.0-rc1 + image: eu.gcr.io/kyma-project/kyma-installer:1.14.0-rc2 imagePullPolicy: IfNotPresent args: - -overrideLogFile=/app/overrides.txt diff --git a/resources/cluster-essentials/templates/addons-configuration.crd.yaml b/resources/cluster-essentials/files/addonsconfigurations.addons.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/addons-configuration.crd.yaml rename to resources/cluster-essentials/files/addonsconfigurations.addons.crd.yaml index cc047cd0f4c6..0d43ab721f5e 100644 --- a/resources/cluster-essentials/templates/addons-configuration.crd.yaml +++ b/resources/cluster-essentials/files/addonsconfigurations.addons.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: addonsconfigurations.addons.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/alertmanager.crd.yaml b/resources/cluster-essentials/files/alertmanagers.monitoring.coreos.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/alertmanager.crd.yaml rename to resources/cluster-essentials/files/alertmanagers.monitoring.coreos.crd.yaml index b7132bd613d4..f4075b2c81f6 100644 --- a/resources/cluster-essentials/templates/alertmanager.crd.yaml +++ b/resources/cluster-essentials/files/alertmanagers.monitoring.coreos.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: alertmanagers.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/files/crd-apirules.yaml b/resources/cluster-essentials/files/apirules.gateway.crd.yaml similarity index 99% rename from resources/cluster-essentials/files/crd-apirules.yaml rename to resources/cluster-essentials/files/apirules.gateway.crd.yaml index 506b83a322f8..31aae8e23c7b 100644 --- a/resources/cluster-essentials/files/crd-apirules.yaml +++ b/resources/cluster-essentials/files/apirules.gateway.crd.yaml @@ -1,8 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep creationTimestamp: null name: apirules.gateway.kyma-project.io spec: diff --git a/resources/cluster-essentials/files/crd-apiserversources.sources.eventing.knative.dev.yaml b/resources/cluster-essentials/files/apiserversources.sources.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-apiserversources.sources.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/apiserversources.sources.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-apiserversources.sources.knative.dev.yaml b/resources/cluster-essentials/files/apiserversources.sources.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-apiserversources.sources.knative.dev.yaml rename to resources/cluster-essentials/files/apiserversources.sources.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/environment-mapping.crd.yaml b/resources/cluster-essentials/files/applicationmappings.applicationconnector.crd.yaml similarity index 87% rename from resources/cluster-essentials/templates/environment-mapping.crd.yaml rename to resources/cluster-essentials/files/applicationmappings.applicationconnector.crd.yaml index 075771e05888..ccecb26d7657 100644 --- a/resources/cluster-essentials/templates/environment-mapping.crd.yaml +++ b/resources/cluster-essentials/files/applicationmappings.applicationconnector.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: applicationmappings.applicationconnector.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: applicationconnector.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-applications.applicationconnector.yaml b/resources/cluster-essentials/files/applications.applicationconnector.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-applications.applicationconnector.yaml rename to resources/cluster-essentials/files/applications.applicationconnector.crd.yaml diff --git a/resources/cluster-essentials/templates/rafter.assetgroups.crd.yaml b/resources/cluster-essentials/files/assetgroups.rafter.crd.yaml similarity index 98% rename from resources/cluster-essentials/templates/rafter.assetgroups.crd.yaml rename to resources/cluster-essentials/files/assetgroups.rafter.crd.yaml index 866889379193..06b39c75e8b6 100644 --- a/resources/cluster-essentials/templates/rafter.assetgroups.crd.yaml +++ b/resources/cluster-essentials/files/assetgroups.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: assetgroups.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/rafter.assets.crd.yaml b/resources/cluster-essentials/files/assets.rafter.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/rafter.assets.crd.yaml rename to resources/cluster-essentials/files/assets.rafter.crd.yaml index a2a29544e9d9..83d3661277d1 100644 --- a/resources/cluster-essentials/templates/rafter.assets.crd.yaml +++ b/resources/cluster-essentials/files/assets.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: assets.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/backend-module.crd.yaml b/resources/cluster-essentials/files/backendmodules.ui.crd.yaml similarity index 85% rename from resources/cluster-essentials/templates/backend-module.crd.yaml rename to resources/cluster-essentials/files/backendmodules.ui.crd.yaml index 3862ebeeb039..86f563e41a17 100644 --- a/resources/cluster-essentials/templates/backend-module.crd.yaml +++ b/resources/cluster-essentials/files/backendmodules.ui.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: backendmodules.ui.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: ui.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-brokers.eventing.knative.dev.yaml b/resources/cluster-essentials/files/brokers.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-brokers.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/brokers.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/rafter.buckets.crd.yaml b/resources/cluster-essentials/files/buckets.rafter.crd.yaml similarity index 98% rename from resources/cluster-essentials/templates/rafter.buckets.crd.yaml rename to resources/cluster-essentials/files/buckets.rafter.crd.yaml index ce80230b24bc..721d7c36a18f 100644 --- a/resources/cluster-essentials/templates/rafter.buckets.crd.yaml +++ b/resources/cluster-essentials/files/buckets.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: buckets.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/files/crd-centralconnections.applicationconnector.yaml b/resources/cluster-essentials/files/centralconnections.applicationconnector.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-centralconnections.applicationconnector.yaml rename to resources/cluster-essentials/files/centralconnections.applicationconnector.crd.yaml diff --git a/resources/cluster-essentials/files/crd-certificaterequests.applicationconnector.yaml b/resources/cluster-essentials/files/certificaterequests.applicationconnector.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-certificaterequests.applicationconnector.yaml rename to resources/cluster-essentials/files/certificaterequests.applicationconnector.crd.yaml diff --git a/resources/cluster-essentials/files/crd-certificates.networking.internal.knative.dev.yaml b/resources/cluster-essentials/files/certificates.networking.internal.knative.dev.crd.yaml similarity index 93% rename from resources/cluster-essentials/files/crd-certificates.networking.internal.knative.dev.yaml rename to resources/cluster-essentials/files/certificates.networking.internal.knative.dev.crd.yaml index 94bac2eacb63..59c302763b96 100644 --- a/resources/cluster-essentials/files/crd-certificates.networking.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/certificates.networking.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/files/crd-channels.messaging.knative.dev.yaml b/resources/cluster-essentials/files/channels.messaging.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-channels.messaging.knative.dev.yaml rename to resources/cluster-essentials/files/channels.messaging.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/cluster-addons-configuration.crd.yaml b/resources/cluster-essentials/files/clusteraddonsconfigurations.addons.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/cluster-addons-configuration.crd.yaml rename to resources/cluster-essentials/files/clusteraddonsconfigurations.addons.crd.yaml index a0d7db882228..be8f55bd5d7f 100644 --- a/resources/cluster-essentials/templates/cluster-addons-configuration.crd.yaml +++ b/resources/cluster-essentials/files/clusteraddonsconfigurations.addons.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: clusteraddonsconfigurations.addons.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/rafter.clusterassetgroups.crd.yaml b/resources/cluster-essentials/files/clusterassetgroups.rafter.crd.yaml similarity index 98% rename from resources/cluster-essentials/templates/rafter.clusterassetgroups.crd.yaml rename to resources/cluster-essentials/files/clusterassetgroups.rafter.crd.yaml index 6a652c9b0f5f..17e45303cf76 100644 --- a/resources/cluster-essentials/templates/rafter.clusterassetgroups.crd.yaml +++ b/resources/cluster-essentials/files/clusterassetgroups.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: clusterassetgroups.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/rafter.clusterassets.crd.yaml b/resources/cluster-essentials/files/clusterassets.rafter.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/rafter.clusterassets.crd.yaml rename to resources/cluster-essentials/files/clusterassets.rafter.crd.yaml index 9b5dac9584a7..d8544df97c5d 100644 --- a/resources/cluster-essentials/templates/rafter.clusterassets.crd.yaml +++ b/resources/cluster-essentials/files/clusterassets.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: clusterassets.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/rafter.clusterbuckets.crd.yaml b/resources/cluster-essentials/files/clusterbuckets.rafter.crd.yaml similarity index 98% rename from resources/cluster-essentials/templates/rafter.clusterbuckets.crd.yaml rename to resources/cluster-essentials/files/clusterbuckets.rafter.crd.yaml index 68d4e1249755..ee1bf067dc61 100644 --- a/resources/cluster-essentials/templates/rafter.clusterbuckets.crd.yaml +++ b/resources/cluster-essentials/files/clusterbuckets.rafter.crd.yaml @@ -3,6 +3,8 @@ kind: CustomResourceDefinition metadata: creationTimestamp: null name: clusterbuckets.rafter.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/clustermicrofrontend.crd.yaml b/resources/cluster-essentials/files/clustermicrofrontends.ui.crd.yaml similarity index 97% rename from resources/cluster-essentials/templates/clustermicrofrontend.crd.yaml rename to resources/cluster-essentials/files/clustermicrofrontends.ui.crd.yaml index 3894a6ce8778..52aabd7498ea 100644 --- a/resources/cluster-essentials/templates/clustermicrofrontend.crd.yaml +++ b/resources/cluster-essentials/files/clustermicrofrontends.ui.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: "clustermicrofrontends.ui.kyma-project.io" + annotations: + "helm.sh/resource-policy": keep spec: group: ui.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-clusterservicebroker.servicecatalog.yaml b/resources/cluster-essentials/files/clusterservicebroker.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-clusterservicebroker.servicecatalog.yaml rename to resources/cluster-essentials/files/clusterservicebroker.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/files/crd-clusterserviceclass.servicecatalog.yaml b/resources/cluster-essentials/files/clusterserviceclass.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-clusterserviceclass.servicecatalog.yaml rename to resources/cluster-essentials/files/clusterserviceclass.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/files/crd-clusterserviceplan.servicecatalog.yaml b/resources/cluster-essentials/files/clusterserviceplan.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-clusterserviceplan.servicecatalog.yaml rename to resources/cluster-essentials/files/clusterserviceplan.servicecatalog.crd.yaml diff --git a/resources/testing/charts/octopus/files/crd-clustertestsuite.yaml b/resources/cluster-essentials/files/clustertestsuite.crd.yaml similarity index 98% rename from resources/testing/charts/octopus/files/crd-clustertestsuite.yaml rename to resources/cluster-essentials/files/clustertestsuite.crd.yaml index 8ae8d9f62c75..d59fb1d2873a 100644 --- a/resources/testing/charts/octopus/files/crd-clustertestsuite.yaml +++ b/resources/cluster-essentials/files/clustertestsuite.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: creationTimestamp: null + annotations: + "helm.sh/resource-policy": keep labels: controller-tools.k8s.io: "1.0" name: clustertestsuites.testing.kyma-project.io diff --git a/resources/cluster-essentials/files/crd-configurations.serving.knative.dev.yaml b/resources/cluster-essentials/files/configurations.serving.knative.dev.crd.yaml similarity index 95% rename from resources/cluster-essentials/files/crd-configurations.serving.knative.dev.yaml rename to resources/cluster-essentials/files/configurations.serving.knative.dev.crd.yaml index c29634f7a4e8..4b4a65380517 100644 --- a/resources/cluster-essentials/files/crd-configurations.serving.knative.dev.yaml +++ b/resources/cluster-essentials/files/configurations.serving.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: duck.knative.dev/podspecable: "true" knative.dev/crd-install: "true" diff --git a/resources/cluster-essentials/files/crd-containersources.sources.eventing.knative.dev.yaml b/resources/cluster-essentials/files/containersources.sources.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-containersources.sources.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/containersources.sources.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-clustertestsuite.yaml b/resources/cluster-essentials/files/crd-clustertestsuite.yaml deleted file mode 100644 index 8ae8d9f62c75..000000000000 --- a/resources/cluster-essentials/files/crd-clustertestsuite.yaml +++ /dev/null @@ -1,139 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: clustertestsuites.testing.kyma-project.io -spec: - group: testing.kyma-project.io - names: - kind: ClusterTestSuite - plural: clustertestsuites - shortNames: - - cts - scope: Cluster - subresources: - status: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - concurrency: - description: How many tests we want to execute at the same time. Depends - on cluster size and it's load. Default value is 1 - format: int64 - type: integer - count: - description: How many times should I run every test? Default value is - 1. - format: int64 - type: integer - maxRetries: - description: In case of a failed test, how many times it will be retried. - If test failed and on retry it succeeded, Test Suite should be marked - as a succeeded. Default value is 0 - no retries. MaxRetries and Count - cannot be used mutually. - format: int64 - type: integer - selectors: - description: Decide which tests to execute. If not provided execute - all tests - properties: - matchLabelExpressions: - description: 'Find test definitions by their labels. TestDefinition - must match AT LEAST one expression listed here to be executed. - For the complete grammar see: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels' - items: - type: string - type: array - matchNames: - description: Find test definitions by it's name - items: - properties: - name: - type: string - namespace: - type: string - required: - - name - - namespace - type: object - type: array - type: object - type: object - status: - properties: - conditions: - items: - properties: - message: - type: string - reason: - type: string - status: - type: string - type: - type: string - required: - - type - - status - type: object - type: array - results: - items: - properties: - disabledConcurrency: - type: boolean - executions: - items: - properties: - id: - description: ID is equivalent to a testing Pod name - type: string - message: - type: string - podPhase: - type: string - reason: - type: string - required: - - id - - podPhase - type: object - type: array - name: - description: Test name - type: string - namespace: - type: string - status: - type: string - required: - - name - - namespace - - status - - executions - type: object - type: array - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/resources/cluster-essentials/files/crd-cronjobsources.sources.eventing.knative.dev.yaml b/resources/cluster-essentials/files/cronjobsources.sources.eventing.knative.dev.crd.yaml similarity index 99% rename from resources/cluster-essentials/files/crd-cronjobsources.sources.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/cronjobsources.sources.eventing.knative.dev.crd.yaml index 4eab4d1d11a2..f30a897eb112 100644 --- a/resources/cluster-essentials/files/crd-cronjobsources.sources.eventing.knative.dev.yaml +++ b/resources/cluster-essentials/files/cronjobsources.sources.eventing.knative.dev.crd.yaml @@ -6,6 +6,7 @@ metadata: [ { "type": "dev.knative.cronjob.event" } ] + "helm.sh/resource-policy": keep labels: duck.knative.dev/source: "true" eventing.knative.dev/release: "v0.12.0" diff --git a/resources/cluster-essentials/templates/event-activation.crd.yaml b/resources/cluster-essentials/files/eventactivations.applicationconnector.crd.yaml similarity index 93% rename from resources/cluster-essentials/templates/event-activation.crd.yaml rename to resources/cluster-essentials/files/eventactivations.applicationconnector.crd.yaml index 83e67534ba8f..8a72406cce56 100644 --- a/resources/cluster-essentials/templates/event-activation.crd.yaml +++ b/resources/cluster-essentials/files/eventactivations.applicationconnector.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: eventactivations.applicationconnector.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: applicationconnector.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-eventtypes.eventing.knative.dev.yaml b/resources/cluster-essentials/files/eventtypes.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-eventtypes.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/eventtypes.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/functions.crd.yaml b/resources/cluster-essentials/files/functions.serverless.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/functions.crd.yaml rename to resources/cluster-essentials/files/functions.serverless.crd.yaml index 43b0d3fd8a32..dd34f0a372a3 100644 --- a/resources/cluster-essentials/templates/functions.crd.yaml +++ b/resources/cluster-essentials/files/functions.serverless.crd.yaml @@ -1,10 +1,9 @@ - ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: functions.serverless.kyma-project.io spec: diff --git a/resources/cluster-essentials/templates/identity-provider-groups.crd.yaml b/resources/cluster-essentials/files/groups.authentication.crd.yaml similarity index 93% rename from resources/cluster-essentials/templates/identity-provider-groups.crd.yaml rename to resources/cluster-essentials/files/groups.authentication.crd.yaml index 29efcb8f5ef4..1519f53f4a09 100644 --- a/resources/cluster-essentials/templates/identity-provider-groups.crd.yaml +++ b/resources/cluster-essentials/files/groups.authentication.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: groups.authentication.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: authentication.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-images.caching.internal.knative.dev.yaml b/resources/cluster-essentials/files/images.caching.internal.knative.dev.crd.yaml similarity index 89% rename from resources/cluster-essentials/files/crd-images.caching.internal.knative.dev.yaml rename to resources/cluster-essentials/files/images.caching.internal.knative.dev.crd.yaml index 8d7d71361d76..5a5f321a05f6 100644 --- a/resources/cluster-essentials/files/crd-images.caching.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/images.caching.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" name: images.caching.internal.knative.dev diff --git a/resources/cluster-essentials/files/crd-ingresses.networking.internal.knative.dev.yaml b/resources/cluster-essentials/files/ingresses.networking.internal.knative.dev.crd.yaml similarity index 93% rename from resources/cluster-essentials/files/crd-ingresses.networking.internal.knative.dev.yaml rename to resources/cluster-essentials/files/ingresses.networking.internal.knative.dev.crd.yaml index 63af9bc788b5..9118ae8fa9ee 100644 --- a/resources/cluster-essentials/files/crd-ingresses.networking.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/ingresses.networking.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/files/crd-init-300-httpsource.yaml b/resources/cluster-essentials/files/init-300-httpsource.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-init-300-httpsource.yaml rename to resources/cluster-essentials/files/init-300-httpsource.crd.yaml diff --git a/resources/cluster-essentials/files/crd-init-kafkachannel.yaml b/resources/cluster-essentials/files/init-kafkachannel.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-init-kafkachannel.yaml rename to resources/cluster-essentials/files/init-kafkachannel.crd.yaml diff --git a/resources/cluster-essentials/templates/jaeger.yaml b/resources/cluster-essentials/files/jaegers.jaegertracing.crd.yaml similarity index 92% rename from resources/cluster-essentials/templates/jaeger.yaml rename to resources/cluster-essentials/files/jaegers.jaegertracing.crd.yaml index dc53db6ca858..845e51de7e90 100644 --- a/resources/cluster-essentials/templates/jaeger.yaml +++ b/resources/cluster-essentials/files/jaegers.jaegertracing.crd.yaml @@ -4,6 +4,8 @@ metadata: name: jaegers.jaegertracing.io labels: app: jaeger-operator + annotations: + "helm.sh/resource-policy": keep spec: additionalPrinterColumns: - JSONPath: .status.phase diff --git a/resources/cluster-essentials/templates/kiali.yaml b/resources/cluster-essentials/files/kialis.kiali.crd.yaml similarity index 69% rename from resources/cluster-essentials/templates/kiali.yaml rename to resources/cluster-essentials/files/kialis.kiali.crd.yaml index a7ab0285f3d3..3ad0afbeeca8 100644 --- a/resources/cluster-essentials/templates/kiali.yaml +++ b/resources/cluster-essentials/files/kialis.kiali.crd.yaml @@ -1,15 +1,13 @@ -{{- /* - Taken from https://github.com/kiali/kiali-operator/tree/master/deploy - Customisation: removed monitoringdashboards CRD as it was not used by kyma - */ -}} - ---- +# Taken from https://github.com/kiali/kiali-operator/tree/master/deploy +# Customisation: removed monitoringdashboards CRD as it was not used by kyma apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: kialis.kiali.io labels: app: kiali-operator + annotations: + "helm.sh/resource-policy": keep spec: group: kiali.io names: diff --git a/resources/cluster-essentials/files/crd-metrics.autoscaling.internal.knative.dev.yaml b/resources/cluster-essentials/files/metrics.autoscaling.internal.knative.dev.crd.yaml similarity index 92% rename from resources/cluster-essentials/files/crd-metrics.autoscaling.internal.knative.dev.yaml rename to resources/cluster-essentials/files/metrics.autoscaling.internal.knative.dev.crd.yaml index 8f563609a808..cc59ef7e5a84 100644 --- a/resources/cluster-essentials/files/crd-metrics.autoscaling.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/metrics.autoscaling.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/templates/microfrontend.crd.yaml b/resources/cluster-essentials/files/microfrontends.ui.crd.yaml similarity index 97% rename from resources/cluster-essentials/templates/microfrontend.crd.yaml rename to resources/cluster-essentials/files/microfrontends.ui.crd.yaml index e1b5292f887f..3e58646a3e21 100644 --- a/resources/cluster-essentials/templates/microfrontend.crd.yaml +++ b/resources/cluster-essentials/files/microfrontends.ui.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: "microfrontends.ui.kyma-project.io" + annotations: + "helm.sh/resource-policy": keep spec: group: ui.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-natschannel.yaml b/resources/cluster-essentials/files/natschannel.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-natschannel.yaml rename to resources/cluster-essentials/files/natschannel.crd.yaml diff --git a/resources/cluster-essentials/files/crd-oauth2clients.yaml b/resources/cluster-essentials/files/oauth2clients.crd.yaml similarity index 99% rename from resources/cluster-essentials/files/crd-oauth2clients.yaml rename to resources/cluster-essentials/files/oauth2clients.crd.yaml index 6a1b0730d66e..b6ded30f89c4 100644 --- a/resources/cluster-essentials/files/crd-oauth2clients.yaml +++ b/resources/cluster-essentials/files/oauth2clients.crd.yaml @@ -1,8 +1,8 @@ - ---- apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep creationTimestamp: null name: oauth2clients.hydra.ory.sh spec: diff --git a/resources/cluster-essentials/files/crd-parallels.flows.knative.dev.yaml b/resources/cluster-essentials/files/parallels.flows.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-parallels.flows.knative.dev.yaml rename to resources/cluster-essentials/files/parallels.flows.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-parallels.messaging.knative.dev.yaml b/resources/cluster-essentials/files/parallels.messaging.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-parallels.messaging.knative.dev.yaml rename to resources/cluster-essentials/files/parallels.messaging.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-podautoscalers.autoscaling.internal.knative.dev.yaml b/resources/cluster-essentials/files/podautoscalers.autoscaling.internal.knative.dev.crd.yaml similarity index 94% rename from resources/cluster-essentials/files/crd-podautoscalers.autoscaling.internal.knative.dev.yaml rename to resources/cluster-essentials/files/podautoscalers.autoscaling.internal.knative.dev.crd.yaml index 9da532991226..719974bd81ce 100644 --- a/resources/cluster-essentials/files/crd-podautoscalers.autoscaling.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/podautoscalers.autoscaling.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/templates/podmonitor.crd.yaml b/resources/cluster-essentials/files/podmonitors.monitoring.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/podmonitor.crd.yaml rename to resources/cluster-essentials/files/podmonitors.monitoring.crd.yaml index 90a2194e0c67..1ea5b36ddc48 100644 --- a/resources/cluster-essentials/templates/podmonitor.crd.yaml +++ b/resources/cluster-essentials/files/podmonitors.monitoring.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: podmonitors.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/charts/pod-preset/templates/podpreset-crd.yaml b/resources/cluster-essentials/files/podpresets.settings.svcat.crd.yaml similarity index 95% rename from resources/cluster-essentials/charts/pod-preset/templates/podpreset-crd.yaml rename to resources/cluster-essentials/files/podpresets.settings.svcat.crd.yaml index 7f2dbf5738cf..cdeee4824b83 100644 --- a/resources/cluster-essentials/charts/pod-preset/templates/podpreset-crd.yaml +++ b/resources/cluster-essentials/files/podpresets.settings.svcat.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: podpresets.settings.svcat.k8s.io + annotations: + "helm.sh/resource-policy": keep spec: version: v1alpha1 group: settings.svcat.k8s.io diff --git a/resources/cluster-essentials/templates/prometheus.crd.yaml b/resources/cluster-essentials/files/prometheuses.monitoring.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/prometheus.crd.yaml rename to resources/cluster-essentials/files/prometheuses.monitoring.crd.yaml index edea7dd0fd29..f8b31097d420 100644 --- a/resources/cluster-essentials/templates/prometheus.crd.yaml +++ b/resources/cluster-essentials/files/prometheuses.monitoring.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: prometheuses.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/templates/prometheusrules.crd.yaml b/resources/cluster-essentials/files/prometheusrules.monitoring.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/prometheusrules.crd.yaml rename to resources/cluster-essentials/files/prometheusrules.monitoring.crd.yaml index 107c7f3ed440..589289d8d424 100644 --- a/resources/cluster-essentials/templates/prometheusrules.crd.yaml +++ b/resources/cluster-essentials/files/prometheusrules.monitoring.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: prometheusrules.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/files/crd-revisions.serving.knative.dev.yaml b/resources/cluster-essentials/files/revisions.serving.knative.dev.crd.yaml similarity index 95% rename from resources/cluster-essentials/files/crd-revisions.serving.knative.dev.yaml rename to resources/cluster-essentials/files/revisions.serving.knative.dev.crd.yaml index cde93e4527e2..8b13b11a528b 100644 --- a/resources/cluster-essentials/files/crd-revisions.serving.knative.dev.yaml +++ b/resources/cluster-essentials/files/revisions.serving.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/files/crd-routes.serving.knative.dev.yaml b/resources/cluster-essentials/files/routes.serving.knative.dev.crd.yaml similarity index 94% rename from resources/cluster-essentials/files/crd-routes.serving.knative.dev.yaml rename to resources/cluster-essentials/files/routes.serving.knative.dev.crd.yaml index 8b283d8e0b89..f1123125a68d 100644 --- a/resources/cluster-essentials/files/crd-routes.serving.knative.dev.yaml +++ b/resources/cluster-essentials/files/routes.serving.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: duck.knative.dev/addressable: "true" knative.dev/crd-install: "true" diff --git a/resources/cluster-essentials/files/crd-rules.yaml b/resources/cluster-essentials/files/rules.crd.yaml similarity index 99% rename from resources/cluster-essentials/files/crd-rules.yaml rename to resources/cluster-essentials/files/rules.crd.yaml index e05224a5b370..2b1ca8286246 100644 --- a/resources/cluster-essentials/files/crd-rules.yaml +++ b/resources/cluster-essentials/files/rules.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep name: rules.oathkeeper.ory.sh spec: group: oathkeeper.ory.sh diff --git a/resources/cluster-essentials/files/crd-sequences.flows.knative.dev.yaml b/resources/cluster-essentials/files/sequences.flows.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-sequences.flows.knative.dev.yaml rename to resources/cluster-essentials/files/sequences.flows.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-sequences.messaging.knative.dev.yaml b/resources/cluster-essentials/files/sequences.messaging.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-sequences.messaging.knative.dev.yaml rename to resources/cluster-essentials/files/sequences.messaging.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-serverlessservices.networking.internal.knative.dev.yaml b/resources/cluster-essentials/files/serverlessservices.networking.internal.knative.dev.crd.yaml similarity index 95% rename from resources/cluster-essentials/files/crd-serverlessservices.networking.internal.knative.dev.yaml rename to resources/cluster-essentials/files/serverlessservices.networking.internal.knative.dev.crd.yaml index dd42ed150d33..53c78b422690 100644 --- a/resources/cluster-essentials/files/crd-serverlessservices.networking.internal.knative.dev.yaml +++ b/resources/cluster-essentials/files/serverlessservices.networking.internal.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: knative.dev/crd-install: "true" serving.knative.dev/release: "v0.14.0" diff --git a/resources/cluster-essentials/files/crd-servicebinding.servicecatalog.yaml b/resources/cluster-essentials/files/servicebinding.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-servicebinding.servicecatalog.yaml rename to resources/cluster-essentials/files/servicebinding.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/templates/service-binding-usage.crd.yaml b/resources/cluster-essentials/files/servicebindingusages.servicecatalog.crd.yaml similarity index 96% rename from resources/cluster-essentials/templates/service-binding-usage.crd.yaml rename to resources/cluster-essentials/files/servicebindingusages.servicecatalog.crd.yaml index 99ec7d8d88bc..c2da3188de31 100644 --- a/resources/cluster-essentials/templates/service-binding-usage.crd.yaml +++ b/resources/cluster-essentials/files/servicebindingusages.servicecatalog.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: servicebindingusages.servicecatalog.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: servicecatalog.kyma-project.io versions: diff --git a/resources/cluster-essentials/files/crd-servicebroker.servicecatalog.yaml b/resources/cluster-essentials/files/servicebroker.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-servicebroker.servicecatalog.yaml rename to resources/cluster-essentials/files/servicebroker.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/files/crd-serviceclass.servicecatalog.yaml b/resources/cluster-essentials/files/serviceclass.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-serviceclass.servicecatalog.yaml rename to resources/cluster-essentials/files/serviceclass.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/files/crd-serviceinstance.servicecatalog.yaml b/resources/cluster-essentials/files/serviceinstance.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-serviceinstance.servicecatalog.yaml rename to resources/cluster-essentials/files/serviceinstance.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/templates/servicemonitor.crd.yaml b/resources/cluster-essentials/files/servicemonitors.monitoring.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/servicemonitor.crd.yaml rename to resources/cluster-essentials/files/servicemonitors.monitoring.crd.yaml index 63d1c5106db4..a6ca302ba47c 100644 --- a/resources/cluster-essentials/templates/servicemonitor.crd.yaml +++ b/resources/cluster-essentials/files/servicemonitors.monitoring.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: servicemonitors.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/files/crd-serviceplan.servicecatalog.yaml b/resources/cluster-essentials/files/serviceplan.servicecatalog.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-serviceplan.servicecatalog.yaml rename to resources/cluster-essentials/files/serviceplan.servicecatalog.crd.yaml diff --git a/resources/cluster-essentials/files/crd-services.serving.knative.dev.yaml b/resources/cluster-essentials/files/services.serving.knative.dev.crd.yaml similarity index 95% rename from resources/cluster-essentials/files/crd-services.serving.knative.dev.yaml rename to resources/cluster-essentials/files/services.serving.knative.dev.crd.yaml index de533e2224ac..e8d314f9f7e3 100644 --- a/resources/cluster-essentials/files/crd-services.serving.knative.dev.yaml +++ b/resources/cluster-essentials/files/services.serving.knative.dev.crd.yaml @@ -1,6 +1,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: + annotations: + "helm.sh/resource-policy": keep labels: duck.knative.dev/addressable: "true" duck.knative.dev/podspecable: "true" diff --git a/resources/cluster-essentials/files/crd-sinkbindings.sources.eventing.knative.dev.yaml b/resources/cluster-essentials/files/sinkbindings.sources.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-sinkbindings.sources.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/sinkbindings.sources.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-sinkbindings.sources.knative.dev.yaml b/resources/cluster-essentials/files/sinkbindings.sources.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-sinkbindings.sources.knative.dev.yaml rename to resources/cluster-essentials/files/sinkbindings.sources.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/eventing-subscription.crd.yaml b/resources/cluster-essentials/files/subscriptions.eventing.crd.yaml similarity index 96% rename from resources/cluster-essentials/templates/eventing-subscription.crd.yaml rename to resources/cluster-essentials/files/subscriptions.eventing.crd.yaml index f3b20085e53e..aa78be5d6960 100644 --- a/resources/cluster-essentials/templates/eventing-subscription.crd.yaml +++ b/resources/cluster-essentials/files/subscriptions.eventing.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: subscriptions.eventing.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: eventing.kyma-project.io version: v1alpha1 diff --git a/resources/cluster-essentials/files/crd-subscriptions.messaging.knative.dev.yaml b/resources/cluster-essentials/files/subscriptions.messaging.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-subscriptions.messaging.knative.dev.yaml rename to resources/cluster-essentials/files/subscriptions.messaging.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/files/crd-testdefinition.yaml b/resources/cluster-essentials/files/testdefinition.crd.yaml similarity index 97% rename from resources/cluster-essentials/files/crd-testdefinition.yaml rename to resources/cluster-essentials/files/testdefinition.crd.yaml index 451b321a3929..d4041f008adb 100644 --- a/resources/cluster-essentials/files/crd-testdefinition.yaml +++ b/resources/cluster-essentials/files/testdefinition.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: creationTimestamp: null + annotations: + "helm.sh/resource-policy": keep labels: controller-tools.k8s.io: "1.0" name: testdefinitions.testing.kyma-project.io diff --git a/resources/cluster-essentials/templates/thanosrulers.crd.yaml b/resources/cluster-essentials/files/thanosrulers.monitoring.crd.yaml similarity index 99% rename from resources/cluster-essentials/templates/thanosrulers.crd.yaml rename to resources/cluster-essentials/files/thanosrulers.monitoring.crd.yaml index f4cf00f99ea3..6e46745ca795 100644 --- a/resources/cluster-essentials/templates/thanosrulers.crd.yaml +++ b/resources/cluster-essentials/files/thanosrulers.monitoring.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.2.4 + "helm.sh/resource-policy": keep creationTimestamp: null name: thanosrulers.monitoring.coreos.com spec: diff --git a/resources/cluster-essentials/files/crd-tokenrequests.applicationconnector.yaml b/resources/cluster-essentials/files/tokenrequests.applicationconnector.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-tokenrequests.applicationconnector.yaml rename to resources/cluster-essentials/files/tokenrequests.applicationconnector.crd.yaml diff --git a/resources/cluster-essentials/files/crd-triggers.eventing.knative.dev.yaml b/resources/cluster-essentials/files/triggers.eventing.knative.dev.crd.yaml similarity index 100% rename from resources/cluster-essentials/files/crd-triggers.eventing.knative.dev.yaml rename to resources/cluster-essentials/files/triggers.eventing.knative.dev.crd.yaml diff --git a/resources/cluster-essentials/templates/usage-kind.crd.yaml b/resources/cluster-essentials/files/usagekinds.servicecatalog.crd.yaml similarity index 95% rename from resources/cluster-essentials/templates/usage-kind.crd.yaml rename to resources/cluster-essentials/files/usagekinds.servicecatalog.crd.yaml index d7653bef44d8..eedd35f61472 100644 --- a/resources/cluster-essentials/templates/usage-kind.crd.yaml +++ b/resources/cluster-essentials/files/usagekinds.servicecatalog.crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: usagekinds.servicecatalog.kyma-project.io + annotations: + "helm.sh/resource-policy": keep spec: group: servicecatalog.kyma-project.io versions: diff --git a/resources/cluster-essentials/templates/crd-install-config-map.yaml b/resources/cluster-essentials/templates/crd-install-config-map.yaml index 8e50fe144f59..573db82b4228 100644 --- a/resources/cluster-essentials/templates/crd-install-config-map.yaml +++ b/resources/cluster-essentials/templates/crd-install-config-map.yaml @@ -1,17 +1,34 @@ +{{ $files := .Files.Glob "files/**.yaml" }} +{{ $fileLen := len $files }} +{{ $configMapLen := int (add1 (div $fileLen .Values.jobs.crdsInConfigMap)) }} + +{{ $currentScope := . }} + +{{ $filePaths := list }} +{{ range $path, $_ := $files }} +{{ $filePaths = append $filePaths (base $path) }} +{{ end }} + +{{ range $idx, $_ := until $configMapLen }} apiVersion: v1 kind: ConfigMap metadata: + {{- with $currentScope }} namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-crd-all + name: {{ .Release.Name }}-crd-{{ $idx }} + {{- end }} annotations: "helm.sh/hook": "pre-install, pre-upgrade" "helm.sh/hook-weight": "1" "helm.sh/hook-delete-policy": "before-hook-creation" data: -{{ $currentScope := .}} -{{ range $path, $_ := .Files.Glob "files/**.yaml" }} - {{- with $currentScope}} +{{ range $pathIdx, $path := $filePaths }} + {{- with $currentScope }} + {{ if eq $idx (mod $pathIdx $configMapLen) }} {{ base $path }}: |- -{{.Files.Get $path | printf "%s" | indent 4}} +{{ .Files.Get (printf "files/%s" $path) | printf "%s" | indent 4 }} + {{ end }} {{- end }} -{{ end }} \ No newline at end of file +{{ end }} +--- +{{ end }} diff --git a/resources/cluster-essentials/templates/crd-install-job.yaml b/resources/cluster-essentials/templates/crd-install-job.yaml index 7c459568258b..ba5d936fe198 100644 --- a/resources/cluster-essentials/templates/crd-install-job.yaml +++ b/resources/cluster-essentials/templates/crd-install-job.yaml @@ -1,3 +1,9 @@ +{{ $files := .Files.Glob "files/**.yaml" }} +{{ $fileLen := len $files }} +{{ $configMapLen := int (add1 (div $fileLen .Values.jobs.crdsInConfigMap)) }} + +{{ $currentScope := . }} + apiVersion: batch/v1 kind: Job metadata: @@ -15,14 +21,18 @@ spec: sidecar.istio.io/inject: "false" spec: serviceAccountName: {{ .Release.Name }}-crd-install + restartPolicy: OnFailure containers: - name: {{ .Release.Name }}-install-crds image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}" - volumeMounts: - - name: crd-all - mountPath: /etc/crd - readOnly: true - command: [ "kubectl", "apply", "-f", "/etc/crd" ] + command: + - /bin/sh + - -c + args: + - | + {{ range $idx, $_ := until $configMapLen }} + kubectl apply -f /etc/crd-{{ $idx }} + {{ end }} resources: requests: memory: 128Mi @@ -30,8 +40,17 @@ spec: limits: memory: 256Mi cpu: 200m + volumeMounts: + {{ range $idx, $_ := until $configMapLen }} + - name: crd-{{ $idx }} + mountPath: /etc/crd-{{ $idx }} + readOnly: true + {{ end }} volumes: - - name: crd-all + {{ range $idx, $_ := until $configMapLen }} + {{- with $currentScope }} + - name: crd-{{ $idx }} configMap: - name: {{ .Release.Name }}-crd-all - restartPolicy: OnFailure \ No newline at end of file + name: {{ .Release.Name }}-crd-{{ $idx }} + {{- end }} + {{ end }} \ No newline at end of file diff --git a/resources/cluster-essentials/templates/migrate-ac-certs-job.yaml b/resources/cluster-essentials/templates/migrate-ac-certs-job.yaml new file mode 100644 index 000000000000..6c88f1986b77 --- /dev/null +++ b/resources/cluster-essentials/templates/migrate-ac-certs-job.yaml @@ -0,0 +1,99 @@ +{{- if not .Values.global.disableLegacyConnectivity }} +{{- if .Release.IsUpgrade }} +{{- if not ( and .Values.global.applicationConnectorCa .Values.global.applicationConnectorCaKey ) }} + +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ .Chart.Name }}-migrate-ac-certs + namespace: kyma-integration + labels: + release: {{ .Release.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + app.kubernetes.io/name: {{ template "name" . }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} + +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: {{ .Chart.Name }}-migrate-ac-certs + namespace: {{ .Values.jobs.installer.namespace }} + labels: + app: {{ .Chart.Name }}-migrate-ac-certs + release: {{ .Release.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + app.kubernetes.io/name: {{ template "name" . }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} +rules: + - apiGroups: ["*"] + resources: ["secrets"] + verbs: ["create", "get", "update", "patch"] + +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ .Chart.Name }}-migrate-ac-certs + namespace: {{ .Values.jobs.installer.namespace }} + labels: + app: {{ .Chart.Name }}-migrate-ac-certs + release: {{ .Release.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + app.kubernetes.io/name: {{ template "name" . }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/instance: {{ .Release.Name }} +subjects: + - kind: ServiceAccount + name: {{ .Chart.Name }}-migrate-ac-certs + namespace: kyma-integration +roleRef: + kind: Role + name: {{ .Chart.Name }}-migrate-ac-certs + apiGroup: rbac.authorization.k8s.io +--- + +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ .Chart.Name }}-migrate-ac-certs + namespace: kyma-integration + annotations: + helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded +spec: + backoffLimit: 5 + template: + metadata: + name: {{ .Chart.Name }}-migrate-ac-certs + annotations: + sidecar.istio.io/inject: “false” + spec: + serviceAccountName: {{ .Chart.Name }}-migrate-ac-certs + restartPolicy: Never + containers: + - name: {{ .Chart.Name }}-migrate-ac-certs + image: eu.gcr.io/kyma-project/test-infra/alpine-kubectl:v20200309-9a88ce97 + command: + - /bin/sh + - -c + args: + - | + kubectl create secret generic -n {{ .Values.jobs.installer.namespace }} application-connector-overrides \ + --from-literal global.applicationConnectorCa="$(cat /etc/application-connector-certs/ca.crt | base64 -w 0)" \ + --from-literal global.applicationConnectorCaKey="$(cat /etc/application-connector-certs/ca.key | base64 -w 0)" --dry-run -oyaml | kubectl apply -f - + + kubectl label --overwrite secret -n {{ .Values.jobs.installer.namespace }} application-connector-overrides "kyma-project.io/installation=" "installer=overrides" + + volumeMounts: + - name: cert + readOnly: true + mountPath: /etc/application-connector-certs/ + volumes: + - name: cert + secret: + secretName: connector-service-app-ca +{{- end }} +{{- end }} +{{- end }} \ No newline at end of file diff --git a/resources/cluster-essentials/values.yaml b/resources/cluster-essentials/values.yaml index b68cb3f4784a..5b6eebb685cf 100644 --- a/resources/cluster-essentials/values.yaml +++ b/resources/cluster-essentials/values.yaml @@ -1,7 +1,10 @@ jobs: + crdsInConfigMap: 20 image: repository: eu.gcr.io/kyma-project/test-infra/alpine-kubectl tag: "v20200617-32c1f3ff" + installer: + namespace: kyma-installer global: isLocalEnv: false diff --git a/resources/console/values.yaml b/resources/console/values.yaml index ec0eb622c2c2..b496d7854679 100644 --- a/resources/console/values.yaml +++ b/resources/console/values.yaml @@ -25,4 +25,4 @@ global: console_backend_service: version: e77f8c23 console_backend_service_test: - version: e77f8c23 + version: fd289ef1 diff --git a/resources/helm-broker/values.yaml b/resources/helm-broker/values.yaml index 547c4e69d10d..025592b49d0a 100644 --- a/resources/helm-broker/values.yaml +++ b/resources/helm-broker/values.yaml @@ -25,10 +25,10 @@ ctrl: broker: resources: limits: - memory: 120Mi + memory: 256Mi cpu: 60m requests: - memory: 64Mi + memory: 96Mi cpu: 30m tillerTLSInsecure: true tillerTLSEnabled: true diff --git a/resources/istio-kyma-patch/templates/job.yaml b/resources/istio-kyma-patch/templates/job.yaml index 5443b140e7eb..0840e4bfefb0 100644 --- a/resources/istio-kyma-patch/templates/job.yaml +++ b/resources/istio-kyma-patch/templates/job.yaml @@ -4,7 +4,7 @@ metadata: name: istio-kyma-patch annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: backoffLimit: 1 template: diff --git a/resources/monitoring/templates/kyma-additions/aks-delete-patch.yaml b/resources/monitoring/templates/kyma-additions/aks-delete-patch.yaml deleted file mode 100644 index 39f77bf4ffcc..000000000000 --- a/resources/monitoring/templates/kyma-additions/aks-delete-patch.yaml +++ /dev/null @@ -1,108 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: aks-delete-kubelet-monitoring-kyma-patch - namespace: kyma-system - annotations: - helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded - helm.sh/hook-weight: "0" -data: - aks-del-patch.sh: | - #!/usr/bin/env sh - kubectl delete --ignore-not-found clusterrolebindings.rbac.authorization.k8s.io -n kyma-system aks-kubelet-monitoring-kyma-patch - kubectl delete --ignore-not-found clusterroles.rbac.authorization.k8s.io -n kyma-system aks-kubelet-monitoring-kyma-patch - kubectl delete --ignore-not-found serviceaccounts -n kyma-system aks-kubelet-monitoring-kyma-patch - kubectl delete --ignore-not-found configmaps -n kyma-system aks-kubelet-monitoring-kyma-patch - kubectl delete --ignore-not-found jobs.batch -n kyma-system aks-kubelet-monitoring-kyma-patch - ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: aks-delete-kubelet-monitoring-kyma-patch - annotations: - helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded - helm.sh/hook-weight: "0" - ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: aks-delete-kubelet-monitoring-kyma-patch - annotations: - helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded - helm.sh/hook-weight: "0" -rules: - - apiGroups: [""] - resources: ["serviceaccounts", "configmaps"] - verbs: ["delete"] - - apiGroups: ["batch"] - resources: ["jobs"] - verbs: ["delete"] - - apiGroups: ["rbac.authorization.k8s.io"] - resources: ["clusterroles", "clusterrolebindings"] - verbs: ["delete"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: aks-delete-kubelet-monitoring-kyma-patch - annotations: - helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded - helm.sh/hook-weight: "0" -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: aks-delete-kubelet-monitoring-kyma-patch -subjects: - - kind: ServiceAccount - name: aks-delete-kubelet-monitoring-kyma-patch - namespace: kyma-system ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: aks-delete-kubelet-monitoring-kyma-patch - namespace: kyma-system - annotations: - helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded - sidecar.istio.io/inject: "false" - helm.sh/hook-weight: "9" -spec: - backoffLimit: 1 - template: - metadata: - annotations: - sidecar.istio.io/inject: "false" - name: aks-delete-kubelet-monitoring-kyma-patch - labels: - app: aks-delete-kubelet-monitoring-kyma-patch - spec: - serviceAccountName: aks-delete-kubelet-monitoring-kyma-patch - restartPolicy: Never - containers: - - name: aks-delete-kubelet-monitoring-kyma-patch - image: eu.gcr.io/kyma-project/test-infra/alpine-kubectl:v20200617-32c1f3ff - command: ["/scripts/aks-del-patch.sh"] - volumeMounts: - - name: aks-delete-kubelet-monitoring-kyma-patch - mountPath: /scripts - terminationMessagePolicy: "FallbackToLogsOnError" - resources: - requests: - cpu: 200m - memory: 128Mi - limits: - cpu: 200m - memory: 128Mi - volumes: - - name: aks-delete-kubelet-monitoring-kyma-patch - configMap: - name: aks-delete-kubelet-monitoring-kyma-patch - defaultMode: 0744 - diff --git a/resources/monitoring/templates/kyma-additions/aks-kubelet-monitoring-patch.yaml b/resources/monitoring/templates/kyma-additions/aks-kubelet-monitoring-patch.yaml index e4d7c7eeca1d..deebb596b318 100644 --- a/resources/monitoring/templates/kyma-additions/aks-kubelet-monitoring-patch.yaml +++ b/resources/monitoring/templates/kyma-additions/aks-kubelet-monitoring-patch.yaml @@ -1,69 +1,40 @@ apiVersion: v1 kind: ConfigMap metadata: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch namespace: kyma-system annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" data: - akspatch.sh: | + akspatchcleanup.sh: | #!/usr/bin/env sh set -e if [[ "$(kubectl get nodes -l kubernetes.azure.com/role=agent)" ]]; then echo "AKS Cluster found, applying patch..." kubectl delete servicemonitors.monitoring.coreos.com monitoring-kubelet -n kyma-system --ignore-not-found - kubectl apply -f /scripts/patch.yaml else echo "No AKS Cluster found, skipping..." fi - patch.yaml: | - apiVersion: monitoring.coreos.com/v1 - kind: ServiceMonitor - metadata: - labels: - app: {{ template "prometheus-operator.name" . }}-kubelet - {{- include "prometheus-operator.labels" . | indent 8 }} - name: {{ template "prometheus-operator.fullname" . }}-kubelet - namespace: {{ $.Release.Namespace }} - spec: - endpoints: - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - honorLabels: true - port: http-metrics - scheme: http - - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - honorLabels: true - path: /metrics/cadvisor - port: http-metrics - scheme: http - jobLabel: k8s-app - namespaceSelector: - matchNames: - - kube-system - selector: - matchLabels: - k8s-app: kubelet - --- apiVersion: v1 kind: ServiceAccount metadata: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" rules: - apiGroups: [""] @@ -85,28 +56,28 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch subjects: - kind: ServiceAccount - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch namespace: kyma-system --- apiVersion: batch/v1 kind: Job metadata: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch namespace: kyma-system annotations: - helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook: pre-install,pre-upgrade + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" sidecar.istio.io/inject: "false" helm.sh/hook-weight: "9" spec: @@ -115,18 +86,18 @@ spec: metadata: annotations: sidecar.istio.io/inject: "false" - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch labels: - app: aks-kubelet-monitoring-kyma-patch + app: aks-kubelet-monitoring-cleanup-patch spec: - serviceAccountName: aks-kubelet-monitoring-kyma-patch + serviceAccountName: aks-kubelet-monitoring-cleanup-patch restartPolicy: Never containers: - - name: aks-kubelet-monitoring-kyma-patch + - name: aks-kubelet-monitoring-cleanup-patch image: eu.gcr.io/kyma-project/test-infra/alpine-kubectl:v20200617-32c1f3ff - command: ["/scripts/akspatch.sh"] + command: ["/scripts/akspatchcleanup.sh"] volumeMounts: - - name: aks-kubelet-monitoring-kyma-patch + - name: aks-kubelet-monitoring-cleanup-patch mountPath: /scripts terminationMessagePolicy: "FallbackToLogsOnError" resources: @@ -137,8 +108,8 @@ spec: cpu: 200m memory: 128Mi volumes: - - name: aks-kubelet-monitoring-kyma-patch + - name: aks-kubelet-monitoring-cleanup-patch configMap: - name: aks-kubelet-monitoring-kyma-patch + name: aks-kubelet-monitoring-cleanup-patch defaultMode: 0744 diff --git a/resources/monitoring/templates/kyma-additions/delete-dns-patch.yaml b/resources/monitoring/templates/kyma-additions/delete-dns-patch.yaml index b3e98cbeedc7..48551d2bcf45 100644 --- a/resources/monitoring/templates/kyma-additions/delete-dns-patch.yaml +++ b/resources/monitoring/templates/kyma-additions/delete-dns-patch.yaml @@ -5,7 +5,7 @@ metadata: namespace: kyma-system annotations: helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" data: dns-del-patch.sh: | @@ -24,7 +24,7 @@ metadata: name: pre-delete-delete-monitoring-dns-patch annotations: helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" --- @@ -34,7 +34,7 @@ metadata: name: pre-delete-delete-monitoring-dns-patch annotations: helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" rules: - apiGroups: [""] @@ -53,7 +53,7 @@ metadata: name: pre-delete-delete-monitoring-dns-patch annotations: helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" roleRef: apiGroup: rbac.authorization.k8s.io @@ -71,7 +71,7 @@ metadata: namespace: kyma-system annotations: helm.sh/hook: pre-delete - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" sidecar.istio.io/inject: "false" helm.sh/hook-weight: "9" spec: diff --git a/resources/monitoring/templates/kyma-additions/monitoring-dns-patch.yaml b/resources/monitoring/templates/kyma-additions/monitoring-dns-patch.yaml index cd48f57abd73..fdab2146544e 100644 --- a/resources/monitoring/templates/kyma-additions/monitoring-dns-patch.yaml +++ b/resources/monitoring/templates/kyma-additions/monitoring-dns-patch.yaml @@ -5,7 +5,7 @@ metadata: namespace: kyma-system annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" data: dnspatch.sh: | @@ -30,7 +30,7 @@ metadata: name: monitoring-dns-patch annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" --- apiVersion: rbac.authorization.k8s.io/v1 @@ -39,7 +39,7 @@ metadata: name: monitoring-dns-patch annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" rules: - apiGroups: [""] @@ -58,7 +58,7 @@ metadata: name: monitoring-dns-patch annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" roleRef: apiGroup: rbac.authorization.k8s.io @@ -76,7 +76,7 @@ metadata: namespace: kyma-system annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" sidecar.istio.io/inject: "false" helm.sh/hook-weight: "9" spec: diff --git a/resources/monitoring/templates/prometheus-operator/cleanup-crds.yaml b/resources/monitoring/templates/prometheus-operator/cleanup-crds.yaml index 6dacccc572d9..26015ec74ed3 100644 --- a/resources/monitoring/templates/prometheus-operator/cleanup-crds.yaml +++ b/resources/monitoring/templates/prometheus-operator/cleanup-crds.yaml @@ -7,7 +7,7 @@ metadata: annotations: "helm.sh/hook": pre-delete "helm.sh/hook-weight": "3" - "helm.sh/hook-delete-policy": hook-succeeded + "helm.sh/hook-delete-policy": "before-hook-creation, hook-succeeded" labels: app: {{ template "prometheus-operator.name" . }}-operator {{ include "prometheus-operator.labels" . | indent 4 }} diff --git a/resources/rafter/charts/controller-manager/charts/minio/templates/post-install-create-bucket-job.yaml b/resources/rafter/charts/controller-manager/charts/minio/templates/post-install-create-bucket-job.yaml index 75a6def5ef8b..00fb6551ca58 100644 --- a/resources/rafter/charts/controller-manager/charts/minio/templates/post-install-create-bucket-job.yaml +++ b/resources/rafter/charts/controller-manager/charts/minio/templates/post-install-create-bucket-job.yaml @@ -10,7 +10,7 @@ metadata: heritage: {{ .Release.Service }} annotations: "helm.sh/hook": post-install,post-upgrade - "helm.sh/hook-delete-policy": hook-succeeded + "helm.sh/hook-delete-policy": "before-hook-creation, hook-succeeded" spec: template: metadata: diff --git a/resources/rafter/charts/upload-service/templates/migrator-job.yaml b/resources/rafter/charts/upload-service/templates/migrator-job.yaml index 4fdccaef55a0..f92df19d591c 100644 --- a/resources/rafter/charts/upload-service/templates/migrator-job.yaml +++ b/resources/rafter/charts/upload-service/templates/migrator-job.yaml @@ -12,7 +12,7 @@ metadata: annotations: helm.sh/hook: pre-upgrade,post-upgrade helm.sh/hook-weight: "-1" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" data: initialize: |- {{ include (print $.Template.BasePath "/_helper_migrate_buckets.txt") . | indent 4 }} @@ -42,7 +42,7 @@ metadata: name: {{ include "rafterUploadService.fullname" . }}-migrator annotations: helm.sh/hook: pre-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" subjects: - kind: ServiceAccount @@ -59,7 +59,7 @@ metadata: name: {{ include "rafterUploadService.fullname" . }}-migrator annotations: helm.sh/hook: pre-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" rules: - apiGroups: ["apps"] @@ -73,7 +73,7 @@ metadata: namespace: {{ .Release.Namespace }} annotations: helm.sh/hook: pre-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" --- apiVersion: batch/v1 @@ -88,7 +88,7 @@ metadata: annotations: helm.sh/hook: pre-upgrade helm.sh/hook-weight: "2" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: @@ -166,7 +166,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: @@ -222,7 +222,7 @@ metadata: name: {{ include "rafterUploadService.fullname" . }}-migrator-delete-pvc annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" subjects: - kind: ServiceAccount @@ -239,7 +239,7 @@ metadata: name: {{ include "rafterUploadService.fullname" . }}-migrator-delete-pvc annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" rules: - apiGroups: [""] @@ -253,7 +253,7 @@ metadata: namespace: {{ .Release.Namespace }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "1" --- apiVersion: batch/v1 @@ -268,7 +268,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "2" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: diff --git a/resources/rafter/templates/pre-upgrade-delete-vs-job.yaml b/resources/rafter/templates/pre-upgrade-delete-vs-job.yaml index dabfef51dc36..39f19ff0f69a 100644 --- a/resources/rafter/templates/pre-upgrade-delete-vs-job.yaml +++ b/resources/rafter/templates/pre-upgrade-delete-vs-job.yaml @@ -5,7 +5,7 @@ metadata: annotations: helm.sh/hook: "pre-upgrade" helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" labels: job: pre-upgrade-delete-vs-rafter-minio --- @@ -19,7 +19,7 @@ metadata: annotations: helm.sh/hook: "pre-upgrade" helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" rules: - apiGroups: - networking.istio.io @@ -37,7 +37,7 @@ metadata: annotations: helm.sh/hook: "pre-upgrade" helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -62,7 +62,7 @@ metadata: annotations: helm.sh/hook: "pre-upgrade" helm.sh/hook-weight: "1" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" labels: job: pre-upgrade-delete-vs-rafter-minio name: pre-upgrade-delete-vs-rafter-minio @@ -73,7 +73,7 @@ metadata: annotations: helm.sh/hook: "pre-upgrade" helm.sh/hook-weight: "2" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" labels: job: pre-upgrade-delete-vs-rafter-minio name: pre-upgrade-delete-vs-rafter-minio diff --git a/resources/serverless/templates/daemonset-delete-job.yaml b/resources/serverless/templates/daemonset-delete-job.yaml index 8c335eb30cb1..63e88763f6e6 100644 --- a/resources/serverless/templates/daemonset-delete-job.yaml +++ b/resources/serverless/templates/daemonset-delete-job.yaml @@ -9,7 +9,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" data: daemonset-delete: |- #!/usr/bin/env bash @@ -35,7 +35,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" --- kind: ClusterRole @@ -46,7 +46,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" rules: - apiGroups: ["apps", "extensions"] @@ -61,7 +61,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" subjects: - kind: ServiceAccount @@ -82,7 +82,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "1" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: diff --git a/resources/serverless/templates/knative-migrator-job-post.yaml b/resources/serverless/templates/knative-migrator-job-post.yaml index b9c53e3e5278..d357cf5d2275 100644 --- a/resources/serverless/templates/knative-migrator-job-post.yaml +++ b/resources/serverless/templates/knative-migrator-job-post.yaml @@ -9,7 +9,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" data: knative-migration: |- {{ include (print $.Template.BasePath "/_helper_knative_migration.txt") . | indent 4 }} @@ -23,7 +23,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" --- kind: ClusterRole @@ -34,7 +34,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" rules: - apiGroups: ["serving.knative.dev"] @@ -58,7 +58,7 @@ metadata: {{- include "tplValue" ( dict "value" .Values.global.commonLabels "context" . ) | nindent 4 }} annotations: helm.sh/hook: post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" helm.sh/hook-weight: "0" subjects: - kind: ServiceAccount @@ -79,7 +79,7 @@ metadata: annotations: helm.sh/hook: post-upgrade helm.sh/hook-weight: "1" - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: diff --git a/resources/testing/charts/octopus/files/crd-testdefinition.yaml b/resources/testing/charts/octopus/files/crd-testdefinition.yaml deleted file mode 100644 index 451b321a3929..000000000000 --- a/resources/testing/charts/octopus/files/crd-testdefinition.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1beta1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - controller-tools.k8s.io: "1.0" - name: testdefinitions.testing.kyma-project.io -spec: - group: testing.kyma-project.io - names: - kind: TestDefinition - plural: testdefinitions - shortNames: - - td - scope: Namespaced - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - properties: - disableConcurrency: - description: If test is working on data that can be modified by another - test, I would like to run it in separation. Default value is false - type: boolean - skip: - description: If there are some problems with given test, we add possibility - to don't execute them. On Testsuite level such test should be marked - as a skipped. Default value is false - type: boolean - template: - type: object - required: - - template - type: object - version: v1alpha1 -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/resources/testing/charts/octopus/templates/crd-job.yaml b/resources/testing/charts/octopus/templates/crd-job.yaml deleted file mode 100644 index 9326c42ee448..000000000000 --- a/resources/testing/charts/octopus/templates/crd-job.yaml +++ /dev/null @@ -1,108 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ .Release.Name }}-crd-init - annotations: - helm.sh/hook: "post-upgrade" - helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: {{ .Release.Name }}-crd-init - annotations: - helm.sh/hook: "post-upgrade" - helm.sh/hook-weight: "0" - helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" -rules: -- apiGroups: ["apiextensions.k8s.io"] - resources: ["customresourcedefinitions"] - verbs: ["create", "get", "patch"] -- apiGroups: ["servicecatalog.k8s.io"] - resources: ["clusterservicebrokers", "clusterserviceclasses", "clusterserviceplans", "servicebrokers", "serviceclasses", "serviceplans", "serviceinstances","servicebindings"] - verbs: ["get","list"] ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: {{ .Release.Name }}-crd-init - annotations: - helm.sh/hook: "post-upgrade" - helm.sh/hook-weight: "0" - "helm.sh/hook-delete-policy": "before-hook-creation, hook-succeeded" - labels: - job: {{ .Release.Name }}-crd-init -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: {{ .Release.Name }}-crd-init -subjects: -- kind: ServiceAccount - name: {{ .Release.Name }}-crd-init - namespace: kyma-system ---- -apiVersion: v1 -kind: ConfigMap -metadata: - namespace: {{ .Release.Namespace }} - name: {{ .Release.Name }}-crd-testing - annotations: - "helm.sh/hook": "post-upgrade" - "helm.sh/hook-weight": "1" - "helm.sh/hook-delete-policy": "before-hook-creation, hook-succeeded" -data: - clustertestsuites.testing.kyma-project.io: |- -{{.Files.Get "files/crd-clustertestsuite.yaml" | printf "%s" | indent 4}} - testdefinitions.testing.kyma-project.io: |- -{{.Files.Get "files/crd-testdefinition.yaml" | printf "%s" | indent 4}} ---- -apiVersion: batch/v1 -kind: Job -metadata: - name: {{ .Release.Name }}-init-testing - namespace: {{ .Release.Namespace }} - annotations: - helm.sh/hook-delete-policy: before-hook-creation, hook-succeeded" - helm.sh/hook: "post-upgrade" - helm.sh/hook-weight: "10" - labels: - job: {{ .Release.Name }}-init-testing -spec: - backoffLimit: 1 - template: - metadata: - name: {{ .Release.Name }}-init-testing - annotations: - sidecar.istio.io/inject: "false" - labels: - job: {{ .Release.Name }}-init-testing - spec: - serviceAccountName: {{ .Release.Name }}-crd-init - restartPolicy: Never - containers: - - name: job - image: "eu.gcr.io/kyma-project/test-infra/alpine-kubectl:v20200617-32c1f3ff" - terminationMessagePolicy: "FallbackToLogsOnError" - volumeMounts: - - name: crd-testing - mountPath: /etc/crd - readOnly: true - command: - - /bin/bash - - -c - - |- - set -e - - crds=( \ - clustertestsuites.testing.kyma-project.io \ - testdefinitions.testing.kyma-project.io \ - ) - - for crd in "${crds[@]}"; do - timeout 60s bash -c "until kubectl apply -f /etc/crd/$crd; do sleep 2; done" - done - volumes: - - name: crd-testing - configMap: - name: {{ .Release.Name }}-crd-testing diff --git a/resources/xip-patch/templates/job.yaml b/resources/xip-patch/templates/job.yaml index 3679fbd5167e..295f58a77525 100644 --- a/resources/xip-patch/templates/job.yaml +++ b/resources/xip-patch/templates/job.yaml @@ -4,7 +4,7 @@ metadata: name: {{ .Release.Name }} annotations: helm.sh/hook: post-install,post-upgrade - helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-delete-policy: "before-hook-creation, hook-succeeded" spec: template: metadata: diff --git a/tests/end-to-end/external-solution-integration/chart/external-solution/templates/test/test-upgrade.yaml b/tests/end-to-end/external-solution-integration/chart/external-solution/templates/test/test-upgrade.yaml index 4ed9d707d61a..04e601f52528 100644 --- a/tests/end-to-end/external-solution-integration/chart/external-solution/templates/test/test-upgrade.yaml +++ b/tests/end-to-end/external-solution-integration/chart/external-solution/templates/test/test-upgrade.yaml @@ -1,3 +1,4 @@ +{{- if .Values.tests.enabled }} {{- if .Capabilities.APIVersions.Has "testing.kyma-project.io/v1alpha1" }} apiVersion: "testing.kyma-project.io/v1alpha1" kind: TestDefinition @@ -36,3 +37,4 @@ spec: sleep 5 exit $exit_code {{- end }} +{{- end }} diff --git a/tests/end-to-end/external-solution-integration/chart/external-solution/values.yaml b/tests/end-to-end/external-solution-integration/chart/external-solution/values.yaml index c876644c0a3e..d5ae4e8c7388 100644 --- a/tests/end-to-end/external-solution-integration/chart/external-solution/values.yaml +++ b/tests/end-to-end/external-solution-integration/chart/external-solution/values.yaml @@ -9,3 +9,6 @@ image: testServiceImage: dir: version: PR-8483 + +tests: + enabled: false