Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass clusterName in license-proxyserver addon #389

Merged
merged 2 commits into from
Jun 5, 2024
Merged

Pass clusterName in license-proxyserver addon #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc1a18
Pass `clusterName` in license-proxyserver addon
RokibulHasan7 Jun 5, 2024
071c6d6
update version
tamalsaha Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/license-proxyserver-manager/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 5 additions & 5 deletions charts/license-proxyserver-manager/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion charts/license-proxyserver/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions charts/license-proxyserver/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/). <br> Example: <br> `helm install appscode/license-proxyserver \` <br> `--set-file licenses.key1=/path/to/license/file1 \` <br> `--set-file licenses.key2=/path/to/license/file2` | <code>{}</code> |
| encodedLicenses | Offline licenses for various products. Get a license by following the steps from [here](https://license-issuer.appscode.com/). <br> Example: <br> `helm install appscode/license-proxyserver \` <br> `--set licenses.key1=base64_encoded(/path/to/license/file1) \` <br> `--set licenses.key2=base64_encoded(/path/to/license/file2)` | <code>{}</code> |
| hubKubeconfigSecretName | Name of OCM Hub Kubeconfig secret | <code>""</code> |
| clusterName | We need to pass the cluster name because the OCM-MC host cluster doesn't have Klusterlet object. | <code>""</code> |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
Expand Down
6 changes: 0 additions & 6 deletions charts/license-proxyserver/templates/cluster-role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
3 changes: 3 additions & 0 deletions charts/license-proxyserver/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions charts/license-proxyserver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
2 changes: 1 addition & 1 deletion charts/opscenter-features/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ The following table lists the configurable parameters of the `opscenter-features
| helm.releases.cluster-gateway-manager.version | | <code>"v2024.2.25"</code> |
| helm.releases.cluster-auth-manager.version | | <code>"v2024.2.25"</code> |
| helm.releases.fluxcd-manager.version | | <code>"v2024.5.17"</code> |
| helm.releases.license-proxyserver-manager.version | | <code>"v2024.2.25"</code> |
| helm.releases.license-proxyserver-manager.version | | <code>"v2024.6.3"</code> |
| helm.releases.inbox-server.version | | <code>"v2024.5.3"</code> |
| helm.releases.inbox-agent.version | | <code>"v2024.5.3"</code> |
| helm.releases.inbox-ui.version | | <code>"v2024.5.3"</code> |
Expand Down
2 changes: 1 addition & 1 deletion charts/opscenter-features/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading