chore: update dioscuri to v0.2.0 (#36)

* chore: update to v0.2.0 and remove old crds, support for k8s122 * chore: update chart yaml versions
amazeeio · Apr 14, 2022 · 8f9f866 · 8f9f866
1 parent 8eed9a3
commit 8f9f866
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 233 deletions.
diff --git a/charts/dioscuri/Chart.yaml b/charts/dioscuri/Chart.yaml
@@ -15,6 +15,6 @@ maintainers:
 
 type: application
 
-version: 0.3.2
+version: 0.4.0
 
-appVersion: v0.1.10
+appVersion: v0.2.0
diff --git a/charts/dioscuri/crds/dioscuri.yaml b/charts/dioscuri/crds/dioscuri.yaml
@@ -80,168 +80,3 @@ spec:
   - name: v1
     served: true
     storage: true
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: ingressmigrates.dioscuri.amazee.io
-spec:
-  group: dioscuri.amazee.io
-  names:
-    kind: IngressMigrate
-    listKind: IngressMigrateList
-    plural: ingressmigrates
-    singular: ingressmigrate
-  scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: IngressMigrate is the Schema for the ingressmigrates 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: IngressMigrateSpec defines the desired state of IngressMigrate
-          properties:
-            destinationNamespace:
-              description: Migrate is an example field of Migrate. Edit Migrate_types.go
-                to remove/update
-              type: string
-            ingress:
-              description: MigrateIngress .
-              properties:
-                activeIngress:
-                  type: string
-                standbyIngress:
-                  type: string
-              required:
-              - activeIngress
-              - standbyIngress
-              type: object
-          type: object
-        status:
-          description: IngressMigrateStatus defines the observed state of IngressMigrate
-          properties:
-            conditions:
-              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                of cluster Important: Run "make" to regenerate code after modifying
-                this file'
-              items:
-                description: IngressMigrateConditions defines the observed conditions
-                  of the migrations
-                properties:
-                  condition:
-                    type: string
-                  lastTransitionTime:
-                    type: string
-                  status:
-                    type: string
-                  type:
-                    type: string
-                required:
-                - condition
-                - lastTransitionTime
-                - status
-                - type
-                type: object
-              type: array
-          type: object
-      type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  annotations:
-    controller-gen.kubebuilder.io/version: v0.2.4
-  name: routemigrates.dioscuri.amazee.io
-spec:
-  group: dioscuri.amazee.io
-  names:
-    kind: RouteMigrate
-    listKind: RouteMigrateList
-    plural: routemigrates
-    singular: routemigrate
-  scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      description: RouteMigrate is the Schema for the routemigrates 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: RouteMigrateSpec defines the desired state of RouteMigrate
-          properties:
-            destinationNamespace:
-              description: Migrate is an example field of RouteMigrate. Edit RouteMigrate_types.go
-                to remove/update
-              type: string
-            routes:
-              properties:
-                activeRoutes:
-                  type: string
-                standbyRoutes:
-                  type: string
-              required:
-              - activeRoutes
-              - standbyRoutes
-              type: object
-          type: object
-        status:
-          description: RouteMigrateStatus defines the observed state of RouteMigrate
-          properties:
-            conditions:
-              description: 'INSERT ADDITIONAL STATUS FIELD - define observed state
-                of cluster Important: Run "make" to regenerate code after modifying
-                this file'
-              items:
-                description: RouteMigrateConditions defines the observed conditions
-                  of the migrations
-                properties:
-                  condition:
-                    type: string
-                  lastTransitionTime:
-                    type: string
-                  status:
-                    type: string
-                  type:
-                    type: string
-                required:
-                - condition
-                - lastTransitionTime
-                - status
-                - type
-                type: object
-              type: array
-          type: object
-      type: object
-  version: v1
-  versions:
-  - name: v1
-    served: true
-    storage: true
diff --git a/charts/dioscuri/templates/clusterrole.yaml b/charts/dioscuri/templates/clusterrole.yaml
@@ -73,64 +73,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - dioscuri.amazee.io
-  resources:
-  - ingressmigrates
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - dioscuri.amazee.io
-  resources:
-  - ingressmigrates/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - dioscuri.amazee.io
-  resources:
-  - routemigrates
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - dioscuri.amazee.io
-  resources:
-  - routemigrates/status
-  verbs:
-  - get
-  - patch
-  - update
-- apiGroups:
-  - route.openshift.io
-  resources:
-  - routes
-  verbs:
-  - create
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - route.openshift.io
-  resources:
-  - routes/custom-host
-  verbs:
-  - create
 - apiGroups:
   - dioscuri.amazee.io
   resources:

diff --git a/charts/dioscuri/templates/deployment.yaml b/charts/dioscuri/templates/deployment.yaml
@@ -43,11 +43,8 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         command:
         - /manager
-        {{- if or .Values.extraArgs .Values.global.openshift }}
+        {{- if .Values.extraArgs }}
         args:
-        {{- if .Values.global.openshift }}
-        - "--openshift=true"
-        {{- end }}
         {{- with .Values.extraArgs }}
         {{- toYaml . | nindent 8 }}
         {{- end }}

diff --git a/charts/dioscuri/templates/role.yaml b/charts/dioscuri/templates/role.yaml
@@ -7,8 +7,10 @@ metadata:
 rules:
 - apiGroups:
   - ""
+  - coordination.k8s.io
   resources:
   - configmaps
+  - leases
   verbs:
   - get
   - list
@@ -31,3 +33,4 @@ rules:
   - events
   verbs:
   - create
+  - patch
diff --git a/charts/dioscuri/values.yaml b/charts/dioscuri/values.yaml
@@ -1,9 +1,5 @@
 # the following values are defaults which may be overridden
 
-global:
-  # set to true to enable openshift support
-  openshift: false
-
 extraArgs:
 - "--metrics-addr=127.0.0.1:8080"
 - "--enable-leader-election=true"