diff --git a/packages/system/capi-operator/Makefile b/packages/system/capi-operator/Makefile index baa4a5fc..20c083aa 100644 --- a/packages/system/capi-operator/Makefile +++ b/packages/system/capi-operator/Makefile @@ -1,11 +1,11 @@ export NAME=capi-operator export NAMESPACE=cozy-cluster-api +export REPO_NAME=capi-operator +export REPO_URL=https://kubernetes-sigs.github.io/cluster-api-operator +export CHART_NAME=cluster-api-operator +export CHART_VERSION=^0.18 include ../../../scripts/package.mk -update: - rm -rf charts - helm repo add capi-operator https://kubernetes-sigs.github.io/cluster-api-operator - helm repo update capi-operator - helm pull capi-operator/cluster-api-operator --untar --untardir charts - rm -rf charts/cluster-api-operator/charts +update: clean capi-operator-update + rm -rf charts/cluster-api-operator/charts/ diff --git a/packages/system/capi-operator/charts/cluster-api-operator/Chart.yaml b/packages/system/capi-operator/charts/cluster-api-operator/Chart.yaml index 323a3594..5108c7dc 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/Chart.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: 0.19.0 +appVersion: 0.18.1 description: Cluster API Operator name: cluster-api-operator type: application -version: 0.19.0 +version: 0.18.1 diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/addon.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/addon.yaml index 6a341496..a2eb8fb9 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/addon.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/addon.yaml @@ -1,8 +1,26 @@ # Addon provider -{{- range $name, $addon := $.Values.addon }} - {{- $addonNamespace := default ( printf "%s-%s" $name "addon-system" ) (get $addon "namespace") }} - {{- $addonName := $name }} - {{- $addonVersion := get $addon "version" }} +{{- if .Values.addon }} +{{- $addons := split ";" .Values.addon }} +{{- $addonNamespace := "" }} +{{- $addonName := "" }} +{{- $addonVersion := "" }} +{{- range $addon := $addons }} +{{- $addonArgs := split ":" $addon }} +{{- $addonArgsLen := len $addonArgs }} +{{- if eq $addonArgsLen 3 }} + {{- $addonNamespace = $addonArgs._0 }} + {{- $addonName = $addonArgs._1 }} + {{- $addonVersion = $addonArgs._2 }} +{{- else if eq $addonArgsLen 2 }} + {{- $addonNamespace = print $addonArgs._0 "-addon-system" }} + {{- $addonName = $addonArgs._0 }} + {{- $addonVersion = $addonArgs._1 }} +{{- else if eq $addonArgsLen 1 }} + {{- $addonNamespace = print $addonArgs._0 "-addon-system" }} + {{- $addonName = $addonArgs._0 }} +{{- else }} + {{- fail "addon provider argument should have the following format helm:v1.0.0 or mynamespace:helm:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -38,24 +56,5 @@ spec: {{- if $.Values.secretNamespace }} secretNamespace: {{ $.Values.secretNamespace }} {{- end }} -{{- if $addon.manifestPatches }} - manifestPatches: {{ toYaml $addon.manifestPatches | nindent 4 }} {{- end }} -{{- if $addon.additionalManifests }} - additionalManifests: - name: {{ $addon.additionalManifests.name }} - {{- if $addon.additionalManifests.namespace }} - namespace: {{ $addon.additionalManifests.namespace }} - {{- end }} {{/* if $addon.additionalManifests.namespace */}} {{- end }} -{{- if $addon.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $addon.additionalManifests.name }} - namespace: {{ default $addonNamespace $addon.additionalManifests.namespace }} -data: - manifests: {{- toYaml $addon.additionalManifests.manifests | nindent 4 }} -{{- end }} -{{- end }} {{/* range $name, $addon := .Values.addon */}} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/bootstrap.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/bootstrap.yaml index 78dad47e..ed5d7924 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/bootstrap.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/bootstrap.yaml @@ -1,8 +1,26 @@ # Bootstrap provider -{{- range $name, $bootstrap := $.Values.bootstrap }} - {{- $bootstrapNamespace := default ( printf "%s-%s" $name "bootstrap-system" ) (get $bootstrap "namespace") }} - {{- $bootstrapName := $name }} - {{- $bootstrapVersion := get $bootstrap "version" }} +{{- if .Values.bootstrap }} +{{- $bootstraps := split ";" .Values.bootstrap }} +{{- $bootstrapNamespace := "" }} +{{- $bootstrapName := "" }} +{{- $bootstrapVersion := "" }} +{{- range $bootstrap := $bootstraps }} +{{- $bootstrapArgs := split ":" $bootstrap }} +{{- $bootstrapArgsLen := len $bootstrapArgs }} +{{- if eq $bootstrapArgsLen 3 }} + {{- $bootstrapNamespace = $bootstrapArgs._0 }} + {{- $bootstrapName = $bootstrapArgs._1 }} + {{- $bootstrapVersion = $bootstrapArgs._2 }} +{{- else if eq $bootstrapArgsLen 2 }} + {{- $bootstrapNamespace = print $bootstrapArgs._0 "-bootstrap-system" }} + {{- $bootstrapName = $bootstrapArgs._0 }} + {{- $bootstrapVersion = $bootstrapArgs._1 }} +{{- else if eq $bootstrapArgsLen 1 }} + {{- $bootstrapNamespace = print $bootstrapArgs._0 "-bootstrap-system" }} + {{- $bootstrapName = $bootstrapArgs._0 }} +{{- else }} + {{- fail "bootstrap provider argument should have the following format kubeadm:v1.0.0 or mynamespace:kubeadm:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -39,24 +57,5 @@ spec: namespace: {{ $.Values.configSecret.namespace }} {{- end }} {{- end }} -{{- if $bootstrap.manifestPatches }} - manifestPatches: {{ toYaml $bootstrap.manifestPatches | nindent 4 }} {{- end }} -{{- if $bootstrap.additionalManifests }} - additionalManifests: - name: {{ $bootstrap.additionalManifests.name }} - {{- if $bootstrap.additionalManifests.namespace }} - namespace: {{ $bootstrap.additionalManifests.namespace }} - {{- end }} {{/* if $bootstrap.additionalManifests.namespace */}} {{- end }} -{{- if $bootstrap.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $bootstrap.additionalManifests.name }} - namespace: {{ default $bootstrapNamespace $bootstrap.additionalManifests.namespace }} -data: - manifests: {{- toYaml $bootstrap.additionalManifests.manifests | nindent 4 }} -{{- end }} -{{- end }} {{/* range $name, $bootstrap := .Values.bootstrap */}} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/control-plane.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/control-plane.yaml index 8a020afd..d72249d1 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/control-plane.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/control-plane.yaml @@ -1,8 +1,26 @@ # Control plane provider -{{- range $name, $controlPlane := $.Values.controlPlane }} - {{- $controlPlaneNamespace := default ( printf "%s-%s" $name "control-plane-system" ) (get $controlPlane "namespace") }} - {{- $controlPlaneName := $name }} - {{- $controlPlaneVersion := get $controlPlane "version" }} +{{- if .Values.controlPlane }} +{{- $controlPlanes := split ";" .Values.controlPlane }} +{{- $controlPlaneNamespace := "" }} +{{- $controlPlaneName := "" }} +{{- $controlPlaneVersion := "" }} +{{- range $controlPlane := $controlPlanes }} +{{- $controlPlaneArgs := split ":" $controlPlane }} +{{- $controlPlaneArgsLen := len $controlPlaneArgs }} +{{- if eq $controlPlaneArgsLen 3 }} + {{- $controlPlaneNamespace = $controlPlaneArgs._0 }} + {{- $controlPlaneName = $controlPlaneArgs._1 }} + {{- $controlPlaneVersion = $controlPlaneArgs._2 }} +{{- else if eq $controlPlaneArgsLen 2 }} + {{- $controlPlaneNamespace = print $controlPlaneArgs._0 "-control-plane-system" }} + {{- $controlPlaneName = $controlPlaneArgs._0 }} + {{- $controlPlaneVersion = $controlPlaneArgs._1 }} +{{- else if eq $controlPlaneArgsLen 1 }} + {{- $controlPlaneNamespace = print $controlPlaneArgs._0 "-control-plane-system" }} + {{- $controlPlaneName = $controlPlaneArgs._0 }} +{{- else }} + {{- fail "controlplane provider argument should have the following format kubeadm:v1.0.0 or mynamespace:kubeadm:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -52,24 +70,5 @@ spec: namespace: {{ $.Values.configSecret.namespace }} {{- end }} {{- end }} -{{- if $controlPlane.manifestPatches }} - manifestPatches: {{ toYaml $controlPlane.manifestPatches | nindent 4 }} {{- end }} -{{- if $controlPlane.additionalManifests }} - additionalManifests: - name: {{ $controlPlane.additionalManifests.name }} - {{- if $controlPlane.additionalManifests.namespace }} - namespace: {{ $controlPlane.additionalManifests.namespace }} - {{- end }} {{/* if $controlPlane.additionalManifests.namespace */}} {{- end }} -{{- if $controlPlane.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $controlPlane.additionalManifests.name }} - namespace: {{ default $controlPlaneNamespace $controlPlane.additionalManifests.namespace }} -data: - manifests: {{- toYaml $controlPlane.additionalManifests.manifests | nindent 4 }} -{{- end }} -{{- end }} {{/* range $name, $controlPlane := .Values.controlPlane */}} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/core.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/core.yaml index 648e1b60..828d2269 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/core.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/core.yaml @@ -1,8 +1,25 @@ # Core provider -{{- range $name, $core := $.Values.core }} - {{- $coreNamespace := default "capi-system" (get $core "namespace") }} - {{- $coreName := $name }} - {{- $coreVersion := get $core "version" }} +{{- if .Values.core }} +{{- $coreArgs := split ":" .Values.core }} +{{- $coreArgsLen := len $coreArgs }} +{{- $coreVersion := "" }} +{{- $coreNamespace := "" }} +{{- $coreName := "" }} +{{- $coreVersion := "" }} +{{- if eq $coreArgsLen 3 }} + {{- $coreNamespace = $coreArgs._0 }} + {{- $coreName = $coreArgs._1 }} + {{- $coreVersion = $coreArgs._2 }} +{{- else if eq $coreArgsLen 2 }} + {{- $coreNamespace = "capi-system" }} + {{- $coreName = $coreArgs._0 }} + {{- $coreVersion = $coreArgs._1 }} +{{- else if eq $coreArgsLen 1 }} + {{- $coreNamespace = "capi-system" }} + {{- $coreName = $coreArgs._0 }} +{{- else }} + {{- fail "core provider argument should have the following format cluster-api:v1.0.0 or mynamespace:cluster-api:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -48,24 +65,4 @@ spec: namespace: {{ $.Values.configSecret.namespace }} {{- end }} {{- end }} -{{- if $core.manifestPatches }} - manifestPatches: {{ toYaml $core.manifestPatches | nindent 4 }} {{- end }} -{{- if $core.additionalManifests }} - additionalManifests: - name: {{ $core.additionalManifests.name }} - {{- if $core.additionalManifests.namespace }} - namespace: {{ $core.additionalManifests.namespace }} - {{- end }} -{{- end }} -{{- if $core.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $core.additionalManifests.name }} - namespace: {{ default $coreNamespace $core.additionalManifests.namespace }} -data: - manifests: {{- toYaml $core.additionalManifests.manifests | nindent 4 }} -{{- end }} -{{- end }} {{/* range $name, $core := .Values.core */}} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/infra.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/infra.yaml index 835607d4..5841336c 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/infra.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/infra.yaml @@ -1,8 +1,26 @@ # Infrastructure providers -{{- range $name, $infra := $.Values.infrastructure }} - {{- $infrastructureNamespace := default ( printf "%s-%s" $name "infrastructure-system" ) (get $infra "namespace") }} - {{- $infrastructureName := $name }} - {{- $infrastructureVersion := get $infra "version" }} +{{- if .Values.infrastructure }} +{{- $infrastructures := split ";" .Values.infrastructure }} +{{- $infrastructureNamespace := "" }} +{{- $infrastructureName := "" }} +{{- $infrastructureVersion := "" }} +{{- range $infrastructure := $infrastructures }} +{{- $infrastructureArgs := split ":" $infrastructure }} +{{- $infrastructureArgsLen := len $infrastructureArgs }} +{{- if eq $infrastructureArgsLen 3 }} + {{- $infrastructureNamespace = $infrastructureArgs._0 }} + {{- $infrastructureName = $infrastructureArgs._1 }} + {{- $infrastructureVersion = $infrastructureArgs._2 }} +{{- else if eq $infrastructureArgsLen 2 }} + {{- $infrastructureNamespace = print $infrastructureArgs._0 "-infrastructure-system" }} + {{- $infrastructureName = $infrastructureArgs._0 }} + {{- $infrastructureVersion = $infrastructureArgs._1 }} +{{- else if eq $infrastructureArgsLen 1 }} + {{- $infrastructureNamespace = print $infrastructureArgs._0 "-infrastructure-system" }} + {{- $infrastructureName = $infrastructureArgs._0 }} +{{- else }} + {{- fail "infrastructure provider argument should have the following format aws:v1.0.0 or mynamespace:aws:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -65,24 +83,5 @@ spec: {{- if $.Values.additionalDeployments }} additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }} {{- end }} -{{- if $infra.manifestPatches }} - manifestPatches: {{- toYaml $infra.manifestPatches | nindent 4 }} -{{- end }} {{/* if $infra.manifestPatches */}} -{{- if $infra.additionalManifests }} - additionalManifests: - name: {{ $infra.additionalManifests.name }} - {{- if $infra.additionalManifests.namespace }} - namespace: {{ $infra.additionalManifests.namespace }} - {{- end }} {{/* if $infra.additionalManifests.namespace */}} -{{- end }} {{/* if $infra.additionalManifests */}} -{{- if $infra.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $infra.additionalManifests.name }} - namespace: {{ default $infrastructureNamespace $infra.additionalManifests.namespace }} -data: - manifests: {{- toYaml $infra.additionalManifests.manifests | nindent 4 }} {{- end }} -{{- end }} {{/* range $name, $infra := .Values.infrastructure */}} +{{- end }} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/ipam.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/ipam.yaml index 4a33c42f..06960afb 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/ipam.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/ipam.yaml @@ -1,8 +1,26 @@ # IPAM providers -{{- range $name, $ipam := $.Values.ipam }} - {{- $ipamNamespace := default ( printf "%s-%s" $name "ipam-system" ) (get $ipam "namespace") }} - {{- $ipamName := $name }} - {{- $ipamVersion := get $ipam "version" }} +{{- if .Values.ipam }} +{{- $ipams := split ";" .Values.ipam }} +{{- $ipamNamespace := "" }} +{{- $ipamName := "" }} +{{- $ipamVersion := "" }} +{{- range $ipam := $ipams }} +{{- $ipamArgs := split ":" $ipam }} +{{- $ipamArgsLen := len $ipamArgs }} +{{- if eq $ipamArgsLen 3 }} + {{- $ipamNamespace = $ipamArgs._0 }} + {{- $ipamName = $ipamArgs._1 }} + {{- $ipamVersion = $ipamArgs._2 }} +{{- else if eq $ipamArgsLen 2 }} + {{- $ipamNamespace = print $ipamArgs._0 "-ipam-system" }} + {{- $ipamName = $ipamArgs._0 }} + {{- $ipamVersion = $ipamArgs._1 }} +{{- else if eq $ipamArgsLen 1 }} + {{- $ipamNamespace = print $ipamArgs._0 "-ipam-system" }} + {{- $ipamName = $ipamArgs._0 }} +{{- else }} + {{- fail "ipam provider argument should have the following format in-cluster:v1.0.0 or mynamespace:in-cluster:v1.0.0" }} +{{- end }} --- apiVersion: v1 kind: Namespace @@ -52,27 +70,8 @@ spec: namespace: {{ $.Values.configSecret.namespace }} {{- end }} {{- end }} -{{- if $ipam.manifestPatches }} - manifestPatches: {{ toYaml $ipam.manifestPatches | nindent 4 }} -{{- end }} {{- if $.Values.additionalDeployments }} additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }} {{- end }} -{{- if $ipam.additionalManifests }} - additionalManifests: - name: {{ $ipam.additionalManifests.name }} - {{- if $ipam.additionalManifests.namespace }} - namespace: {{ $ipam.additionalManifests.namespace }} - {{- end }} {{/* if $ipam.additionalManifests.namespace */}} {{- end }} -{{- if $ipam.additionalManifests }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ $ipam.additionalManifests.name }} - namespace: {{ default $ipamNamespace $ipam.additionalManifests.namespace }} -data: - manifests: {{- toYaml $ipam.additionalManifests.manifests | nindent 4 }} {{- end }} -{{- end }} {{/* range $name, $ipam := .Values.ipam */}} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/templates/operator-components.yaml b/packages/system/capi-operator/charts/cluster-api-operator/templates/operator-components.yaml index 0ee82bfc..27b8bf80 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/templates/operator-components.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/templates/operator-components.yaml @@ -1305,13 +1305,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -2843,13 +2836,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -3062,32 +3048,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -3097,8 +3078,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -4732,32 +4711,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -4767,8 +4741,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -6071,13 +6043,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -7609,13 +7574,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -7828,32 +7786,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -7863,8 +7816,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -9499,32 +9450,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -9534,8 +9480,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -10839,13 +10783,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -12377,13 +12314,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -12597,32 +12527,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -12632,8 +12557,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -14267,32 +14190,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -14302,8 +14220,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -15606,13 +15522,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -17144,13 +17053,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -17363,32 +17265,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -17398,8 +17295,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -19034,32 +18929,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -19069,8 +18959,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -20374,13 +20262,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -21912,13 +21793,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -22132,32 +22006,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -22167,8 +22036,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -23504,13 +23371,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -25042,13 +24902,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -25261,32 +25114,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -25296,8 +25144,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime @@ -26635,13 +26481,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the additional provider deployment. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -28173,13 +28012,6 @@ spec: description: Manager defines the properties that can be enabled on the controller manager for the provider. properties: - additionalArgs: - additionalProperties: - type: string - description: |- - AdditionalArgs is a map of additional options that will be passed - in as container args to the provider's controller manager. - type: object cacheNamespace: description: |- CacheNamespace if specified restricts the manager's cache to watch objects in @@ -28393,32 +28225,27 @@ spec: properties: lastTransitionTime: description: |- - lastTransitionTime is the last time the condition transitioned from one status to another. + Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. format: date-time type: string message: description: |- - message is a human readable message indicating details about the transition. + A human readable message indicating details about the transition. This field may be empty. - maxLength: 10240 - minLength: 1 type: string reason: description: |- - reason is the reason for the condition's last transition in CamelCase. + The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may be empty. - maxLength: 256 - minLength: 1 type: string severity: description: |- severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False. - maxLength: 32 type: string status: description: status of the condition, one of True, False, Unknown. @@ -28428,8 +28255,6 @@ spec: type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. - maxLength: 256 - minLength: 1 type: string required: - lastTransitionTime diff --git a/packages/system/capi-operator/charts/cluster-api-operator/values.schema.json b/packages/system/capi-operator/charts/cluster-api-operator/values.schema.json deleted file mode 100644 index d22038fc..00000000 --- a/packages/system/capi-operator/charts/cluster-api-operator/values.schema.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-07/schema#", - "type": "object", - "properties": { - "core": { - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - }, - "bootstrap": { - "type": "object", - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - }, - "controlPlane": { - "type": "object", - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - }, - "infrastructure": { - "type": "object", - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - }, - "addon": { - "type": "object", - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - }, - "ipam": { - "type": "object", - "oneOf": [ - { "type": "object" }, - { "type": "null" } - ] - } - } -} diff --git a/packages/system/capi-operator/charts/cluster-api-operator/values.yaml b/packages/system/capi-operator/charts/cluster-api-operator/values.yaml index 545bae39..12507a3c 100644 --- a/packages/system/capi-operator/charts/cluster-api-operator/values.yaml +++ b/packages/system/capi-operator/charts/cluster-api-operator/values.yaml @@ -1,30 +1,12 @@ --- # --- # Cluster API provider options -core: {} -# cluster-api: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional -bootstrap: {} -# kubeadm: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional -controlPlane: {} -# kubeadm: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional -infrastructure: {} -# docker: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional -addon: {} -# helm: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional -ipam: {} -# in-cluster: {} # Name, required -# namespace: "" # Optional -# version: "" # Optional +core: "" +bootstrap: "" +controlPlane: "" +infrastructure: "" +ipam: "" +addon: "" manager.featureGates: {} fetchConfig: {} # --- @@ -39,7 +21,7 @@ leaderElection: image: manager: repository: registry.k8s.io/capi-operator/cluster-api-operator - tag: v0.19.0 + tag: v0.18.1 pullPolicy: IfNotPresent env: manager: [] diff --git a/scripts/package.mk b/scripts/package.mk index ca537213..62702321 100644 --- a/scripts/package.mk +++ b/scripts/package.mk @@ -29,3 +29,11 @@ delete: check suspend ## Delete Helm release from a Kubernetes cluster check: @if [ -z "$(NAME)" ]; then echo "env NAME is not set!" >&2; exit 1; fi @if [ -z "$(NAMESPACE)" ]; then echo "env NAMESPACE is not set!" >&2; exit 1; fi + +clean: + rm -rf charts/ + +%-update: + helm repo add $(REPO_NAME) $(REPO_URL) + helm repo update $(REPO_NAME) + helm pull $(REPO_NAME)/$(CHART_NAME) --untar --untardir charts --version "$(CHART_VERSION)"