Skip to content

Commit 2c5fa5d

Browse files
committed
Remove domains from xp-operator #653
1 parent e84f431 commit 2c5fa5d

File tree

45 files changed

+7
-2022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+7
-2022
lines changed

docs/installation.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ __ ____ __ _____ ___ __ ____ ______
145145
2022-04-27 15:18:48,488 INFO com.eno.kub.ope.Operator - Adding listener 'OperatorXp7AppStatusOnDeployments'
146146
2022-04-27 15:18:48,488 INFO com.eno.kub.ope.Operator - Adding listener 'OperatorIngress'
147147
2022-04-27 15:18:48,488 INFO com.eno.kub.ope.Operator - Adding schedule 'OperatorXp7ConfigSync' [delay: 13876, period: 60000]
148-
2022-04-27 15:18:48,488 INFO com.eno.kub.ope.Operator - Adding listener 'OperatorDomainCertSync'
149148
2022-04-27 15:18:48,727 INFO com.eno.kub.ope.Operator - Adding listener 'OperatorXp7DeploymentHelm'
150149
2022-04-27 15:18:48,727 INFO com.eno.kub.ope.Operator - Adding listener 'OperatorXp7AppStartStopper'
151150
2022-04-27 15:18:48,728 INFO com.eno.kub.ope.Operator - Adding schedule 'OperatorXp7AppStartStopper' [delay: 4061, period: 60000]

docs/usage.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,6 @@ namespace/my-namespace created
542542
xp7deployment.enonic.cloud/my-deployment created
543543
xp7app.enonic.cloud/contentstudio created
544544
xp7config.enonic.cloud/my-config created
545-
ingress.networking.k8s.io/my-domain-com created
546545
----
547546

548547
Once the XP pods have started you can open up the admin by following the <<access-admin>> section or call the ingress controller, if you have one set up.

helm/src/main/crds/domains.yaml

Lines changed: 0 additions & 92 deletions
This file was deleted.

helm/src/main/templates/api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ webhooks:
4040
- apiGroups: ["enonic.cloud"]
4141
operations: ["*"]
4242
apiVersions: ["v1"]
43-
resources: ["xp7deployments", "xp7apps", "xp7configs", "domains"]
43+
resources: ["xp7deployments", "xp7apps", "xp7configs"]
4444
scope: "*"
4545
- apiGroups: ["networking.k8s.io"]
4646
operations: ["*"]
@@ -68,7 +68,7 @@ webhooks:
6868
- apiGroups: ["enonic.cloud"]
6969
operations: ["*"]
7070
apiVersions: ["v1"]
71-
resources: ["xp7deployments", "xp7apps", "xp7configs", "domains"]
71+
resources: ["xp7deployments", "xp7apps", "xp7configs"]
7272
scope: "*"
7373
- apiGroups: ["networking.k8s.io"]
7474
operations: ["*"]

helm/src/main/templates/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ rules:
2727
resources: [ "clusterrolebindings", "clusterroles", "roles", "rolebindings" ]
2828
verbs: [ "*" ]
2929
- apiGroups: [ "enonic.cloud" ]
30-
resources: [ "xp7deployments", "xp7apps", "xp7configs", "domains" ]
30+
resources: [ "xp7deployments", "xp7apps", "xp7configs" ]
3131
verbs: [ "*" ]
3232
---
3333
kind: ClusterRoleBinding

java-client/src/main/java/com/enonic/kubernetes/client/CrdMappingProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.enonic.kubernetes.client;
22

3-
import com.enonic.kubernetes.client.v1.domain.Domain;
43
import com.enonic.kubernetes.client.v1.xp7app.Xp7App;
54
import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
65
import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
@@ -19,7 +18,6 @@ public static void register()
1918
KubernetesDeserializer.registerCustomKind( API_VERSION, "Xp7App", Xp7App.class );
2019
KubernetesDeserializer.registerCustomKind( API_VERSION, "Xp7Config", Xp7Config.class );
2120
KubernetesDeserializer.registerCustomKind( API_VERSION, "Xp7Deployment", Xp7Deployment.class );
22-
KubernetesDeserializer.registerCustomKind( API_VERSION, "Domain", Domain.class );
2321
}
2422

2523
@SuppressWarnings("unused")

java-client/src/main/java/com/enonic/kubernetes/client/v1/CrdApi.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
package com.enonic.kubernetes.client.v1;
22

3-
import com.enonic.kubernetes.client.v1.domain.Domain;
43
import com.enonic.kubernetes.client.v1.xp7app.Xp7App;
54
import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
65
import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
76
import io.fabric8.kubernetes.client.dsl.MixedOperation;
87
import io.fabric8.kubernetes.client.dsl.Resource;
98

109
public interface CrdApi {
11-
MixedOperation<Domain, Domain.DomainList, Resource<Domain>> domains();
12-
1310
MixedOperation<Xp7App, Xp7App.Xp7AppList, Resource<Xp7App>> xp7apps();
1411

1512
MixedOperation<Xp7Config, Xp7Config.Xp7ConfigList, Resource<Xp7Config>> xp7configs();

java-client/src/main/java/com/enonic/kubernetes/client/v1/CrdApiImpl.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.enonic.kubernetes.client.v1;
22

3-
import com.enonic.kubernetes.client.v1.domain.Domain;
43
import com.enonic.kubernetes.client.v1.xp7app.Xp7App;
54
import com.enonic.kubernetes.client.v1.xp7config.Xp7Config;
65
import com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment;
@@ -16,11 +15,6 @@ public CrdApiImpl(KubernetesClient k8sClient) {
1615
this.k8sClient = k8sClient;
1716
}
1817

19-
@Override
20-
public MixedOperation<Domain, Domain.DomainList, Resource<Domain>> domains() {
21-
return k8sClient.resources(Domain.class, Domain.DomainList.class);
22-
}
23-
2418
@Override
2519
public MixedOperation<Xp7App, Xp7App.Xp7AppList, Resource<Xp7App>> xp7apps() {
2620
return k8sClient.resources(Xp7App.class, Xp7App.Xp7AppList.class);

java-client/src/main/java/com/enonic/kubernetes/client/v1/domain/Domain.java

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
com.enonic.kubernetes.client.v1.xp7deployment.Xp7Deployment
22
com.enonic.kubernetes.client.v1.xp7app.Xp7App
33
com.enonic.kubernetes.client.v1.xp7config.Xp7Config
4-
com.enonic.kubernetes.client.v1.domain.Domain

0 commit comments

Comments
 (0)