Skip to content

Commit

Permalink
Fix infrastructure stack CRD a bit
Browse files Browse the repository at this point in the history
need to use our defined job spec not the main k8s one.
  • Loading branch information
michaeljguarino committed May 25, 2024
1 parent 76f9dc0 commit f5c9c47
Show file tree
Hide file tree
Showing 13 changed files with 260 additions and 23,909 deletions.
7,930 changes: 42 additions & 7,888 deletions charts/controller/crds/deployments.plural.sh_infrastructurestacks.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ spec:
gate types.
properties:
job:
description: GateJob is a spec for a job gate.
description: JobSpec is a spec for a job gate.
properties:
annotations:
additionalProperties:
Expand Down
3 changes: 1 addition & 2 deletions controller/api/v1alpha1/infrastructurestack_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package v1alpha1

import (
console "github.com/pluralsh/console-client-go"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -46,7 +45,7 @@ type InfrastructureStackSpec struct {

// JobSpec optional k8s job configuration for the job that will apply this stack
// +kubebuilder:validation:Optional
JobSpec *batchv1.JobSpec `json:"jobSpec,omitempty"`
JobSpec *JobSpec `json:"jobSpec,omitempty"`

// Configuration version/image config for the tool you're using
Configuration StackConfiguration `json:"configuration"`
Expand Down
6 changes: 3 additions & 3 deletions controller/api/v1alpha1/pipeline_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ type PipelineGate struct {
// GateSpec is a more refined spec for parameters needed for complex gates.
type GateSpec struct {
// +kubebuilder:validation:Optional
Job *GateJob `json:"job,omitempty"`
Job *JobSpec `json:"job,omitempty"`
}

// GateJob is a spec for a job gate.
type GateJob struct {
// JobSpec is a spec for a job gate.
type JobSpec struct {
// +kubebuilder:validation:Required
// +kubebuilder:validation:Type:=string
Namespace string `json:"namespace"`
Expand Down
105 changes: 52 additions & 53 deletions controller/api/v1alpha1/zz_generated.deepcopy.go

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

Loading

0 comments on commit f5c9c47

Please sign in to comment.