diff --git a/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx b/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx index 9075e005ae..c301b0b002 100644 --- a/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx +++ b/calico-enterprise/getting-started/install-on-clusters/kubernetes/helm.mdx @@ -36,6 +36,7 @@ In this guide, you install the Tigera Calico operator and custom resource defini helm repo add tigera-ee https://downloads.tigera.io/ee/charts helm repo update helm pull tigera-ee/tigera-operator --version $[releaseTitle] +helm pull tigera-ee/crd.projectcalico.org.v1 --version $[releaseTitle] ``` ### Prepare the Installation Configuration @@ -95,7 +96,7 @@ To install a standard $[prodname] cluster with Helm: 1. Create the necessary custom resource definitions. ```bash - helm install calico-crds crd.projectcalico.org.v1-$[chart_version_name] --version $[releaseTitle] --namespace tigera-operator + helm install calico-crds crd.projectcalico.org.v1-$[chart_version_name].tgz --namespace tigera-operator --create-namespace ``` 1. Install the Tigera Operator using the Helm 3 chart: @@ -104,7 +105,7 @@ To install a standard $[prodname] cluster with Helm: helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz \ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ - --namespace tigera-operator --create-namespace + --namespace tigera-operator ``` or if you created a `values.yaml` above: @@ -113,7 +114,7 @@ To install a standard $[prodname] cluster with Helm: helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \ --set-file licenseKeyContent= \ - --namespace tigera-operator --create-namespace + --namespace tigera-operator ``` 1. You can now monitor progress with the following command: diff --git a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx index dd6c5cd6be..adf6d17333 100644 --- a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx +++ b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-managed-cluster-helm.mdx @@ -36,6 +36,7 @@ In this guide, you install the Tigera Calico operator and custom resource defini helm repo add tigera-ee https://downloads.tigera.io/ee/charts helm repo update helm pull tigera-ee/tigera-operator --version $[releaseTitle] +helm pull tigera-ee/crd.projectcalico.org.v1 --version $[releaseTitle] ``` ### Prepare the Installation Configuration @@ -121,7 +122,13 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# key: $MANAGED_CLUSTER_KEY" >> values.yaml ``` -1. Install the Tigera Operator and custom resource definitions using the Helm 3 chart: +1. Create the necessary custom resource definitions. + + ```bash + helm install calico-crds crd.projectcalico.org.v1-$[chart_version_name].tgz --namespace tigera-operator --create-namespace + ``` + +1. Install the Tigera Operator using the Helm 3 chart: {'$[version]' === 'master' @@ -129,12 +136,12 @@ To install a $[prodname] [managed](../standard-install/create-a-managed-cluster# --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ ---namespace tigera-operator --create-namespace` +--namespace tigera-operator` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ --set logStorage.enabled=false --set manager.enabled=false \\ ---namespace tigera-operator --create-namespace`} +--namespace tigera-operator`} 1. You can now monitor progress with the following command: diff --git a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx index d669ec33f6..abf67a8d6b 100644 --- a/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx +++ b/calico-enterprise/multicluster/set-up-multi-cluster-management/helm-install/create-a-management-cluster-helm.mdx @@ -38,10 +38,12 @@ In this guide, you install the Tigera Calico operator and custom resource defini {'$[version]' === 'master' ? `helm repo add tigera gs://tigera-helm-charts helm repo update -helm pull tigera/tigera-operator --version $[releaseTitle]` +helm pull tigera/tigera-operator --version $[releaseTitle] +helm pull tigera/crd.projectcalico.org.v1 --version $[releaseTitle]` : `helm repo add tigera-ee https://downloads.tigera.io/ee/charts helm repo update -helm pull tigera-ee/tigera-operator --version $[releaseTitle]`} +helm pull tigera-ee/tigera-operator --version $[releaseTitle] +helm pull tigera-ee/crd.projectcalico.org.v1 --version $[releaseTitle]`} ### Prepare the Installation Configuration @@ -140,18 +142,24 @@ To install a $[prodname] [management](create-a-management-cluster-helm#value) cl certificate: $MANAGED_CLUSTER_CERTIFICATE" >> values.yaml ``` -1. Install the Tigera Operator and custom resource definitions using the Helm 3 chart: +1. Create the necessary custom resource definitions. + + ```bash + helm install calico-crds crd.projectcalico.org.v1-$[chart_version_name].tgz --namespace tigera-operator --create-namespace + ``` + +1. Install the Tigera Operator using the Helm 3 chart: {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ ---namespace tigera-operator --create-namespace` +--namespace tigera-operator` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ ---namespace tigera-operator --create-namespace`} +--namespace tigera-operator`} 1. You can now monitor progress with the following command: @@ -228,18 +236,24 @@ For example, if you are using EKS, you must meet the requirements defined in [cr value: "internet-facing" ``` -1. Install the Tigera Operator and custom resource definitions using the Helm 3 chart: +1. Create the necessary custom resource definitions. + + ```bash + helm install calico-crds crd.projectcalico.org.v1-$[chart_version_name].tgz --namespace tigera-operator --create-namespace + ``` + +1. Install the Tigera Operator using the Helm 3 chart: {'$[version]' === 'master' ? `helm install $[prodnamedash] tigera/tigera-operator --version tigera-operator-v0.0 -f values.yaml \\ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ ---namespace tigera-operator --create-namespace` +--namespace tigera-operator` : `helm install $[prodnamedash] tigera-operator-$[chart_version_name].tgz -f values.yaml \\ --set-file imagePullSecrets.tigera-pull-secret=,tigera-prometheus-operator.imagePullSecrets.tigera-pull-secret= \\ --set-file licenseKeyContent= \\ ---namespace tigera-operator --create-namespace`} +--namespace tigera-operator`} 1. You can now monitor progress with the following command: