From 9cc1a184f5b72c1794a0bb864169c7926f94099f Mon Sep 17 00:00:00 2001 From: Rokibul Hasan Date: Wed, 5 Jun 2024 19:40:01 +0600 Subject: [PATCH 1/2] Pass `clusterName` in license-proxyserver addon Signed-off-by: Rokibul Hasan --- charts/license-proxyserver/README.md | 1 + charts/license-proxyserver/templates/cluster-role.yaml | 6 ------ charts/license-proxyserver/templates/deployment.yaml | 3 +++ charts/license-proxyserver/values.yaml | 3 +++ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/license-proxyserver/README.md b/charts/license-proxyserver/README.md index 396931aff..77ddbcf2c 100644 --- a/charts/license-proxyserver/README.md +++ b/charts/license-proxyserver/README.md @@ -85,6 +85,7 @@ The following table lists the configurable parameters of the `license-proxyserve | licenses | Offline licenses for various products. Get a license by following the steps from [here](https://license-issuer.appscode.com/).
Example:
`helm install appscode/license-proxyserver \`
`--set-file licenses.key1=/path/to/license/file1 \`
`--set-file licenses.key2=/path/to/license/file2` | {} | | encodedLicenses | Offline licenses for various products. Get a license by following the steps from [here](https://license-issuer.appscode.com/).
Example:
`helm install appscode/license-proxyserver \`
`--set licenses.key1=base64_encoded(/path/to/license/file1) \`
`--set licenses.key2=base64_encoded(/path/to/license/file2)` | {} | | hubKubeconfigSecretName | Name of OCM Hub Kubeconfig secret | "" | +| clusterName | We need to pass the cluster name because the OCM-MC host cluster doesn't have Klusterlet object. | "" | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/license-proxyserver/templates/cluster-role.yaml b/charts/license-proxyserver/templates/cluster-role.yaml index 2024fad73..1459b0d82 100644 --- a/charts/license-proxyserver/templates/cluster-role.yaml +++ b/charts/license-proxyserver/templates/cluster-role.yaml @@ -23,9 +23,3 @@ rules: resources: - clusterclaims verbs: ["get", "list", "watch", "create", "update", "patch"] -# ocm cluster name detection -- apiGroups: - - operator.open-cluster-management.io - resources: - - klusterlets - verbs: ["get"] diff --git a/charts/license-proxyserver/templates/deployment.yaml b/charts/license-proxyserver/templates/deployment.yaml index 29ace00d7..191f3eda8 100644 --- a/charts/license-proxyserver/templates/deployment.yaml +++ b/charts/license-proxyserver/templates/deployment.yaml @@ -51,6 +51,9 @@ spec: {{- if .Values.hubKubeconfigSecretName }} - --hub-kubeconfig=/var/run/secrets/ocm/auth/kubeconfig {{- end }} + {{- if .Values.clusterName }} + - --cluster-name={{ .Values.clusterName }} + {{- end }} ports: - containerPort: 8443 - containerPort: 8081 diff --git a/charts/license-proxyserver/values.yaml b/charts/license-proxyserver/values.yaml index 619b6e91b..43b225130 100644 --- a/charts/license-proxyserver/values.yaml +++ b/charts/license-proxyserver/values.yaml @@ -124,3 +124,6 @@ encodedLicenses: {} # Name of OCM Hub Kubeconfig secret hubKubeconfigSecretName: "" + +# We need to pass the cluster name because the OCM-MC host cluster doesn't have Klusterlet object. +clusterName: "" From 071c6d6c362aecd67a977c53a197f57349bc9cbd Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Wed, 5 Jun 2024 07:20:30 -0700 Subject: [PATCH 2/2] update version Signed-off-by: Tamal Saha --- charts/license-proxyserver-manager/Chart.yaml | 4 ++-- charts/license-proxyserver-manager/README.md | 10 +++++----- charts/license-proxyserver/Chart.yaml | 2 +- charts/opscenter-features/README.md | 2 +- charts/opscenter-features/values.yaml | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/license-proxyserver-manager/Chart.yaml b/charts/license-proxyserver-manager/Chart.yaml index 093302135..59b895849 100644 --- a/charts/license-proxyserver-manager/Chart.yaml +++ b/charts/license-proxyserver-manager/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: AppsCode License Proxy Server OCM Addon Manager name: license-proxyserver-manager -version: v2024.2.25 -appVersion: v0.0.9 +version: v2024.6.3 +appVersion: v0.0.11 home: https://github.com/bytebuilders/license-proxyserver icon: https://cdn.appscode.com/images/products/searchlight/icons/android-icon-192x192.png sources: diff --git a/charts/license-proxyserver-manager/README.md b/charts/license-proxyserver-manager/README.md index 81bd407e7..67a1d4f44 100644 --- a/charts/license-proxyserver-manager/README.md +++ b/charts/license-proxyserver-manager/README.md @@ -7,8 +7,8 @@ ```bash $ helm repo add appscode https://charts.appscode.com/stable $ helm repo update -$ helm search repo appscode/license-proxyserver-manager --version=v2024.2.25 -$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.2.25 +$ helm search repo appscode/license-proxyserver-manager --version=v2024.6.3 +$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.6.3 ``` ## Introduction @@ -24,7 +24,7 @@ This chart deploys an AppsCode License Proxy Server OCM Addon Manager on a [Kube To install/upgrade the chart with the release name `license-proxyserver-manager`: ```bash -$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.2.25 +$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.6.3 ``` The command deploys an AppsCode License Proxy Server OCM Addon Manager on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation. @@ -66,12 +66,12 @@ The following table lists the configurable parameters of the `license-proxyserve Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: ```bash -$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.2.25 --set registryFQDN=ghcr.io +$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.6.3 --set registryFQDN=ghcr.io ``` Alternatively, a YAML file that specifies the values for the parameters can be provided while installing the chart. For example: ```bash -$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.2.25 --values values.yaml +$ helm upgrade -i license-proxyserver-manager appscode/license-proxyserver-manager -n open-cluster-management-license-proxyserver --create-namespace --version=v2024.6.3 --values values.yaml ``` diff --git a/charts/license-proxyserver/Chart.yaml b/charts/license-proxyserver/Chart.yaml index 3ac9a0359..42d373e98 100755 --- a/charts/license-proxyserver/Chart.yaml +++ b/charts/license-proxyserver/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Kubernetes license-proxyserver by AppsCode name: license-proxyserver version: v2024.6.3 -appVersion: v0.0.10 +appVersion: v0.0.11 home: https://github.com/bytebuilders/license-proxyserver icon: https://cdn.appscode.com/images/products/searchlight/icons/android-icon-192x192.png sources: diff --git a/charts/opscenter-features/README.md b/charts/opscenter-features/README.md index 588b087c4..deb34bbc7 100644 --- a/charts/opscenter-features/README.md +++ b/charts/opscenter-features/README.md @@ -144,7 +144,7 @@ The following table lists the configurable parameters of the `opscenter-features | helm.releases.cluster-gateway-manager.version | | "v2024.2.25" | | helm.releases.cluster-auth-manager.version | | "v2024.2.25" | | helm.releases.fluxcd-manager.version | | "v2024.5.17" | -| helm.releases.license-proxyserver-manager.version | | "v2024.2.25" | +| helm.releases.license-proxyserver-manager.version | | "v2024.6.3" | | helm.releases.inbox-server.version | | "v2024.5.3" | | helm.releases.inbox-agent.version | | "v2024.5.3" | | helm.releases.inbox-ui.version | | "v2024.5.3" | diff --git a/charts/opscenter-features/values.yaml b/charts/opscenter-features/values.yaml index b500fcd95..c74589d05 100644 --- a/charts/opscenter-features/values.yaml +++ b/charts/opscenter-features/values.yaml @@ -215,7 +215,7 @@ helm: fluxcd-manager: version: "v2024.5.17" license-proxyserver-manager: - version: "v2024.2.25" + version: "v2024.6.3" inbox-server: version: "v2024.5.3"