diff --git a/deploy/crds/spinnaker.io_spinnakerservices.yaml b/deploy/crds/spinnaker.io_spinnakerservices.yaml index 3421287c..6347ddc8 100644 --- a/deploy/crds/spinnaker.io_spinnakerservices.yaml +++ b/deploy/crds/spinnaker.io_spinnakerservices.yaml @@ -13,413 +13,381 @@ spec: listKind: SpinnakerServiceList plural: spinnakerservices shortNames: - - spinsvc + - spinsvc singular: spinnakerservice scope: Namespaced versions: - - additionalPrinterColumns: - - description: Version - jsonPath: .status.version - name: version - type: string - - description: Last Configured - jsonPath: .status.lastDeployed.config.lastUpdatedAt - name: lastConfigured - type: date - - description: Status - jsonPath: .status.status - name: status - type: string - - description: Services - jsonPath: .status.serviceCount - name: services - type: number - - description: URL - jsonPath: .status.uiUrl - name: url - type: string - - description: API URL - jsonPath: .status.apiUrl - name: apiUrl - priority: 1 - type: string - name: v1alpha2 - schema: - openAPIV3Schema: - description: SpinnakerService is the Schema for the spinnakerservices API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: SpinnakerServiceSpec defines the desired state of SpinnakerService - properties: - accounts: - properties: - dynamic: - description: Enable accounts to be added dynamically - type: boolean - enabled: - description: Enable the injection of SpinnakerAccount - type: boolean - type: object - expose: - description: ExposeConfig represents the configuration for exposing - Spinnaker - properties: - service: - description: ExposeConfigService represents the configuration - for exposing Spinnaker using k8s services - properties: - annotations: - additionalProperties: - type: string - type: object - overrides: - additionalProperties: - description: ExposeConfigServiceOverrides represents expose - configurations of type service, overriden by specific - services - properties: - annotations: - additionalProperties: - type: string - type: object - publicPort: - format: int32 - type: integer - type: - type: string - type: object - type: object - publicPort: - format: int32 - type: integer - type: - type: string - type: object - type: - type: string - type: object - kustomize: - additionalProperties: + - additionalPrinterColumns: + - description: Version + jsonPath: .status.version + name: version + type: string + - description: Last Configured + jsonPath: .status.lastDeployed.config.lastUpdatedAt + name: lastConfigured + type: date + - description: Status + jsonPath: .status.status + name: status + type: string + - description: Services + jsonPath: .status.serviceCount + name: services + type: number + - description: URL + jsonPath: .status.uiUrl + name: url + type: string + - description: API URL + jsonPath: .status.apiUrl + name: apiUrl + priority: 1 + type: string + name: v1alpha2 + schema: + openAPIV3Schema: + description: SpinnakerService is the Schema for the spinnakerservices API + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: SpinnakerServiceSpec defines the desired state of SpinnakerService + properties: + accounts: + properties: + dynamic: + description: Enable accounts to be added dynamically + type: boolean + enabled: + description: Enable the injection of SpinnakerAccount + type: boolean + type: object + expose: + description: ExposeConfig represents the configuration for exposing Spinnaker properties: - deployment: - properties: - patches: - description: Patches is a list of patches, where each one - can be either a Strategic Merge Patch or a JSON patch. - Each patch can be applied to multiple target objects. - items: - type: string - type: array - x-kubernetes-list-type: atomic - patchesJson6902: - description: JSONPatches is a list of JSONPatch for applying - JSON patch. Format documented at https://tools.ietf.org/html/rfc6902 - and http://jsonpatch.com - type: string - patchesStrategicMerge: - description: PatchesStrategicMerge specifies the relative - path to a file containing a strategic merge patch. Format - documented at https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md - URLs and globs are not supported. - items: - type: string - type: array - x-kubernetes-list-type: atomic - type: object service: + description: ExposeConfigService represents the configuration for exposing Spinnaker using k8s services properties: - patches: - description: Patches is a list of patches, where each one - can be either a Strategic Merge Patch or a JSON patch. - Each patch can be applied to multiple target objects. - items: + annotations: + additionalProperties: type: string - type: array - x-kubernetes-list-type: atomic - patchesJson6902: - description: JSONPatches is a list of JSONPatch for applying - JSON patch. Format documented at https://tools.ietf.org/html/rfc6902 - and http://jsonpatch.com + type: object + overrides: + additionalProperties: + description: ExposeConfigServiceOverrides represents expose configurations of type service, overriden by specific services + properties: + annotations: + additionalProperties: + type: string + type: object + publicPort: + format: int32 + type: integer + type: + type: string + type: object + type: object + publicPort: + format: int32 + type: integer + type: type: string - patchesStrategicMerge: - description: PatchesStrategicMerge specifies the relative - path to a file containing a strategic merge patch. Format - documented at https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md - URLs and globs are not supported. - items: - type: string - type: array - x-kubernetes-list-type: atomic type: object - type: object - description: Patch Kustomization of service and deployment per service - type: object - spinnakerConfig: - properties: - config: - description: Main deployment configuration to be passed to Halyard - type: object - x-kubernetes-preserve-unknown-fields: true - files: - additionalProperties: + type: type: string - description: Supporting files for the Spinnaker config + type: object + kustomize: + additionalProperties: + properties: + deployment: + properties: + patches: + description: Patches is a list of patches, where each one can be either a Strategic Merge Patch or a JSON patch. Each patch can be applied to multiple target objects. + items: + type: string + type: array + x-kubernetes-list-type: atomic + patchesJson6902: + description: JSONPatches is a list of JSONPatch for applying JSON patch. Format documented at https://tools.ietf.org/html/rfc6902 and http://jsonpatch.com + type: string + patchesStrategicMerge: + description: PatchesStrategicMerge specifies the relative path to a file containing a strategic merge patch. Format documented at https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md URLs and globs are not supported. + items: + type: string + type: array + x-kubernetes-list-type: atomic + type: object + service: + properties: + patches: + description: Patches is a list of patches, where each one can be either a Strategic Merge Patch or a JSON patch. Each patch can be applied to multiple target objects. + items: + type: string + type: array + x-kubernetes-list-type: atomic + patchesJson6902: + description: JSONPatches is a list of JSONPatch for applying JSON patch. Format documented at https://tools.ietf.org/html/rfc6902 and http://jsonpatch.com + type: string + patchesStrategicMerge: + description: PatchesStrategicMerge specifies the relative path to a file containing a strategic merge patch. Format documented at https://github.com/kubernetes/community/blob/master/contributors/devel/strategic-merge-patch.md URLs and globs are not supported. + items: + type: string + type: array + x-kubernetes-list-type: atomic + type: object type: object - profiles: - additionalProperties: + description: Patch Kustomization of service and deployment per service + type: object + spinnakerConfig: + properties: + config: + description: Main deployment configuration to be passed to Halyard type: object x-kubernetes-preserve-unknown-fields: true - description: Service profiles will be parsed as YAML - type: object - service-settings: - additionalProperties: + files: + additionalProperties: + type: string + description: Supporting files for the Spinnaker config + type: object + profiles: + additionalProperties: + type: object + x-kubernetes-preserve-unknown-fields: true + description: Service profiles will be parsed as YAML + type: object + service-settings: + additionalProperties: + type: object + x-kubernetes-preserve-unknown-fields: true + description: Parsed service settings - comments are stripped type: object x-kubernetes-preserve-unknown-fields: true - description: Parsed service settings - comments are stripped - type: object - x-kubernetes-preserve-unknown-fields: true - type: object - validation: - description: validation settings for the deployment - properties: - canary: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + type: object + validation: + description: validation settings for the deployment + properties: + canary: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - ci: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + ci: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - failFast: - description: Fail validation on the first failed validation, defaults - to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - metricStores: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + failFast: + description: Fail validation on the first failed validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + metricStores: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - notifications: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + notifications: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - persistentStorage: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + persistentStorage: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - providers: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + providers: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - pubsub: - additionalProperties: - properties: - enabled: - description: Enable or disable validation, defaults to false - type: boolean - failOnError: - description: Report errors but do not fail validation, defaults - to true - type: boolean - frequencySeconds: - anyOf: - - type: integer - - type: string - description: Number of seconds between each validation - x-kubernetes-int-or-string: true - required: - - enabled + pubsub: + additionalProperties: + properties: + enabled: + description: Enable or disable validation, defaults to false + type: boolean + failOnError: + description: Report errors but do not fail validation, defaults to true + type: boolean + frequencySeconds: + anyOf: + - type: integer + - type: string + description: Number of seconds between each validation + x-kubernetes-int-or-string: true + required: + - enabled + type: object type: object - type: object - type: object - required: - - spinnakerConfig - type: object - status: - description: SpinnakerServiceStatus defines the observed state of SpinnakerService - properties: - accountCount: - description: Number of accounts - type: integer - apiUrl: - description: Exposed Gate URL - type: string - lastDeployed: - additionalProperties: - properties: - hash: - type: string - lastUpdatedAt: - format: date-time - type: string - required: - - hash type: object - description: Last deployed hashes - type: object - serviceCount: - description: Number of services in Spinnaker - type: integer - services: - description: Services deployment information - items: - description: SpinnakerDeploymentStatus represents the deployment - status of a single service - properties: - image: - description: Image deployed - type: string - name: - description: Name of the service deployed - type: string - readyReplicas: - description: Total number of ready pods targeted by this deployment. - format: int32 - type: integer - replicas: - description: Total number of non-terminated pods targeted by - this deployment (their labels match the selector). - format: int32 - type: integer - required: - - name + required: + - spinnakerConfig + type: object + status: + description: SpinnakerServiceStatus defines the observed state of SpinnakerService + properties: + accountCount: + description: Number of accounts + type: integer + apiUrl: + description: Exposed Gate URL + type: string + lastDeployed: + additionalProperties: + properties: + hash: + type: string + lastUpdatedAt: + format: date-time + type: string + required: + - hash + type: object + description: Last deployed hashes type: object - type: array - x-kubernetes-list-map-keys: - - name - x-kubernetes-list-type: map - status: - description: Overall Spinnaker status - type: string - uiUrl: - description: Exposed Deck URL - type: string - version: - description: Current deployed version of Spinnaker - type: string - type: object - type: object - served: true - storage: true - subresources: - status: {} + serviceCount: + description: Number of services in Spinnaker + type: integer + services: + description: Services deployment information + items: + description: SpinnakerDeploymentStatus represents the deployment status of a single service + properties: + image: + description: Image deployed + type: string + name: + description: Name of the service deployed + type: string + readyReplicas: + description: Total number of ready pods targeted by this deployment. + format: int32 + type: integer + replicas: + description: Total number of non-terminated pods targeted by this deployment (their labels match the selector). + format: int32 + type: integer + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + status: + description: Overall Spinnaker status + type: string + uiUrl: + description: Exposed Deck URL + type: string + version: + description: Current deployed version of Spinnaker + type: string + type: object + type: object + served: true + storage: true + subresources: + status: {} + preserveUnknownFields: false status: acceptedNames: kind: "" diff --git a/deploy/operator/basic/deployment.yaml b/deploy/operator/basic/deployment.yaml index 1cc4821d..8e29b75f 100644 --- a/deploy/operator/basic/deployment.yaml +++ b/deploy/operator/basic/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: spinnaker-operator containers: - name: spinnaker-operator - image: armory/spinnaker-operator:dev # Moving label, replaced at build time with a fixed version in "build" dir + image: armory/spinnaker-operator:1.4.0-rc.3 # Moving label, replaced at build time with a fixed version in "build" dir command: - spinnaker-operator args: @@ -33,7 +33,7 @@ spec: - name: OPERATOR_NAME value: "spinnaker-operator" - name: halyard - image: armory/halyard:operator-dev # Moving label, replaced at build time with a fixed version in "build" dir + image: armory/halyard:1.4.0-rc.3 # Moving label, replaced at build time with a fixed version in "build" dir imagePullPolicy: Always ports: - containerPort: 8064 diff --git a/deploy/operator/cluster/deployment.yaml b/deploy/operator/cluster/deployment.yaml index c1380eaa..4a6efb3c 100644 --- a/deploy/operator/cluster/deployment.yaml +++ b/deploy/operator/cluster/deployment.yaml @@ -15,7 +15,7 @@ spec: serviceAccountName: spinnaker-operator containers: - name: spinnaker-operator - image: armory/spinnaker-operator:dev # Moving label, replaced at build time with a fixed version in "build" dir + image: armory/spinnaker-operator:1.4.0-rc.3 # Moving label, replaced at build time with a fixed version in "build" dir command: - spinnaker-operator imagePullPolicy: Always @@ -32,7 +32,7 @@ spec: protocol: TCP name: http - name: halyard - image: armory/halyard:operator-dev # Moving label, replaced at build time with a fixed version in "build" dir + image: armory/halyard:1.4.0-rc.3 # Moving label, replaced at build time with a fixed version in "build" dir imagePullPolicy: Always ports: - containerPort: 8064 diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.go b/vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.go similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.go rename to vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.go diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.pb.go b/vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.pb.go similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.pb.go rename to vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.pb.go diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.proto b/vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.proto similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/OpenAPIv2.proto rename to vendor/github.com/googleapis/gnostic/openapiv2/OpenAPIv2.proto diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/README.md b/vendor/github.com/googleapis/gnostic/openapiv2/README.md similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/README.md rename to vendor/github.com/googleapis/gnostic/openapiv2/README.md diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/document.go b/vendor/github.com/googleapis/gnostic/openapiv2/document.go similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/document.go rename to vendor/github.com/googleapis/gnostic/openapiv2/document.go diff --git a/vendor/github.com/googleapis/gnostic/OpenAPIv2/openapi-2.0.json b/vendor/github.com/googleapis/gnostic/openapiv2/openapi-2.0.json similarity index 100% rename from vendor/github.com/googleapis/gnostic/OpenAPIv2/openapi-2.0.json rename to vendor/github.com/googleapis/gnostic/openapiv2/openapi-2.0.json