Skip to content

Commit

Permalink
fix: Remove restic config from master branch
Browse files Browse the repository at this point in the history 
Signed-off-by: Mateus Oliveira <[email protected]>
  • Loading branch information
@mateusoliveira43
mateusoliveira43 committed Nov 22, 2023
1 parent 78f6b7b commit 1587d2c
Show file tree
Hide file tree
Showing 12 changed files with 137 additions and 680 deletions.
12 changes: 0 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ nullables:
nullable-crds-bundle: DPA_SPEC_CONFIG_PROP = .spec.versions.0.schema.openAPIV3Schema.properties.spec.properties.configuration.properties
nullable-crds-bundle: PROP_RESOURCE_ALLOC = properties.podConfig.properties.resourceAllocations
nullable-crds-bundle: VELERO_RESOURCE_ALLOC = $(DPA_SPEC_CONFIG_PROP).velero.$(PROP_RESOURCE_ALLOC)
nullable-crds-bundle: RESTIC_RESOURCE_ALLOC = $(DPA_SPEC_CONFIG_PROP).restic.$(PROP_RESOURCE_ALLOC)
nullable-crds-bundle: DPA_CRD_YAML ?= bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
nullable-crds-bundle: yq
# Velero CRD
Expand All @@ -345,17 +344,6 @@ nullable-crds-bundle: yq
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
@$(YQ) '$(VELERO_RESOURCE_ALLOC).properties.requests.additionalProperties.nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
# Restic CRD
@$(YQ) '$(RESTIC_RESOURCE_ALLOC).nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
@$(YQ) '$(RESTIC_RESOURCE_ALLOC).properties.limits.nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
@$(YQ) '$(RESTIC_RESOURCE_ALLOC).properties.limits.additionalProperties.nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
@$(YQ) '$(RESTIC_RESOURCE_ALLOC).properties.requests.nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)
@$(YQ) '$(RESTIC_RESOURCE_ALLOC).properties.requests.additionalProperties.nullable = true' $(DPA_CRD_YAML) > $(DPA_CRD_YAML).yqresult
@mv $(DPA_CRD_YAML).yqresult $(DPA_CRD_YAML)

.PHONY: nullable-crds-config
nullable-crds-config: DPA_CRD_YAML ?= config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
Expand Down
25 changes: 2 additions & 23 deletions api/v1alpha1/oadp_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ type PodConfig struct {
Env []corev1.EnvVar `json:"env,omitempty"`
}

type NodeAgentCommonFields struct {
// NodeAgentConfig is the configuration for node server
type NodeAgentConfig struct {
// enable defines a boolean pointer whether we want the daemonset to
// exist or not
// +optional
Expand All @@ -135,36 +136,16 @@ type NodeAgentCommonFields struct {
Timeout string `json:"timeout,omitempty"`
// Pod specific configuration
PodConfig *PodConfig `json:"podConfig,omitempty"`
}

// NodeAgentConfig is the configuration for node server
type NodeAgentConfig struct {
// Embedding NodeAgentCommonFields
// +optional
NodeAgentCommonFields `json:",inline"`

// The type of uploader to transfer the data of pod volumes, the supported values are 'restic' or 'kopia'
// +kubebuilder:validation:Enum=restic;kopia
// +kubebuilder:validation:Required
UploaderType string `json:"uploaderType"`
}

// ResticConfig is the configuration for restic server
type ResticConfig struct {
// Embedding NodeAgentCommonFields
// +optional
NodeAgentCommonFields `json:",inline"`
}

// ApplicationConfig defines the configuration for the Data Protection Application
type ApplicationConfig struct {
Velero *VeleroConfig `json:"velero,omitempty"`
// (deprecation warning) ResticConfig is the configuration for restic DaemonSet.
// restic is for backwards compatibility and is replaced by the nodeAgent
// restic will be removed with the OADP 1.4
// +kubebuilder:deprecatedversion:warning=1.3
// +optional
Restic *ResticConfig `json:"restic,omitempty"`

// NodeAgent is needed to allow selection between kopia or restic
// +optional
Expand Down Expand Up @@ -426,8 +407,6 @@ func (dpa *DataProtectionApplication) AutoCorrect() {
if dpa.Spec.Configuration != nil {
if dpa.Spec.Configuration.NodeAgent != nil && len(dpa.Spec.Configuration.NodeAgent.Timeout) > 0 {
fsBackupTimeout = dpa.Spec.Configuration.NodeAgent.Timeout
} else if dpa.Spec.Configuration.Restic != nil && len(dpa.Spec.Configuration.Restic.Timeout) > 0 {
fsBackupTimeout = dpa.Spec.Configuration.Restic.Timeout
}
}
if pvOperationTimeout, err := time.ParseDuration(fsBackupTimeout); err == nil && dpa.Spec.Configuration.Velero.Args.PodVolumeOperationTimeout == nil {
Expand Down
39 changes: 1 addition & 38 deletions api/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

160 changes: 0 additions & 160 deletions bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,166 +321,6 @@ spec:
required:
- uploaderType
type: object
restic:
description: (deprecation warning) ResticConfig is the configuration for restic DaemonSet. restic is for backwards compatibility and is replaced by the nodeAgent restic will be removed with the OADP 1.4
properties:
enable:
description: enable defines a boolean pointer whether we want the daemonset to exist or not
type: boolean
podConfig:
description: Pod specific configuration
properties:
env:
description: env defines the list of environment variables to be supplied to podSpec
items:
description: EnvVar represents an environment variable present in a Container.
properties:
name:
description: Name of the environment variable. Must be a C_IDENTIFIER.
type: string
value:
description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
type: string
valueFrom:
description: Source for the environment variable's value. Cannot be used if value is not empty.
properties:
configMapKeyRef:
description: Selects a key of a ConfigMap.
properties:
key:
description: The key to select.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the ConfigMap or its key must be defined
type: boolean
required:
- key
type: object
fieldRef:
description: 'Selects a field of the pod: supports metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`, spec.nodeName, spec.serviceAccountName, status.hostIP, status.podIP, status.podIPs.'
properties:
apiVersion:
description: Version of the schema the FieldPath is written in terms of, defaults to "v1".
type: string
fieldPath:
description: Path of the field to select in the specified API version.
type: string
required:
- fieldPath
type: object
resourceFieldRef:
description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.memory, limits.ephemeral-storage, requests.cpu, requests.memory and requests.ephemeral-storage) are currently supported.'
properties:
containerName:
description: 'Container name: required for volumes, optional for env vars'
type: string
divisor:
anyOf:
- type: integer
- type: string
description: Specifies the output format of the exposed resources, defaults to "1"
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
resource:
description: 'Required: resource to select'
type: string
required:
- resource
type: object
secretKeyRef:
description: Selects a key of a secret in the pod's namespace
properties:
key:
description: The key of the secret to select from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names TODO: Add other useful fields. apiVersion, kind, uid?'
type: string
optional:
description: Specify whether the Secret or its key must be defined
type: boolean
required:
- key
type: object
type: object
required:
- name
type: object
type: array
labels:
additionalProperties:
type: string
description: labels to add to pods
type: object
nodeSelector:
additionalProperties:
type: string
description: nodeSelector defines the nodeSelector to be supplied to podSpec
type: object
resourceAllocations:
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
nullable: true
properties:
limits:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
nullable: true
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
nullable: true
requests:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
nullable: true
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
nullable: true
type: object
tolerations:
description: tolerations defines the list of tolerations to be applied to daemonset
items:
description: The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.
properties:
effect:
description: Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
type: string
key:
description: Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.
type: string
operator:
description: Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.
type: string
tolerationSeconds:
description: TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.
format: int64
type: integer
value:
description: Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.
type: string
type: object
type: array
type: object
supplementalGroups:
description: supplementalGroups defines the linux groups to be applied to the NodeAgent Pod
items:
format: int64
type: integer
type: array
timeout:
description: timeout defines the NodeAgent timeout, default value is 1h
type: string
type: object
velero:
properties:
args:
Expand Down
Loading

0 comments on commit 1587d2c

Please sign in to comment.