Skip to content

Commit

Permalink
feat(shulker-crds): update kubernetes client
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylvln committed Mar 11, 2022
1 parent 49a59f7 commit ddc0a63
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion internal/resource/cluster/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (b *MinecraftClusterResourceBuilder) ResourceBuilders() ([]common.ResourceB
}

func (b *MinecraftClusterResourceBuilder) getRoleName() string {
return fmt.Sprintf("%s-cluster-status-watch", b.Instance.Name)
return fmt.Sprintf("%s-cluster-watch", b.Instance.Name)
}

func (b *MinecraftClusterResourceBuilder) getLabels() map[string]string {
Expand Down
7 changes: 6 additions & 1 deletion internal/resource/cluster/role.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,14 @@ func (b *MinecraftClusterRoleBuilder) Update(object client.Object) error {
role := object.(*rbacv1.Role)

role.Rules = []rbacv1.PolicyRule{
{
APIGroups: []string{"shulkermc.io"},
Resources: []string{"minecraftclusters"},
Verbs: []string{"list"},
},
{
APIGroups: []string{"shulkermc.io"},
Resources: []string{"minecraftclusters/status"},
Resources: []string{"minecraftclusters", "minecraftclusters/status"},
Verbs: []string{"get", "watch"},
ResourceNames: []string{b.Instance.Name},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/resource/proxy/rolebinding.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (b *ProxyDeploymentRoleBindingBuilder) Build() (client.Object, error) {
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "Role",
Name: fmt.Sprintf("%s-cluster-status-watch", b.Cluster.Name),
Name: fmt.Sprintf("%s-cluster-watch", b.Cluster.Name),
},
}, nil
}
Expand Down
2 changes: 1 addition & 1 deletion support/shulker-crds/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ archivesBaseName = "ShulkerCrds"
version = '0.0.1'

dependencies {
compileOnly group: 'io.kubernetes', name: 'client-java', version: '10.0.2'
compileOnly group: 'io.kubernetes', name: 'client-java', version: '14.0.1'
}

Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ public void onEnable() {
params.watch,
null),
V1alpha1MinecraftCluster.class,
V1alpha1MinecraftClusterList.class);
V1alpha1MinecraftClusterList.class
);

clusterInformer.addEventHandler(
new ResourceEventHandler<>() {
Expand Down

0 comments on commit ddc0a63

Please sign in to comment.