diff --git a/deploy/maistra-operator.yaml b/deploy/maistra-operator.yaml index 05de41c787..cf0ff90358 100644 --- a/deploy/maistra-operator.yaml +++ b/deploy/maistra-operator.yaml @@ -356,7 +356,7 @@ spec: medium: Memory containers: - name: istio-operator - image: maistra/istio-ubi8-operator:1.0.0 + image: maistra/istio-ubi8-operator:1.0.1 ports: - containerPort: 11999 name: validation @@ -377,7 +377,7 @@ spec: - name: OPERATOR_NAME value: istio-operator - name: ISTIO_CNI_IMAGE - value: maistra/istio-cni-ubi8:1.0.0 + value: maistra/istio-cni-ubi8:1.0.1 # - name: ISTIO_CNI_IMAGE_PULL_SECRET # value: name-of-secret volumeMounts: diff --git a/deploy/servicemesh-operator.yaml b/deploy/servicemesh-operator.yaml index 78c33dab23..548d074d47 100644 --- a/deploy/servicemesh-operator.yaml +++ b/deploy/servicemesh-operator.yaml @@ -356,7 +356,7 @@ spec: medium: Memory containers: - name: istio-operator - image: registry.redhat.io/openshift-service-mesh/istio-rhel8-operator:1.0.0 + image: registry.redhat.io/openshift-service-mesh/istio-rhel8-operator:1.0.1 ports: - containerPort: 11999 name: validation @@ -377,7 +377,7 @@ spec: - name: OPERATOR_NAME value: istio-operator - name: ISTIO_CNI_IMAGE - value: registry.redhat.io/openshift-service-mesh/istio-cni-rhel8:1.0.0 + value: registry.redhat.io/openshift-service-mesh/istio-cni-rhel8:1.0.1 # - name: ISTIO_CNI_IMAGE_PULL_SECRET # value: name-of-secret volumeMounts: diff --git a/deploy/smcp-templates/base b/deploy/smcp-templates/base index 682d115ba1..de4f27fadc 100644 --- a/deploy/smcp-templates/base +++ b/deploy/smcp-templates/base @@ -3,7 +3,7 @@ kind: ServiceMeshControlPlane spec: istio: global: - tag: 1.0.0 + tag: 1.0.1 proxy: autoInject: disabled dnsRefreshRate: 300s diff --git a/manifests-maistra/1.0.1/maistraoperator.v1.0.1.clusterserviceversion.yaml b/manifests-maistra/1.0.1/maistraoperator.v1.0.1.clusterserviceversion.yaml new file mode 100644 index 0000000000..a55e600a6c --- /dev/null +++ b/manifests-maistra/1.0.1/maistraoperator.v1.0.1.clusterserviceversion.yaml @@ -0,0 +1,420 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + name: maistraoperator.v1.0.1 + namespace: placeholder + annotations: + categories: "OpenShift Optional, Integration & Delivery" + capabilities: "Seamless Upgrades" + certified: "false" + repository: https://github.com/maistra/istio-operator + description: |- + The Maistra Operator enables you to install, configure, and manage an instance of Maistra service mesh. Maistra is based on the open source Istio project. + + containerImage: maistra/istio-ubi8-operator:1.0.1 + createdAt: 2019-10-04T08:48:13UTC + support: Red Hat, Inc. + alm-examples: |- + [ + { + "apiVersion": "maistra.io/v1", + "kind": "ServiceMeshControlPlane", + "metadata": { + "name": "basic-install" + }, + "spec": { + "istio": { + "global": { + "proxy": { + "resources": { + "requests": { + "cpu": "100m", + "memory": "128Mi" + }, + "limits": { + "cpu": "500m", + "memory": "128Mi" + } + } + } + }, + "gateways": { + "istio-egressgateway": { + "autoscaleEnabled": false + }, + "istio-ingressgateway": { + "autoscaleEnabled": false + } + }, + "mixer": { + "policy": { + "autoscaleEnabled": false + }, + "telemetry": { + "autoscaleEnabled": false, + "resources": { + "requests": { + "cpu": "100m", + "memory": "1G" + }, + "limits": { + "cpu": "500m", + "memory": "4G" + } + } + } + }, + "pilot": { + "autoscaleEnabled": false, + "traceSampling": 100.0 + }, + "kiali": { + "enabled": true + }, + "grafana": { + "enabled": true + }, + "tracing": { + "enabled": true, + "jaeger": { + "template": "all-in-one" + } + } + } + } + }, + { + "apiVersion": "maistra.io/v1", + "kind": "ServiceMeshMemberRoll", + "metadata": { + "name": "default" + }, + "spec": { + "members": [ + "your-project", + "another-of-your-projects" + ] + } + } + ] +spec: + version: 1.0.1 + maturity: alpha + displayName: Red Hat OpenShift Service Mesh + description: |- + Red Hat OpenShift Service Mesh is a platform that provides behavioral insight and operational control over the service mesh, providing a uniform way to connect, secure, and monitor microservice applications. + keywords: [ 'istio', 'maistra', 'servicemesh' ] + maintainers: + - name: Red Hat, OpenShift Service Mesh + email: istio-feedback@redhat.com + provider: + name: Red Hat, Inc. + links: + - name: Service Mesh Operator + url: https://github.com/Maistra/istio-operator + - name: Istio + url: https://istio.io/ + installModes: + - type: OwnNamespace + supported: true + - type: SingleNamespace + supported: false + - type: MultiNamespace + supported: false + - type: AllNamespaces + supported: true + install: + strategy: deployment + spec: + clusterPermissions: + - serviceAccountName: istio-operator + rules: + + - apiGroups: + - '' + resources: + - configmaps + - endpoints + - namespaces + - persistentvolumeclaims + - pods + - replicationcontrollers + - secrets + - serviceaccounts + - services + - events + verbs: + - '*' + - apiGroups: + - apps + - extensions + resources: + - daemonsets + - deployments + - deployments/finalizers + - ingresses + - ingresses/status + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - '*' + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - '*' + - apiGroups: + - admissionregistration.k8s.io + resources: + - mutatingwebhookconfigurations + - validatingwebhookconfigurations + verbs: + - '*' + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - '*' + - apiGroups: + - certmanager.k8s.io + resources: + - clusterissuers + verbs: + - '*' + - apiGroups: + - networking.k8s.io + resources: + - networkpolicies + verbs: + - '*' + - apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + - clusterroles + - rolebindings + - roles + verbs: + - '*' + - apiGroups: + - authentication.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - config.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - networking.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - rbac.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - jaegertracing.io + resources: + - jaegers + verbs: + - '*' + - apiGroups: + - kiali.io + resources: + - kialis + verbs: + - '*' + - apiGroups: + - maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - authentication.maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - rbac.maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - route.openshift.io + resources: + - routes + - routes/custom-host + verbs: + - '*' + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create + - apiGroups: + - network.openshift.io + resources: + - clusternetworks + verbs: + - get + - apiGroups: + - network.openshift.io + resources: + - netnamespaces + verbs: + - get + - list + - watch + - update + - apiGroups: + - k8s.cni.cncf.io + resources: + - network-attachment-definitions + verbs: + - create + - delete + - get + - list + - patch + - watch + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + resourceNames: + - privileged + verbs: + - use + - apiGroups: + - '' + resources: + - nodes + - nodes/proxy + verbs: + - get + - list + - watch + - apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create + - nonResourceURLs: + - /metrics + verbs: + - get + deployments: + - name: istio-operator + spec: + + replicas: 1 + selector: + matchLabels: + name: istio-operator + template: + metadata: + labels: + name: istio-operator + spec: + serviceAccountName: istio-operator + volumes: + - name: discovery-cache + emptyDir: + medium: Memory + containers: + - name: istio-operator + image: maistra/istio-ubi8-operator:1.0.1 + ports: + - containerPort: 11999 + name: validation + - containerPort: 60000 + name: metrics + command: + - istio-operator + - --discoveryCacheDir + - /home/istio-operator/.kube/cache/discovery + imagePullPolicy: Always + env: + - name: WATCH_NAMESPACE + value: '' + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: istio-operator + - name: ISTIO_CNI_IMAGE + value: maistra/istio-cni-ubi8:1.0.1 + volumeMounts: + - name: discovery-cache + mountPath: /home/istio-operator/.kube/cache/discovery + customresourcedefinitions: + required: + - name: kialis.kiali.io + version: v1alpha1 + kind: Kiali + displayName: Kiali + description: A configuration file for a Kiali installation. + - name: jaegers.jaegertracing.io + version: v1 + kind: Jaeger + displayName: Jaeger + description: A configuration file for a Jaeger installation. + owned: + - name: servicemeshmemberrolls.maistra.io + version: v1 + kind: ServiceMeshMemberRoll + displayName: Istio Service Mesh Member Roll + description: A list of namespaces in Service Mesh + - name: servicemeshcontrolplanes.maistra.io + version: v1 + kind: ServiceMeshControlPlane + displayName: Istio Service Mesh Control Plane + description: An Istio control plane installation + specDescriptors: + - description: Set to true to install Kiali + displayName: Install Kiali + path: istio.kiali.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to true to install Grafana + displayName: Install Grafana + path: istio.grafana.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to false to disable tracing + displayName: Enable tracing + path: istio.tracing.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to true to install the Istio 3Scale adapter + displayName: Install 3Scale Adapter + path: threeScale.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Limits describes the minimum/maximum amount of compute resources required/allowed + displayName: Default Resource Requirements + path: istio.global.defaultResources + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:resourceRequirements' diff --git a/manifests-maistra/1.0.1/servicemeshcontrolplanes.crd.yaml b/manifests-maistra/1.0.1/servicemeshcontrolplanes.crd.yaml new file mode 100644 index 0000000000..06e9d1cf01 --- /dev/null +++ b/manifests-maistra/1.0.1/servicemeshcontrolplanes.crd.yaml @@ -0,0 +1,40 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: servicemeshcontrolplanes.maistra.io +spec: + group: maistra.io + names: + kind: ServiceMeshControlPlane + listKind: ServiceMeshControlPlaneList + plural: servicemeshcontrolplanes + singular: servicemeshcontrolplane + shortNames: + - smcp + scope: Namespaced + subresources: + status: {} + version: v1 + additionalPrinterColumns: + - JSONPath: .status.conditions[?(@.type=="Ready")].status + name: Ready + description: Whether or not the control plane installation is up to date and ready + to handle requests. + type: string + - JSONPath: .status.conditions[?(@.type=="Ready")].message + name: Status + description: The status of the control plane installation. + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Reconciled")].status + name: Reconciled + description: Whether or not the control plane installation is up to date with + the latest version of this resource. + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Reconciled")].message + name: Reconciliation Status + description: The status of the reconciliation process, if the control plane is + not up to date with the latest version this resource. + type: string + priority: 1 diff --git a/manifests-maistra/1.0.1/servicemeshmemberrolls.crd.yaml b/manifests-maistra/1.0.1/servicemeshmemberrolls.crd.yaml new file mode 100644 index 0000000000..5111d14ac2 --- /dev/null +++ b/manifests-maistra/1.0.1/servicemeshmemberrolls.crd.yaml @@ -0,0 +1,22 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: servicemeshmemberrolls.maistra.io +spec: + group: maistra.io + names: + kind: ServiceMeshMemberRoll + listKind: ServiceMeshMemberRollList + plural: servicemeshmemberrolls + singular: servicemeshmemberroll + shortNames: + - smmr + scope: Namespaced + subresources: + status: {} + version: v1 + additionalPrinterColumns: + - JSONPath: .spec.members + description: Namespaces that are members of this Control Plane + name: Members + type: string diff --git a/manifests-maistra/maistra.package.yaml b/manifests-maistra/maistra.package.yaml index 1ca554b529..46686ab3ea 100644 --- a/manifests-maistra/maistra.package.yaml +++ b/manifests-maistra/maistra.package.yaml @@ -1,5 +1,5 @@ packageName: maistraoperator channels: - name: "1.0" - currentCSV: maistraoperator.v1.0.0 + currentCSV: maistraoperator.v1.0.1 defaultChannel: "1.0" diff --git a/manifests-servicemesh/1.0.1/servicemeshcontrolplanes.crd.yaml b/manifests-servicemesh/1.0.1/servicemeshcontrolplanes.crd.yaml new file mode 100644 index 0000000000..06e9d1cf01 --- /dev/null +++ b/manifests-servicemesh/1.0.1/servicemeshcontrolplanes.crd.yaml @@ -0,0 +1,40 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: servicemeshcontrolplanes.maistra.io +spec: + group: maistra.io + names: + kind: ServiceMeshControlPlane + listKind: ServiceMeshControlPlaneList + plural: servicemeshcontrolplanes + singular: servicemeshcontrolplane + shortNames: + - smcp + scope: Namespaced + subresources: + status: {} + version: v1 + additionalPrinterColumns: + - JSONPath: .status.conditions[?(@.type=="Ready")].status + name: Ready + description: Whether or not the control plane installation is up to date and ready + to handle requests. + type: string + - JSONPath: .status.conditions[?(@.type=="Ready")].message + name: Status + description: The status of the control plane installation. + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Reconciled")].status + name: Reconciled + description: Whether or not the control plane installation is up to date with + the latest version of this resource. + type: string + priority: 1 + - JSONPath: .status.conditions[?(@.type=="Reconciled")].message + name: Reconciliation Status + description: The status of the reconciliation process, if the control plane is + not up to date with the latest version this resource. + type: string + priority: 1 diff --git a/manifests-servicemesh/1.0.1/servicemeshmemberrolls.crd.yaml b/manifests-servicemesh/1.0.1/servicemeshmemberrolls.crd.yaml new file mode 100644 index 0000000000..5111d14ac2 --- /dev/null +++ b/manifests-servicemesh/1.0.1/servicemeshmemberrolls.crd.yaml @@ -0,0 +1,22 @@ +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: servicemeshmemberrolls.maistra.io +spec: + group: maistra.io + names: + kind: ServiceMeshMemberRoll + listKind: ServiceMeshMemberRollList + plural: servicemeshmemberrolls + singular: servicemeshmemberroll + shortNames: + - smmr + scope: Namespaced + subresources: + status: {} + version: v1 + additionalPrinterColumns: + - JSONPath: .spec.members + description: Namespaces that are members of this Control Plane + name: Members + type: string diff --git a/manifests-servicemesh/1.0.1/servicemeshoperator.v1.0.1.clusterserviceversion.yaml b/manifests-servicemesh/1.0.1/servicemeshoperator.v1.0.1.clusterserviceversion.yaml new file mode 100644 index 0000000000..5689e3c0e5 --- /dev/null +++ b/manifests-servicemesh/1.0.1/servicemeshoperator.v1.0.1.clusterserviceversion.yaml @@ -0,0 +1,420 @@ +apiVersion: operators.coreos.com/v1alpha1 +kind: ClusterServiceVersion +metadata: + name: servicemeshoperator.v1.0.1 + namespace: placeholder + annotations: + categories: "OpenShift Optional, Integration & Delivery" + capabilities: "Seamless Upgrades" + certified: "false" + repository: https://github.com/maistra/istio-operator + description: |- + The OpenShift Service Mesh Operator enables you to install, configure, and manage an instance of Red Hat OpenShift Service Mesh. OpenShift Service Mesh is based on the open source Istio project. + + containerImage: registry.redhat.io/openshift-service-mesh/istio-rhel8-operator:1.0.1 + createdAt: 2019-10-04T08:28:21UTC + support: Red Hat, Inc. + alm-examples: |- + [ + { + "apiVersion": "maistra.io/v1", + "kind": "ServiceMeshControlPlane", + "metadata": { + "name": "basic-install" + }, + "spec": { + "istio": { + "global": { + "proxy": { + "resources": { + "requests": { + "cpu": "100m", + "memory": "128Mi" + }, + "limits": { + "cpu": "500m", + "memory": "128Mi" + } + } + } + }, + "gateways": { + "istio-egressgateway": { + "autoscaleEnabled": false + }, + "istio-ingressgateway": { + "autoscaleEnabled": false + } + }, + "mixer": { + "policy": { + "autoscaleEnabled": false + }, + "telemetry": { + "autoscaleEnabled": false, + "resources": { + "requests": { + "cpu": "100m", + "memory": "1G" + }, + "limits": { + "cpu": "500m", + "memory": "4G" + } + } + } + }, + "pilot": { + "autoscaleEnabled": false, + "traceSampling": 100.0 + }, + "kiali": { + "enabled": true + }, + "grafana": { + "enabled": true + }, + "tracing": { + "enabled": true, + "jaeger": { + "template": "all-in-one" + } + } + } + } + }, + { + "apiVersion": "maistra.io/v1", + "kind": "ServiceMeshMemberRoll", + "metadata": { + "name": "default" + }, + "spec": { + "members": [ + "your-project", + "another-of-your-projects" + ] + } + } + ] +spec: + version: 1.0.1 + maturity: alpha + displayName: Red Hat OpenShift Service Mesh + description: |- + Red Hat OpenShift Service Mesh is a platform that provides behavioral insight and operational control over the service mesh, providing a uniform way to connect, secure, and monitor microservice applications. + keywords: [ 'istio', 'maistra', 'servicemesh' ] + maintainers: + - name: Red Hat, OpenShift Service Mesh + email: istio-feedback@redhat.com + provider: + name: Red Hat, Inc. + links: + - name: Service Mesh Operator + url: https://github.com/Maistra/istio-operator + - name: Istio + url: https://istio.io/ + installModes: + - type: OwnNamespace + supported: true + - type: SingleNamespace + supported: false + - type: MultiNamespace + supported: false + - type: AllNamespaces + supported: true + install: + strategy: deployment + spec: + clusterPermissions: + - serviceAccountName: istio-operator + rules: + + - apiGroups: + - '' + resources: + - configmaps + - endpoints + - namespaces + - persistentvolumeclaims + - pods + - replicationcontrollers + - secrets + - serviceaccounts + - services + - events + verbs: + - '*' + - apiGroups: + - apps + - extensions + resources: + - daemonsets + - deployments + - deployments/finalizers + - ingresses + - ingresses/status + - replicasets + - statefulsets + verbs: + - '*' + - apiGroups: + - autoscaling + resources: + - horizontalpodautoscalers + verbs: + - '*' + - apiGroups: + - policy + resources: + - poddisruptionbudgets + verbs: + - '*' + - apiGroups: + - admissionregistration.k8s.io + resources: + - mutatingwebhookconfigurations + - validatingwebhookconfigurations + verbs: + - '*' + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - '*' + - apiGroups: + - certmanager.k8s.io + resources: + - clusterissuers + verbs: + - '*' + - apiGroups: + - networking.k8s.io + resources: + - networkpolicies + verbs: + - '*' + - apiGroups: + - rbac.authorization.k8s.io + resources: + - clusterrolebindings + - clusterroles + - rolebindings + - roles + verbs: + - '*' + - apiGroups: + - authentication.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - config.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - networking.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - rbac.istio.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - jaegertracing.io + resources: + - jaegers + verbs: + - '*' + - apiGroups: + - kiali.io + resources: + - kialis + verbs: + - '*' + - apiGroups: + - maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - authentication.maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - rbac.maistra.io + resources: + - '*' + verbs: + - '*' + - apiGroups: + - route.openshift.io + resources: + - routes + - routes/custom-host + verbs: + - '*' + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create + - apiGroups: + - network.openshift.io + resources: + - clusternetworks + verbs: + - get + - apiGroups: + - network.openshift.io + resources: + - netnamespaces + verbs: + - get + - list + - watch + - update + - apiGroups: + - k8s.cni.cncf.io + resources: + - network-attachment-definitions + verbs: + - create + - delete + - get + - list + - patch + - watch + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + resourceNames: + - privileged + verbs: + - use + - apiGroups: + - '' + resources: + - nodes + - nodes/proxy + verbs: + - get + - list + - watch + - apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create + - nonResourceURLs: + - /metrics + verbs: + - get + deployments: + - name: istio-operator + spec: + + replicas: 1 + selector: + matchLabels: + name: istio-operator + template: + metadata: + labels: + name: istio-operator + spec: + serviceAccountName: istio-operator + volumes: + - name: discovery-cache + emptyDir: + medium: Memory + containers: + - name: istio-operator + image: registry.redhat.io/openshift-service-mesh/istio-rhel8-operator:1.0.1 + ports: + - containerPort: 11999 + name: validation + - containerPort: 60000 + name: metrics + command: + - istio-operator + - --discoveryCacheDir + - /home/istio-operator/.kube/cache/discovery + imagePullPolicy: Always + env: + - name: WATCH_NAMESPACE + value: '' + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: OPERATOR_NAME + value: istio-operator + - name: ISTIO_CNI_IMAGE + value: registry.redhat.io/openshift-service-mesh/istio-cni-rhel8:1.0.1 + volumeMounts: + - name: discovery-cache + mountPath: /home/istio-operator/.kube/cache/discovery + customresourcedefinitions: + required: + - name: kialis.kiali.io + version: v1alpha1 + kind: Kiali + displayName: Kiali + description: A configuration file for a Kiali installation. + - name: jaegers.jaegertracing.io + version: v1 + kind: Jaeger + displayName: Jaeger + description: A configuration file for a Jaeger installation. + owned: + - name: servicemeshmemberrolls.maistra.io + version: v1 + kind: ServiceMeshMemberRoll + displayName: Istio Service Mesh Member Roll + description: A list of namespaces in Service Mesh + - name: servicemeshcontrolplanes.maistra.io + version: v1 + kind: ServiceMeshControlPlane + displayName: Istio Service Mesh Control Plane + description: An Istio control plane installation + specDescriptors: + - description: Set to true to install Kiali + displayName: Install Kiali + path: istio.kiali.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to true to install Grafana + displayName: Install Grafana + path: istio.grafana.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to false to disable tracing + displayName: Enable tracing + path: istio.tracing.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Set to true to install the Istio 3Scale adapter + displayName: Install 3Scale Adapter + path: threeScale.enabled + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:booleanSwitch' + - description: Limits describes the minimum/maximum amount of compute resources required/allowed + displayName: Default Resource Requirements + path: istio.global.defaultResources + x-descriptors: + - 'urn:alm:descriptor:com.tectonic.ui:resourceRequirements' diff --git a/manifests-servicemesh/servicemesh.package.yaml b/manifests-servicemesh/servicemesh.package.yaml index 56d015b601..ed4d5ba182 100644 --- a/manifests-servicemesh/servicemesh.package.yaml +++ b/manifests-servicemesh/servicemesh.package.yaml @@ -1,5 +1,5 @@ packageName: servicemeshoperator channels: - name: "1.0" - currentCSV: servicemeshoperator.v1.0.0 + currentCSV: servicemeshoperator.v1.0.1 defaultChannel: "1.0" diff --git a/tmp/build/download-charts.sh b/tmp/build/download-charts.sh index 1cc599ef51..3ae4791a4d 100755 --- a/tmp/build/download-charts.sh +++ b/tmp/build/download-charts.sh @@ -2,7 +2,7 @@ set -e -: ${MAISTRA_VERSION:=1.0.0} +: ${MAISTRA_VERSION:=1.0.1} : ${MAISTRA_BRANCH:=1.0} SOURCE_DIR=$(pwd) diff --git a/tmp/build/generate-manifests.sh b/tmp/build/generate-manifests.sh index 8e575b5149..750c7bf2b8 100755 --- a/tmp/build/generate-manifests.sh +++ b/tmp/build/generate-manifests.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash -# to generate Maistra OLM metadata: MAISTRA_VERSION=1.0.0 tmp/build/generate-manifests.sh -# to generate ServiceMesh OLM metadata: COMMUNITY=false MAISTRA_VERSION=1.0.0 tmp/build/generate-manifests.sh +# to generate Maistra OLM metadata: MAISTRA_VERSION=1.0.1 tmp/build/generate-manifests.sh +# to generate ServiceMesh OLM metadata: COMMUNITY=false MAISTRA_VERSION=1.0.1 tmp/build/generate-manifests.sh set -e : ${COMMUNITY:-"true"} -: ${MAISTRA_VERSION:?"Need to set maistra version, e.g. 1.0.0"} +: ${MAISTRA_VERSION:?"Need to set maistra version, e.g. 1.0.1"} if [[ ${COMMUNITY} == "true" ]]; then BUILD_TYPE="maistra"