diff --git a/charts/coco-supported/sandbox/templates/peer-pods-secret-eso.yaml b/charts/coco-supported/sandbox/templates/peer-pods-secret-eso.yaml deleted file mode 100644 index 80654326..00000000 --- a/charts/coco-supported/sandbox/templates/peer-pods-secret-eso.yaml +++ /dev/null @@ -1,60 +0,0 @@ -{{ if .Values.sandbox.azure }} -apiVersion: policy.open-cluster-management.io/v1 -kind: Policy -metadata: - name: peer-pods-secret-policy -spec: - remediationAction: enforce - disabled: false - policy-templates: - - objectDefinition: - apiVersion: policy.open-cluster-management.io/v1 - kind: ConfigurationPolicy - metadata: - name: azure-peer-pods-creds - spec: - remediationAction: enforce - severity: medium - object-templates: - - complianceType: mustonlyhave - objectDefinition: - apiVersion: v1 - type: Opaque - kind: Secret - metadata: - name: peer-pods-secret - namespace: openshift-sandboxed-containers-operator - data: - AZURE_CLIENT_ID: '{{ `{{ fromSecret "openshift-cloud-controller-manager" "azure-cloud-credentials" "azure_client_id" }}` }}' - AZURE_CLIENT_SECRET: '{{ `{{ fromSecret "openshift-cloud-controller-manager" "azure-cloud-credentials" "azure_client_secret" }}` }}' - AZURE_TENANT_ID: '{{ `{{ fromSecret "openshift-cloud-controller-manager" "azure-cloud-credentials" "azure_tenant_id" }}` }}' - AZURE_SUBSCRIPTION_ID: '{{ `{{ fromSecret "openshift-cloud-controller-manager" "azure-cloud-credentials" "azure_subscription_id" }}` }}' ---- -apiVersion: policy.open-cluster-management.io/v1 -kind: PlacementBinding -metadata: - name: peer-pod-secret-binding - annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true -placementRef: - name: azure-peer-pods-secret-rule - kind: PlacementRule - apiGroup: apps.open-cluster-management.io -subjects: - - name: peer-pods-secret-policy - kind: Policy - apiGroup: policy.open-cluster-management.io ------- -apiVersion: apps.open-cluster-management.io/v1 -kind: PlacementRule -metadata: - name: azure-peer-pods-secret-rule -spec: - clusterConditions: - - status: 'True' - type: ManagedClusterConditionAvailable - clusterSelector: - matchLabels: - cloud: Azure ---- -{{ end }} \ No newline at end of file diff --git a/values-simple.yaml b/values-simple.yaml index 355200f3..3663c479 100644 --- a/values-simple.yaml +++ b/values-simple.yaml @@ -16,8 +16,6 @@ clusterGroup: - kbs-access - encrypted-storage - experiment - - ripple - subscriptions: # ACM is kept anticipating @@ -110,24 +108,6 @@ clusterGroup: project: workloads path: charts/coco-supported/kbs-access - encrypted-storage: - name: encrypted-storage - namespace: encrypted-storage - project: workloads - path: charts/coco-supported/encrypted-storage - - image-build: - name: image-build - namespace: kbs-access - project: workloads - path: charts/coco-supported/image-build - - experiment: - name: experiment - namespace: experiment - project: workloads - path: charts/hub/experiment - imperative: # NOTE: We *must* use lists and not hashes. As hashes lose ordering once parsed by helm # The default schedule is every 10 minutes: imperative.schedule