Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 5 additions & 9 deletions apis/installer/v1alpha1/license_proxyserver_manager_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,11 @@ type LicenseProxyserverManagerSpec struct {
RegistryFQDN string `json:"registryFQDN"`
Image string `json:"image"`
// +optional
Tag string `json:"tag"`
ImagePullPolicy string `json:"imagePullPolicy"`
// +optional
KubeconfigSecretName string `json:"kubeconfigSecretName"`
// +optional
AddonManagerNamespace string `json:"addonManagerNamespace"`
Placement PlacementSpec `json:"placement"`
Kubectl DockerImage `json:"kubectl"`
Platform PlatformSpec `json:"platform"`
Tag string `json:"tag"`
ImagePullPolicy string `json:"imagePullPolicy"`
Placement PlacementSpec `json:"placement"`
Kubectl DockerImage `json:"kubectl"`
Platform PlatformSpec `json:"platform"`
//+optional
SecurityContext *core.SecurityContext `json:"securityContext"`
// List of sources to populate environment variables in the container.
Expand Down
54 changes: 26 additions & 28 deletions charts/license-proxyserver-manager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,32 @@ The command removes all the Kubernetes components associated with the chart and

The following table lists the configurable parameters of the `license-proxyserver-manager` chart and their default values.

| Parameter | Description | Default |
|------------------------------------------|---------------------------------------------------------------------|----------------------------------------------------------|
| nameOverride | | <code>""</code> |
| fullnameOverride | | <code>""</code> |
| registryFQDN | Docker registry fqdn used to pull license-proxyserver docker images | <code>ghcr.io</code> |
| image | | <code>ghcr.io/appscode/license-proxyserver</code> |
| tag | | <code>""</code> |
| imagePullPolicy | | <code>Always</code> |
| kubeconfigSecretName | | <code>""</code> |
| addonManagerNamespace | | <code>open-cluster-management-license-proxyserver</code> |
| placement.create | | <code>true</code> |
| placement.name | | <code>global</code> |
| kubectl.image | | <code>ghcr.io/appscode/kubectl-nonroot:1.34</code> |
| platform.baseURL | | <code>""</code> |
| platform.token | | <code>""</code> |
| platform.tokenSecretName | | <code>""</code> |
| platform.caBundle | | <code>""</code> |
| platform.insecureSkipTLSVerify | | <code>false</code> |
| securityContext.allowPrivilegeEscalation | | <code>false</code> |
| securityContext.privileged | | <code>false</code> |
| securityContext.runAsNonRoot | | <code>true</code> |
| securityContext.runAsUser | | <code>65534</code> |
| securityContext.readOnlyRootFilesystem | | <code>true</code> |
| securityContext.seccompProfile.type | | <code>RuntimeDefault</code> |
| envFrom | List of sources to populate environment variables in the container | <code>[]</code> |
| env | List of environment variables to set in the container | <code>[]</code> |
| distro.openshift | | <code>false</code> |
| distro.ubi | | <code>""</code> |
| Parameter | Description | Default |
|------------------------------------------|---------------------------------------------------------------------|----------------------------------------------------|
| nameOverride | | <code>""</code> |
| fullnameOverride | | <code>""</code> |
| registryFQDN | Docker registry fqdn used to pull license-proxyserver docker images | <code>ghcr.io</code> |
| image | | <code>ghcr.io/appscode/license-proxyserver</code> |
| tag | | <code>""</code> |
| imagePullPolicy | | <code>Always</code> |
| placement.create | | <code>true</code> |
| placement.name | | <code>global</code> |
| kubectl.image | | <code>ghcr.io/appscode/kubectl-nonroot:1.34</code> |
| platform.baseURL | | <code>""</code> |
| platform.token | | <code>""</code> |
| platform.tokenSecretName | | <code>""</code> |
| platform.caBundle | | <code>""</code> |
| platform.insecureSkipTLSVerify | | <code>false</code> |
| securityContext.allowPrivilegeEscalation | | <code>false</code> |
| securityContext.privileged | | <code>false</code> |
| securityContext.runAsNonRoot | | <code>true</code> |
| securityContext.runAsUser | | <code>65534</code> |
| securityContext.readOnlyRootFilesystem | | <code>true</code> |
| securityContext.seccompProfile.type | | <code>RuntimeDefault</code> |
| envFrom | List of sources to populate environment variables in the container | <code>[]</code> |
| env | List of environment variables to set in the container | <code>[]</code> |
| distro.openshift | | <code>false</code> |
| distro.ubi | | <code>""</code> |


Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@ spec:
type: object
supportedConfigs:
description: |-
Deprecated: Will be removed and replaced with DefaultConfigs in v1beta1.
supportedConfigs is a list of configuration types supported by add-on.
An empty list means the add-on does not require configurations.
The default is an empty list
Expand Down Expand Up @@ -421,7 +422,7 @@ spec:
add-on.
properties:
defaultconfigReferences:
description: defaultconfigReferences is a list of current add-on default
description: DefaultConfigReferences is a list of current add-on default
configuration references.
items:
description: |-
Expand Down Expand Up @@ -522,6 +523,9 @@ spec:
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
configReferences:
description: configReferences is a list of current add-on configuration
references.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,9 @@ spec:
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
decisionGroups:
description: List of decision groups determined by the placement and
DecisionStrategy.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,14 @@ spec:
- type
type: object
type: array
feedbackScrapeType:
default: Poll
description: FeedbackScrapeType represents the way to monitor
resource, it could be Poll or Watch
enum:
- Poll
- Watch
type: string
resourceIdentifier:
description: |-
ResourceIdentifier represents the group, resource, name and namespace of a resoure.
Expand Down Expand Up @@ -722,6 +730,9 @@ spec:
- type
type: object
type: array
x-kubernetes-list-map-keys:
- type
x-kubernetes-list-type: map
placementSummary:
description: PlacementRef Summary
items:
Expand Down Expand Up @@ -750,12 +761,20 @@ spec:
type: integer
degraded:
type: integer
desiredTotal:
description: DesiredTotal is the number of ManifestWorks
that will be created by the ManifestWorkReplicaSet.
type: integer
progressing:
type: integer
total:
description: Total number of ManifestWorks managed by the
ManifestWorkReplicaSet
type: integer
updated:
description: Updated is the number of clusters with updated
revision applied.
type: integer
type: object
type: object
type: array
Expand All @@ -772,11 +791,19 @@ spec:
type: integer
degraded:
type: integer
desiredTotal:
description: DesiredTotal is the number of ManifestWorks that
will be created by the ManifestWorkReplicaSet.
type: integer
progressing:
type: integer
total:
description: Total number of ManifestWorks managed by the ManifestWorkReplicaSet
type: integer
updated:
description: Updated is the number of clusters with updated revision
applied.
type: integer
type: object
type: object
type: object
Expand Down
7 changes: 0 additions & 7 deletions charts/license-proxyserver-manager/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@ app.kubernetes.io/name: {{ include "license-proxyserver-manager.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{/*
Addon manager namespace
*/}}
{{- define "license-proxyserver-manager.namespace" -}}
{{ ternary .Release.Namespace (required "A valid .Values.addonManagerNamespace is required!" .Values.addonManagerNamespace) (empty .Values.kubeconfigSecretName) }}
{{- end }}

{{/*
Returns whether the OpenShift distribution is used
*/}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{{- if not .Values.kubeconfigSecretName }}

kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand Down Expand Up @@ -47,5 +45,3 @@ rules:
- apiGroups: ["addon.open-cluster-management.io"]
resources: ["managedclusteraddons/status"]
verbs: ["update", "patch"]

{{- end }}
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{{- if not .Values.kubeconfigSecretName }}

apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
Expand All @@ -12,5 +10,3 @@ subjects:
- kind: ServiceAccount
name: license-proxyserver-manager
namespace: {{ .Release.Namespace }}

{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: NAMESPACE
value: {{ include "license-proxyserver-manager.namespace" . }}
value: {{ .Release.Namespace }}
{{- if eq "true" ( include "distro.openshift" . ) }}
securityContext:
{{- toYaml (omit .Values.securityContext "runAsUser" "runAsGroup" "fsGroup" "supplementalGroups") | nindent 12 }}
Expand Down
15 changes: 0 additions & 15 deletions charts/license-proxyserver-manager/templates/k8s/addon.yaml

This file was deleted.

52 changes: 0 additions & 52 deletions charts/license-proxyserver-manager/templates/ocm-mc/addon.yaml

This file was deleted.

Loading