Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade operator-framework sdk to 0.18 #69

Merged
merged 1 commit into from Sep 23, 2020
Merged

Upgrade operator-framework sdk to 0.18 #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Expand Up @@ -64,7 +64,6 @@ anaconda-mode/
### HashiCorp ###
.DS_Store
/bin
/pkg

### Vim ###
# swap
Expand All @@ -81,4 +80,4 @@ tags
.history
# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode

terraform-k8s
terraform-k8s
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
@@ -1 +1 @@
1.13.8
1.15.2
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Expand Up @@ -114,8 +114,7 @@ go-build-image:

clean:
@rm -rf \
$(CURDIR)/bin \
$(CURDIR)/pkg
$(CURDIR)/bin


.PHONY: all bin clean dev dist docker-images go-build-image test tools
.PHONY: all bin clean dev dist docker-images go-build-image test tools
0 operator/build/Dockerfile → build/Dockerfile
View file
Open in desktop
File renamed without changes.
0 operator/build/bin/entrypoint → build/bin/entrypoint
View file
Open in desktop
File renamed without changes.
0 operator/build/bin/user_setup → build/bin/user_setup
View file
Open in desktop
File renamed without changes.
0 ...p.terraform.io_v1alpha1_workspace_cr.yaml → ...p.terraform.io_v1alpha1_workspace_cr.yaml
View file
Open in desktop
File renamed without changes.
218 changes: 218 additions & 0 deletions deploy/crds/app.terraform.io_workspaces_crd.yaml
View file
Open in desktop
@@ -0,0 +1,218 @@
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
name: workspaces.app.terraform.io
spec:
group: app.terraform.io
names:
kind: Workspace
listKind: WorkspaceList
plural: workspaces
singular: workspace
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: Workspace is the Schema for the workspaces 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: WorkspaceSpec defines the desired state of Workspace
properties:
module:
description: Module source and version to use
properties:
source:
description: Any remote module source (version control, registry)
type: string
version:
description: Module version for registry modules
type: string
required:
- source
type: object
organization:
description: Terraform Cloud organization
type: string
outputs:
description: Outputs denote outputs wanted
items:
description: OutputSpec specifies which values need to be output
properties:
key:
description: Output name
type: string
moduleOutputName:
description: Attribute name in module
type: string
type: object
type: array
secretsMountPath:
description: File path within operator pod to load workspace secrets
type: string
sshKeyID:
description: SSH Key ID. This key must already exist in the TF Cloud
organization. This can either be the user assigned name of the
SSH Key, or the system assigned ID.
type: string
variables:
description: Variables as inputs to module
items:
description: Variable denotes an input to the module
properties:
environmentVariable:
description: EnvironmentVariable denotes if this variable should
be created as environment variable
type: boolean
hcl:
description: String input should be an HCL-formatted variable
type: boolean
key:
description: Variable name
type: string
sensitive:
description: Variable is a secret and should be retrieved from
file
type: boolean
value:
description: Variable value
type: string
valueFrom:
description: Source for the 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, metadata.annotations,
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:
- environmentVariable
- key
- sensitive
type: object
type: array
required:
- module
- organization
- secretsMountPath
type: object
status:
description: WorkspaceStatus defines the observed state of Workspace
properties:
outputs:
description: Outputs from state file
items:
description: OutputStatus outputs the values of Terraform output
properties:
key:
description: Attribute name in module
type: string
value:
description: Value
type: string
type: object
type: array
runID:
description: Run ID
type: string
runStatus:
description: Run Status gets the run status
type: string
workspaceID:
description: Workspace ID
type: string
required:
- runID
- runStatus
- workspaceID
type: object
type: object
served: true
storage: true
subresources:
status: {}
0 operator/deploy/operator.yaml → deploy/operator.yaml
View file
Open in desktop
File renamed without changes.
0 operator/deploy/role.yaml → deploy/role.yaml
View file
Open in desktop
File renamed without changes.
0 operator/deploy/role_binding.yaml → deploy/role_binding.yaml
View file
Open in desktop
File renamed without changes.
0 operator/deploy/service_account.yaml → deploy/service_account.yaml
View file
Open in desktop
File renamed without changes.
24 changes: 11 additions & 13 deletions go.mod
View file
Open in desktop
@@ -1,32 +1,27 @@
module github.com/hashicorp/terraform-k8s

go 1.13
go 1.15

require (
github.com/go-logr/logr v0.1.0
github.com/go-openapi/spec v0.19.8
github.com/hashicorp/go-tfe v0.7.0
github.com/hashicorp/terraform v0.12.25
github.com/mitchellh/cli v1.1.1
github.com/operator-framework/operator-sdk v0.15.1
github.com/operator-framework/operator-sdk v0.18.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.5.1
github.com/zclconf/go-cty v1.4.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.18.2
k8s.io/apimachinery v0.18.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
sigs.k8s.io/controller-runtime v0.4.0
sigs.k8s.io/controller-runtime v0.6.0
)

// Pinned to kubernetes-1.16.2
replace (
k8s.io/api => k8s.io/api v0.0.0-20191016110408-35e52d86657a
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20191016113550-5357c4baaf65
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20191016112112-5190913f932d
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20191016114015-74ad18325ed5
k8s.io/client-go => k8s.io/client-go v0.0.0-20191016111102-bec269661e48
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20191016115326-20453efc2458
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20191016115129-c07a134afb42
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20191004115455-8e001e5d1894
Expand All @@ -44,6 +39,9 @@ replace (
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20191016112829-06bb3c9d77c9
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm

replace github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved
replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible // Required by OLM
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved
k8s.io/client-go => k8s.io/client-go v0.18.2 // Required by prometheus-operator
)