Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

Commit

Permalink
Adding Source for removing Opkit managing CRDs
Browse files Browse the repository at this point in the history
references #23

Signed-off-by: Christopher Hein <me@christopherhein.com>
  • Loading branch information
christopherhein committed Oct 16, 2018
1 parent d7704b0 commit 7008af8
Show file tree
Hide file tree
Showing 15 changed files with 26 additions and 37 deletions.
5 changes: 5 additions & 0 deletions .generated_files
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
file-prefix zz_generated.
path-prefix pkg/client/
path-prefix pkg/operator
file-name template_functions.go
file-name aws-service-operator.yaml
4 changes: 2 additions & 2 deletions cloudformation/dynamodb.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: 'AWS Operator - Amazon DynamoDB'
Description: 'AWS Service Operator - Amazon DynamoDB'
Parameters:
Namespace:
Description: >-
Expand Down Expand Up @@ -63,7 +63,7 @@ Resources:
-
AttributeName: !Ref RangeAttributeName
KeyType: "RANGE"
AttributeDefinitions:
AttributeDefinitions:
-
AttributeName: !Ref HashAttributeName
AttributeType: "S"
Expand Down
2 changes: 1 addition & 1 deletion cloudformation/ecrrepository.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: 'AWS Operator - Amazon ECR Repository'
Description: 'AWS Service Operator - Amazon ECR Repository'
Parameters:
Namespace:
Description: >-
Expand Down
16 changes: 8 additions & 8 deletions cloudformation/s3bucket.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: 'AWS Operator - Amazon S3 Bucket'
Description: 'AWS Service Operator - Amazon S3 Bucket'
Parameters:
Namespace:
Description: >-
Expand Down Expand Up @@ -90,13 +90,13 @@ Parameters:
Default: "500.html"
Mappings: {}
Conditions:
UseLogging: !Equals
UseLogging: !Equals
- !Ref EnableLogging
- 'true'
UseGlacierLifeCycle: !Equals
UseGlacierLifeCycle: !Equals
- !Ref EnableGlacierLifeCycle
- 'true'
UseVersioning: !Equals
UseVersioning: !Equals
- !Ref EnableVersioning
- 'true'
UseAsStaticSite: !Equals
Expand All @@ -122,7 +122,7 @@ Resources:
Transitions:
- TransitionInDays: !Ref GlacierLifeCycleTransitionInDays
StorageClass: Glacier
LoggingConfiguration: !If
LoggingConfiguration: !If
- UseLogging
- DestinationBucketName: !Ref LoggingBucket
LogFilePrefix: !Ref LoggingPrefix
Expand All @@ -138,7 +138,7 @@ Resources:
Value: !Ref ClusterName
- Key: Heritage
Value: operator.aws
VersioningConfiguration: !If
VersioningConfiguration: !If
- UseVersioning
- Status: Enabled
- !Ref 'AWS::NoValue'
Expand Down Expand Up @@ -171,7 +171,7 @@ Resources:
DeletionPolicy: Retain
Properties:
AccessControl: LogDeliveryWrite
BucketName: !Join
BucketName: !Join
- ''
- - !Ref BucketName
- logging
Expand All @@ -180,7 +180,7 @@ Outputs:
Value: !Ref S3bucket
Description: Name of the sample Amazon S3 bucket.
BucketArn:
Value: !GetAtt
Value: !GetAtt
- S3bucket
- Arn
Description: Name of the Amazon S3 bucket
Expand Down
2 changes: 1 addition & 1 deletion cloudformation/snssubscription.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: 'AWS Operator - Amazon SNS Subscription'
Description: 'AWS Service Operator - Amazon SNS Subscription'
Parameters:
Namespace:
Description: >-
Expand Down
2 changes: 1 addition & 1 deletion cloudformation/snstopic.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: 'AWS Operator - Amazon SNS Topic'
Description: 'AWS Service Operator - Amazon SNS Topic'
Parameters:
Namespace:
Description: >-
Expand Down
2 changes: 1 addition & 1 deletion cloudformation/sqsqueue.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AWSTemplateFormatVersion: 2010-09-09
Description: "AWS Operator - Amazon SQS Queue"
Description: "AWS Service Operator - Amazon SQS Queue"
Parameters:
Namespace:
Type: String
Expand Down
2 changes: 1 addition & 1 deletion models/cloudformationtemplate.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: CloudFormationTemplateResource
Expand Down
2 changes: 1 addition & 1 deletion models/dynamodb.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: DynamoDBResource
Expand Down
2 changes: 1 addition & 1 deletion models/ecrrepository.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: ECRRepositoryResource
Expand Down
2 changes: 1 addition & 1 deletion models/s3bucket.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: S3BucketResource
Expand Down
2 changes: 1 addition & 1 deletion models/snssubscription.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: SNSSubscriptionResource
Expand Down
2 changes: 1 addition & 1 deletion models/snstopic.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: SNSResource
Expand Down
2 changes: 1 addition & 1 deletion models/sqsqueue.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: operator.aws/v1alpha1
apiVersion: service-operator.aws/v1alpha1
kind: ModelDefinition
metadata:
name: SQSResource
Expand Down
16 changes: 0 additions & 16 deletions pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,6 @@ func (c *Server) Run(stopChan chan struct{}) {
config.AWSClientset = awsClientset
config.RESTConfig = restConfig

// Create and wait for CRD resources
logger.Info("Registering resources")
resources := []opkit.CustomResource{
cloudformationtemplate.Resource,
s3bucket.Resource,
dynamodb.Resource,
sqsqueue.Resource,
snstopic.Resource,
ecrrepository.Resource,
snssubscription.Resource,
}
err = opkit.CreateCustomResources(*context, resources)
if err != nil {
logger.Fatalf("failed to create custom resource. %+v\n", err)
}

// TODO: Figure out how to get the node tag so I can store the
// `KubernetesCluster` attribute so that all resources can be cleaned up
// using that tag. Also we can create an inventory of all aws resources that
Expand Down

0 comments on commit 7008af8

Please sign in to comment.